updated based on date2 3.8.2.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 733 insertions, 461 deletions

diff --git a/lib/date/format.rb b/lib/date/format.rb
index 4425635d33..716a3c6e7d 100644
--- a/lib/date/format.rb
+++ b/lib/date/format.rb
@@ -1,585 +1,857 @@
 # format.rb: Written by Tadayoshi Funaba 1999-2006
-# $Id: format.rb,v 2.15 2005-02-06 13:28:48+09 tadf Exp $
+# $Id: format.rb,v 2.20 2006-08-19 22:58:36+09 tadf Exp $
 
 require 'rational'
 
 class Date
 
-  MONTHS = {
-    'january'  => 1, 'february' => 2, 'march'    => 3, 'april'    => 4,
-    'may'      => 5, 'june'     => 6, 'july'     => 7, 'august'   => 8,
-    'september'=> 9, 'october'  =>10, 'november' =>11, 'december' =>12
-  }
-
-  DAYS = {
-    'sunday'   => 0, 'monday'   => 1, 'tuesday'  => 2, 'wednesday'=> 3,
-    'thursday' => 4, 'friday'   => 5, 'saturday' => 6
-  }
-
-  ABBR_MONTHS = {
-    'jan'      => 1, 'feb'      => 2, 'mar'      => 3, 'apr'      => 4,
-    'may'      => 5, 'jun'      => 6, 'jul'      => 7, 'aug'      => 8,
-    'sep'      => 9, 'oct'      =>10, 'nov'      =>11, 'dec'      =>12
-  }
-
-  ABBR_DAYS = {
-    'sun'      => 0, 'mon'      => 1, 'tue'      => 2, 'wed'      => 3,
-    'thu'      => 4, 'fri'      => 5, 'sat'      => 6
-  }
-
-  ZONES = {
-    '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, 'bst' =>  1*3600, 'wat' => -1*3600,
-    'at'  => -2*3600, 'ast' => -4*3600, 'adt' => -3*3600, 'yst' => -9*3600,
-    'ydt' => -8*3600, 'hst' =>-10*3600, 'hdt' => -9*3600, 'cat' =>-10*3600,
-    'ahst'=>-10*3600, 'nt'  =>-11*3600, 'idlw'=>-12*3600, 'cet' =>  1*3600,
-    'met' =>  1*3600, 'mewt'=>  1*3600, 'mest'=>  2*3600, 'mesz'=>  2*3600,
-    'swt' =>  1*3600, 'sst' =>  2*3600, 'fwt' =>  1*3600, 'fst' =>  2*3600,
-    'eet' =>  2*3600, 'bt'  =>  3*3600, 'zp4' =>  4*3600, 'zp5' =>  5*3600,
-    'zp6' =>  6*3600, 'wast'=>  7*3600, 'wadt'=>  8*3600, 'cct' =>  8*3600,
-    'jst' =>  9*3600, 'east'=> 10*3600, 'eadt'=> 11*3600, 'gst' => 10*3600,
-    'nzt' => 12*3600, 'nzst'=> 12*3600, 'nzdt'=> 13*3600, 'idle'=> 12*3600
-  }
-
-  def self.__strptime(str, fmt, elem)
-    fmt.scan(/%[EO]?.|./mo) do |c|
-      cc = c.sub(/\A%[EO]?(.)\z/mo, '%\\1')
-      case cc
-      when /\A\s/o
-	str.sub!(/\A[\s\v]+/o, '')
-      when '%A', '%a'
-	return unless str.sub!(/\A([a-z]+)\b/io, '')
-	val = DAYS[$1.downcase] || ABBR_DAYS[$1.downcase]
-	return unless val
-	elem[:wday] = val
-      when '%B', '%b', '%h'
-	return unless str.sub!(/\A([a-z]+)\b/io, '')
-	val = MONTHS[$1.downcase] || ABBR_MONTHS[$1.downcase]
-	return unless val
-	elem[:mon] = val
-      when '%C'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	elem[:cent] = val
-      when '%c'
-	return unless __strptime(str, '%a %b %e %H:%M:%S %Y', elem)
-      when '%D'
-	return unless __strptime(str, '%m/%d/%y', elem)
-      when '%d', '%e'
-	return unless str.sub!(/\A ?(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..31) === val
-	elem[:mday] = val
-      when '%F'
-	return unless __strptime(str, '%Y-%m-%d', elem)
-      when '%G'
-	return unless str.sub!(/\A([-+]?\d+)/o, '')
-	val = $1.to_i
-	elem[:cwyear] = val
-      when '%g'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..99) === val
-	elem[:cwyear] = val
-	elem[:cent] ||= if val >= 69 then 19 else 20 end
-      when '%H', '%k'
-	return unless str.sub!(/\A ?(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..24) === val
-	elem[:hour] = val
-      when '%I', '%l'
-	return unless str.sub!(/\A ?(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..12) === val
-	elem[:hour] = val
-      when '%j'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..366) === val
-	elem[:yday] = val
-      when '%M'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..59) === val
-	elem[:min] = val
-      when '%m'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..12) === val
-	elem[:mon] = val
-=begin
-      when '%N'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i.to_r / (10**9)
-	elem[:sec_fraction] = val
-=end
-      when '%n'
-	return unless __strptime(str, ' ', elem)
-      when '%p', '%P'
-	return unless str.sub!(/\A([ap])(?:m\b|\.m\.)/io, '')
-	elem[:merid] = if $1.downcase == 'a' then 0 else 12 end
-      when '%R'
-	return unless __strptime(str, '%H:%M', elem)
-      when '%r'
-	return unless __strptime(str, '%I:%M:%S %p', elem)
-      when '%S'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..60) === val
-	elem[:sec] = val
-      when '%s'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	elem[:seconds] = val
-      when '%T'
-	return unless __strptime(str, '%H:%M:%S', elem)
-      when '%t'
-	return unless __strptime(str, ' ', elem)
-      when '%U', '%W'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..53) === val
-	elem[if c[-1,1] == 'U' then :wnum0 else :wnum1 end] = val
-      when '%u'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..7) === val
-	elem[:cwday] = val
-      when '%V'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (1..53) === val
-	elem[:cweek] = val
-      when '%v'
-	return unless __strptime(str, '%e-%b-%Y', elem)
-      when '%w'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..6) === val
-	elem[:wday] = val
-      when '%X'
-	return unless __strptime(str, '%H:%M:%S', elem)
-      when '%x'
-	return unless __strptime(str, '%m/%d/%y', elem)
-      when '%Y'
-	return unless str.sub!(/\A([-+]?\d+)/o, '')
-	val = $1.to_i
-	elem[:year] = val
-      when '%y'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	return unless (0..99) === val
-	elem[:year] = val
-	elem[:cent] ||= if val >= 69 then 19 else 20 end
-      when '%Z', '%z'
-	return unless str.sub!(/\A([-+:a-z0-9]+(?:\s+dst\b)?)/io, '')
-	val = $1
-	elem[:zone] = val
-	offset = zone_to_diff(val)
-	elem[:offset] = offset
-      when '%%'
-	return unless str.sub!(/\A%/o, '')
-      when '%+'
-	return unless __strptime(str, '%a %b %e %H:%M:%S %Z %Y', elem)
-=begin
-      when '%.'
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i.to_r / (10**$1.size)
-	elem[:sec_fraction] = val
-=end
-      when '%1'
-	if $VERBOSE
-	  warn("warning: %1 is deprecated; forget this")
-	end
-	return unless str.sub!(/\A(\d+)/o, '')
-	val = $1.to_i
-	elem[:jd] = val
-      when '%2'
-	if $VERBOSE
-	  warn("warning: %2 is deprecated; use '%Y-%j'")
-	end
-	return unless __strptime(str, '%Y-%j', elem)
-      when '%3'
-	if $VERBOSE
-	  warn("warning: %3 is deprecated; use '%F'")
+  module Format # :nodoc:
+
+    MONTHS = {
+      'january'  => 1, 'february' => 2, 'march'    => 3, 'april'    => 4,
+      'may'      => 5, 'june'     => 6, 'july'     => 7, 'august'   => 8,
+      'september'=> 9, 'october'  =>10, 'november' =>11, 'december' =>12
+    }
+
+    DAYS = {
+      'sunday'   => 0, 'monday'   => 1, 'tuesday'  => 2, 'wednesday'=> 3,
+      'thursday' => 4, 'friday'   => 5, 'saturday' => 6
+    }
+
+    ABBR_MONTHS = {
+      'jan'      => 1, 'feb'      => 2, 'mar'      => 3, 'apr'      => 4,
+      'may'      => 5, 'jun'      => 6, 'jul'      => 7, 'aug'      => 8,
+      'sep'      => 9, 'oct'      =>10, 'nov'      =>11, 'dec'      =>12
+    }
+
+    ABBR_DAYS = {
+      'sun'      => 0, 'mon'      => 1, 'tue'      => 2, 'wed'      => 3,
+      'thu'      => 4, 'fri'      => 5, 'sat'      => 6
+    }
+
+    ZONES = {
+      '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, 'bst' =>  1*3600, 'wat' => -1*3600,
+      'at'  => -2*3600, 'ast' => -4*3600, 'adt' => -3*3600, 'yst' => -9*3600,
+      'ydt' => -8*3600, 'hst' =>-10*3600, 'hdt' => -9*3600, 'cat' =>-10*3600,
+      'ahst'=>-10*3600, 'nt'  =>-11*3600, 'idlw'=>-12*3600, 'cet' =>  1*3600,
+      'met' =>  1*3600, 'mewt'=>  1*3600, 'mest'=>  2*3600, 'mesz'=>  2*3600,
+      'swt' =>  1*3600, 'sst' =>  2*3600, 'fwt' =>  1*3600, 'fst' =>  2*3600,
+      'eet' =>  2*3600, 'bt'  =>  3*3600, 'zp4' =>  4*3600, 'zp5' =>  5*3600,
+      'zp6' =>  6*3600, 'wast'=>  7*3600, 'wadt'=>  8*3600, 'cct' =>  8*3600,
+      'jst' =>  9*3600, 'east'=> 10*3600, 'eadt'=> 11*3600, 'gst' => 10*3600,
+      'nzt' => 12*3600, 'nzst'=> 12*3600, 'nzdt'=> 13*3600, 'idle'=> 12*3600,
+
+      '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
+    }
+
+    class Bag # :nodoc:
+
+      def method_missing(t, *args, &block)
+	t = t.to_s
+	set = t.chomp!('=')
+	t = '@' + t
+	if set
+	  instance_variable_set(t, *args)
+	else
+	  if instance_variables.include?(t)
+	    instance_variable_get(t)
+	  end
 	end
-	return unless __strptime(str, '%F', elem)
-      when /\A%(.)/m
-	return unless str.sub!(Regexp.new('\\A' + Regexp.quote($1)), '')
-      else
-	return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '')
       end
-    end
 
-    if cent = elem.delete(:cent)
-      if elem[:cwyear]
-	elem[:cwyear] += cent * 100
-      end
-      if elem[:year]
-	elem[:year] += cent * 100
+      def to_hash
+	instance_variables.
+	  select{|n| !instance_variable_get(n).nil?}.grep(/\A@[^_]/).
+	  inject({}){|r, n| r[n[1..-1].intern] = instance_variable_get(n); r}
       end
+
     end
 
-    if merid = elem.delete(:merid)
-      if elem[:hour]
-	elem[:hour] %= 12
-	elem[:hour] += merid
+  end
+
+  def self.num_pattern? (s) # :nodoc:
+    /\A%[EO]?[CDdeFGgHIjkLlMmNQRrSsTUuVvWwXxYy\d]/ =~ s ||/\A\d/ =~ s
+  end
+
+  private_class_method :num_pattern?
+
+  def self._strptime_i(str, fmt, e) # :nodoc:
+    fmt.scan(/%[EO]?(.)|(.)/m) do |s, c|
+      if s
+	case s
+	when 'A', 'a'
+	  return unless str.sub!(/\A(#{Format::DAYS.keys.join('|')})/io, '') ||
+			str.sub!(/\A(#{Format::ABBR_DAYS.keys.join('|')})/io, '')
+	  val = Format::DAYS[$1.downcase] || Format::ABBR_DAYS[$1.downcase]
+	  return unless val
+	  e.wday = val
+	when 'B', 'b', 'h'
+	  return unless str.sub!(/\A(#{Format::MONTHS.keys.join('|')})/io, '') ||
+			str.sub!(/\A(#{Format::ABBR_MONTHS.keys.join('|')})/io, '')
+	  val = Format::MONTHS[$1.downcase] || Format::ABBR_MONTHS[$1.downcase]
+	  return unless val
+	  e.mon = val
+	when 'C'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,2})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+	  val = $1.to_i
+	  e._cent = val
+	when 'c'
+	  return unless _strptime_i(str, '%a %b %e %H:%M:%S %Y', e)
+	when 'D'
+	  return unless _strptime_i(str, '%m/%d/%y', e)
+	when 'd', 'e'
+	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..31) === val
+	  e.mday = val
+	when 'F'
+	  return unless _strptime_i(str, '%Y-%m-%d', e)
+	when 'G'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,4})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+	  val = $1.to_i
+	  e.cwyear = val
+	when 'g'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..99) === val
+	  e.cwyear = val
+	  e._cent ||= if val >= 69 then 19 else 20 end
+	when 'H', 'k'
+	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..24) === val
+	  e.hour = val
+	when 'I', 'l'
+	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..12) === val
+	  e.hour = val
+	when 'j'
+	  return unless str.sub!(/\A(\d{1,3})/, '')
+	  val = $1.to_i
+	  return unless (1..366) === val
+	  e.yday = val
+	when 'L'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,3})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+#	  val = $1.to_i.to_r / (10**3)
+	  val = $1.to_i.to_r / (10**$1.size)
+	  e.sec_fraction = val
+	when 'M'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..59) === val
+	  e.min = val
+	when 'm'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..12) === val
+	  e.mon = val
+	when 'N'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,9})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+#	  val = $1.to_i.to_r / (10**9)
+	  val = $1.to_i.to_r / (10**$1.size)
+	  e.sec_fraction = val
+	when 'n', 't'
+	  return unless _strptime_i(str, "\s", e)
+	when 'P', 'p'
+	  return unless str.sub!(/\A([ap])(?:m\b|\.m\.)/i, '')
+	  e._merid = if $1.downcase == 'a' then 0 else 12 end
+	when 'Q'
+	  return unless str.sub!(/\A(\d{1,})/, '')
+	  val = $1.to_i.to_r / 10**3
+	  e.seconds = val
+	when 'R'
+	  return unless _strptime_i(str, '%H:%M', e)
+	when 'r'
+	  return unless _strptime_i(str, '%I:%M:%S %p', e)
+	when 'S'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..60) === val
+	  e.sec = val
+	when 's'
+	  return unless str.sub!(/\A(\d{1,})/, '')
+	  val = $1.to_i
+	  e.seconds = val
+	when 'T'
+	  return unless _strptime_i(str, '%H:%M:%S', e)
+	when 'U', 'W'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..53) === val
+	  e.__send__(if s == 'U' then :wnum0= else :wnum1= end, val)
+	when 'u'
+	  return unless str.sub!(/\A(\d{1})/, '')
+	  val = $1.to_i
+	  return unless (1..7) === val
+	  e.cwday = val
+	when 'V'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..53) === val
+	  e.cweek = val
+	when 'v'
+	  return unless _strptime_i(str, '%e-%b-%Y', e)
+	when 'w'
+	  return unless str.sub!(/\A(\d{1})/, '')
+	  val = $1.to_i
+	  return unless (0..6) === val
+	  e.wday = val
+	when 'X'
+	  return unless _strptime_i(str, '%H:%M:%S', e)
+	when 'x'
+	  return unless _strptime_i(str, '%m/%d/%y', e)
+	when 'Y'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,4})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+	  val = $1.to_i
+	  e.year = val
+	when 'y'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..99) === val
+	  e.year = val
+	  e._cent ||= if val >= 69 then 19 else 20 end
+	when 'Z', 'z'
+	  return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
+				    |[a-z.\s]+(?:standard|daylight)\s+time\b
+				    |[a-z]+(?:\s+dst)?\b
+				    )/ix, '')
+	  val = $1
+	  e.zone = val
+	  offset = zone_to_diff(val)
+	  e.offset = offset
+	when '%'
+	  return unless str.sub!(/\A%/, '')
+	when '+'
+	  return unless _strptime_i(str, '%a %b %e %H:%M:%S %Z %Y', e)
+	when '1'
+	  if $VERBOSE
+	    warn("warning: strptime: %1 is deprecated; forget this")
+	  end
+	  return unless str.sub!(/\A(\d+)/, '')
+	  val = $1.to_i
+	  e.jd = val
+	when '2'
+	  if $VERBOSE
+	    warn("warning: strptime: %2 is deprecated; use '%Y-%j'")
+	  end
+	  return unless _strptime_i(str, '%Y-%j', e)
+	when '3'
+	  if $VERBOSE
+	    warn("warning: strptime: %3 is deprecated; use '%F'")
+	  end
+	  return unless _strptime_i(str, '%F', e)
+	else
+	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(s)), '')
+	end
+      else
+	case c
+	when /\A[\s\v]/
+	  str.sub!(/\A[\s\v]+/, '')
+	else
+	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '')
+	end
       end
     end
-
-    str
   end
 
-  private_class_method :__strptime
+  private_class_method :_strptime_i
 
   def self._strptime(str, fmt='%F')
-    elem = {}
-    elem if __strptime(str.dup, fmt, elem)
-  end
+    e = Format::Bag.new
+    return unless _strptime_i(str.dup, fmt, e)
 
-  PARSE_MONTHPAT = ABBR_MONTHS.keys.join('|')
-  PARSE_DAYPAT   = ABBR_DAYS.  keys.join('|')
+    if e._cent
+      if e.cwyear
+	e.cwyear += e._cent * 100
+      end
+      if e.year
+	e.  year += e._cent * 100
+      end
+    end
 
-  def self._parse(str, comp=false)
-    str = str.dup
+    if e._merid
+      if e.hour
+	e.hour %= 12
+	e.hour += e._merid
+      end
+    end
 
-    str.gsub!(/[^-+,.\/:0-9a-z]+/ino, ' ')
+    e.to_hash
+  end
 
-    # day
-    if str.sub!(/(#{PARSE_DAYPAT})\S*/ino, ' ')
-      wday = ABBR_DAYS[$1.downcase]
+  def self._parse_day(str, e) # :nodoc:
+    if str.sub!(/(#{e._parse_daypat})[^-\d\s]*/in, ' ')
+      e.wday = Format::ABBR_DAYS[$1.downcase]
+      true
     end
+  end
 
-    # time
+  def self._parse_time(str, e) # :nodoc:
     if str.sub!(
-		/(\d+):(\d+)
-		 (?:
-		   :(\d+)(?:[,.](\d*))?
-		 )?
-		 (?:
-		   \s*
-		   ([ap])(?:m\b|\.m\.)
-		 )?
+		/(?:
+		   (\d+)\s*:\s*(\d+)
+		   (?:
+		       \s*:\s*(\d+)(?:[,.](\d*)\s*s?)?
+		   )?
+		   (?:
+		     \s*
+		     ([ap])(?:m\b|\.m\.)
+		   )?
+		 |
+		   (\d+)\s*([ap])(?:m\b|\.m\.)
+		 )
 		 (?:
 		   \s*
 		   (
-		     [a-z]+(?:\s+dst)?\b
+		     (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
 		   |
-		     [-+]\d+(?::?\d+)
+		     [a-z.\s]+(?:standard|daylight)\stime\b
+		   |
+		     [a-z]+(?:\sdst)?\b
 		   )
 		 )?
-		/inox,
+		/inx,
 		' ')
-      hour = $1.to_i
-      min = $2.to_i
-      sec = $3.to_i if $3
+      e.hour = ($1 || $6).to_i
+      e.min = $2.to_i if $2
+      e.sec = $3.to_i if $3
       if $4
-	sec_fraction = $4.to_i.to_r / (10**$4.size)
+	e.sec_fraction = $4.to_i.to_r / (10**$4.size)
       end
 
-      if $5
-	hour %= 12
-	if $5.downcase == 'p'
-	  hour += 12
+      if $5 || $7
+	e.hour %= 12
+	if ($5 || $7).downcase == 'p'
+	  e.hour += 12
 	end
       end
 
-      if $6
-	zone = $6
+      if $8
+	e.zone = $8
       end
+      true
     end
+  end
 
-    # eu
+  def self._parse_beat(str, e) # :nodoc:
+    if str.sub!(/@\s*(\d+)(?:[,.](\d*))?/, ' ')
+      beat = $1.to_i.to_r
+      beat += $2.to_i.to_r / (10**$2.size) if $2
+      secs = beat.to_r / 1000
+      h, min, s, fr = self.day_fraction_to_time(secs)
+      e.hour = h
+      e.min = min
+      e.sec = s
+      e.sec_fraction = fr * 86400
+      e.zone = '+0100'
+      true
+    end
+  end
+
+  def self._parse_eu(str, e) # :nodoc:
     if str.sub!(
-		/(\d+)\S*
-		 \s+
-		 (#{PARSE_MONTHPAT})\S*
+		/(\d+)[^-\d\s]*
+		 \s*
+		 (#{e._parse_monthpat})[^-\d\s]*
 		 (?:
-		   \s+
+		   \s*
+		   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+		   \s*
 		   (-?\d+)
 		 )?
-		/inox,
+		/inx,
 		' ')
-      mday = $1.to_i
-      mon = ABBR_MONTHS[$2.downcase]
+      e.mday = $1.to_i
+      e.mon = Format::ABBR_MONTHS[$2.downcase]
 
-      if $3
-	year = $3.to_i
-	if $3.size > 2
-	  comp = false
+      if $4
+	e.year = $4.to_i
+	if $4.size > 2
+	  e._comp = false
 	end
       end
 
-    # us
-    elsif str.sub!(
-		   /(#{PARSE_MONTHPAT})\S*
-		    \s+
-		    (\d+)\S*
-		    (?:
-		      \s+
-		      (-?\d+)
-		    )?
-		   /inox,
-		   ' ')
-      mon = ABBR_MONTHS[$1.downcase]
-      mday = $2.to_i
+      if $3 && $4
+	if $3[0,1].downcase == 'b'
+	  e.year = -e.year + 1
+	end
+      end
+      true
+    end
+  end
 
-      if $3
-	year = $3.to_i
-	if $3.size > 2
-	  comp = false
+  def self._parse_us(str, e) # :nodoc:
+    if str.sub!(
+		/(#{e._parse_monthpat})[^-\d\s]*
+		 \s*
+		 (\d+)[^-\d\s]*
+		 (?:
+		   \s*
+		   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+		   \s*
+		   (-?\d+)
+		 )?
+		/inx,
+		' ')
+      e.mon = Format::ABBR_MONTHS[$1.downcase]
+
+      unless $2.size > 2 && $3.nil?
+	e.mday = $2.to_i
+      else
+	e.year = $2.to_i
+      end
+
+      if $4
+	e.year = $4.to_i
+	if $4.size > 2
+	  e._comp = false
+	end
+      end
+
+      if $3 && $4
+	if $3[0,1].downcase == 'b'
+	  e.year = -e.year + 1
 	end
       end
+      true
+    end
+  end
 
-    # iso
-    elsif str.sub!(/([-+]?\d+)-(\d+)-(-?\d+)/no, ' ')
-      year = $1.to_i
-      mon = $2.to_i
-      mday = $3.to_i
+  def self._parse_iso(str, e) # :nodoc:
+    if str.sub!(/([-+]?\d+)-(\d+)-(-?\d+)/n, ' ')
+      e.year = $1.to_i
+      e.mon = $2.to_i
+      e.mday = $3.to_i
 
       if $1.size > 2
-	comp = false
+	e._comp = false
       elsif $3.size > 2
-	comp = false
-	mday, mon, year = year, mon, mday
+	e._comp = false
+	e.mday, e.mon, e.year = e.year, e.mon, e.mday
       end
+      true
+    elsif str.sub!(/\b(\d{2}|\d{4})-?w(\d{2})-?(\d+)\b/in, ' ')
+      e.cwyear = $1.to_i
+      e.cweek = $2.to_i
+      e.cwday = $3.to_i
+      true
+    elsif str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/n, ' ')
+      e.year = $1.to_i
+      e.yday = $2.to_i
+      true
+    end
+  end
 
-    # jis
-    elsif str.sub!(/([MTSH])(\d+)\.(\d+)\.(\d+)/ino, ' ')
-      e = { 'm'=>1867,
-	    't'=>1911,
-	    's'=>1925,
-	    'h'=>1988
+  def self._parse_jis(str, e) # :nodoc:
+    if str.sub!(/([MTSH])(\d+)\.(\d+)\.(\d+)/in, ' ')
+      era = { 'm'=>1867,
+	      't'=>1911,
+	      's'=>1925,
+	      'h'=>1988
 	  }[$1.downcase]
-      year = $2.to_i + e
-      mon = $3.to_i
-      mday = $4.to_i
+      e.year = $2.to_i + era
+      e.mon = $3.to_i
+      e.mday = $4.to_i
+      true
+    end
+  end
 
-    # vms
-    elsif str.sub!(/(-?\d+)-(#{PARSE_MONTHPAT})[^-]*-(-?\d+)/ino, ' ')
-      mday = $1.to_i
-      mon = ABBR_MONTHS[$2.downcase]
-      year = $3.to_i
+  def self._parse_vms(str, e) # :nodoc:
+    if str.sub!(/(-?\d+)-(#{e._parse_monthpat})[^-]*-(-?\d+)/in, ' ')
+      e.mday = $1.to_i
+      e.mon = Format::ABBR_MONTHS[$2.downcase]
+      e.year = $3.to_i
 
       if $1.size > 2
-	comp = false
-	year, mon, mday = mday, mon, year
+	e._comp = false
+	e.year, e.mon, e.mday = e.mday, e.mon, e.year
       elsif $3.size > 2
-	comp = false
+	e._comp = false
       end
+      true
+    end
+  end
 
-    # sla
-    elsif str.sub!(%r|(-?\d+)/(\d+)(?:/(-?\d+))?|no, ' ')
-      mon = $1.to_i
-      mday = $2.to_i
+  def self._parse_sla_ja(str, e) # :nodoc:
+    if str.sub!(%r|(-?\d+)[/.](\d+)(?:[/.](-?\d+))?|n, ' ')
+      if $3
+	e.year = $1.to_i
+	e.mon = $2.to_i
+	e.mday = $3.to_i
+	if $1.size > 2
+	  e._comp = false
+	end
+      else
+	if $1.size > 2
+	  e.year = $1.to_i
+	  e.mon = $2.to_i
+	elsif $2.size > 2
+	  e.mon = $1.to_i
+	  e.year = $2.to_i
+	else
+	  e.mon = $1.to_i
+	  e.mday = $2.to_i
+	end
+      end
+
+      if $3 && $3.size > 2
+	e._comp = false
+	e.mday, e.mon, e.year = e.year, e.mon, e.mday
+      end
+      true
+    end
+  end
 
+  def self._parse_sla_eu(str, e) # :nodoc:
+    if str.sub!(%r|(-?\d+)[/.](\d+)(?:[/.](-?\d+))?|n, ' ')
       if $3
-	year = $3.to_i
+	e.mday = $1.to_i
+	e.mon = $2.to_i
+	e.year = $3.to_i
 	if $3.size > 2
-	  comp = false
+	  e._comp = false
+	end
+      else
+	if $1.size > 2
+	  e.year = $1.to_i
+	  e.mon = $2.to_i
+	elsif $2.size > 2
+	  e.mon = $1.to_i
+	  e.year = $2.to_i
+	else
+	  e.mday = $1.to_i
+	  e.mon = $2.to_i
 	end
       end
 
       if $3 && $1.size > 2
-	comp = false
-	year, mon, mday = mon, mday, year
+	e._comp = false
+	e.year, e.mon, e.mday = e.mday, e.mon, e.year
       end
+      true
+    end
+  end
 
-    # ddd
-    elsif str.sub!(
-		   /([-+]?)(\d{4,14})
-		    (?:
-		      \s*
-		      T?
-		      \s*
-		      (\d{2,6})(?:[,.](\d*))?
-		    )?
-		    (?:
-		      \s*
-		      (
-			Z
-		      |
-			[-+]\d{2,4}
-		      )
-		      \b
-		    )?
-		   /inox,
-		   ' ')
+  def self._parse_sla_us(str, e) # :nodoc:
+    if str.sub!(%r|(-?\d+)[/.](\d+)(?:[/.](-?\d+))?|n, ' ')
+      if $3
+	e.mon = $1.to_i
+	e.mday = $2.to_i
+	e.year = $3.to_i
+	if $3.size > 2
+	  e._comp = false
+	end
+      else
+	if $1.size > 2
+	  e.year = $1.to_i
+	  e.mon = $2.to_i
+	elsif $2.size > 2
+	  e.mon = $1.to_i
+	  e.year = $2.to_i
+	else
+	  e.mon = $1.to_i
+	  e.mday = $2.to_i
+	end
+      end
+
+      if $3 && $1.size > 2
+	e._comp = false
+	e.year, e.mon, e.mday = e.mon, e.mday, e.year
+      end
+      true
+    end
+  end
+
+  def self._parse_ddd(str, e) # :nodoc:
+    if str.sub!(
+		/([-+]?)(\d{2,14})
+		  (?:
+		    \s*
+		    T?
+		    \s*
+		    (\d{2,6})(?:[,.](\d*))?
+		  )?
+		  (?:
+		    \s*
+		    (
+		      Z
+		    |
+		      [-+]\d{1,4}
+		    )
+		    \b
+		  )?
+		/inx,
+		' ')
       case $2.size
+      when 2
+	e.mday = $2[ 0, 2].to_i
       when 4
-	mon  = $2[ 0, 2].to_i
-	mday = $2[ 2, 2].to_i
+	e.mon  = $2[ 0, 2].to_i
+	e.mday = $2[ 2, 2].to_i
       when 6
-	year = ($1 + $2[ 0, 2]).to_i
-	mon  = $2[ 2, 2].to_i
-	mday = $2[ 4, 2].to_i
+	e.year = ($1 + $2[ 0, 2]).to_i
+	e.mon  = $2[ 2, 2].to_i
+	e.mday = $2[ 4, 2].to_i
       when 8, 10, 12, 14
-	year = ($1 + $2[ 0, 4]).to_i
-	mon  = $2[ 4, 2].to_i
-	mday = $2[ 6, 2].to_i
-	hour = $2[ 8, 2].to_i if $2.size >= 10
-	min  = $2[10, 2].to_i if $2.size >= 12
-	sec  = $2[12, 2].to_i if $2.size >= 14
-	comp = false
+	e.year = ($1 + $2[ 0, 4]).to_i
+	e.mon  = $2[ 4, 2].to_i
+	e.mday = $2[ 6, 2].to_i
+	e.hour = $2[ 8, 2].to_i if $2.size >= 10
+	e.min  = $2[10, 2].to_i if $2.size >= 12
+	e.sec  = $2[12, 2].to_i if $2.size >= 14
+	e._comp = false
+      when 3
+	e.yday = $2[ 0, 3].to_i
+      when 5
+	e.year = ($1 + $2[ 0, 2]).to_i
+	e.yday = $2[ 2, 3].to_i
+      when 7
+	e.year = ($1 + $2[ 0, 4]).to_i
+	e.yday = $2[ 4, 3].to_i
       end
       if $3
 	case $3.size
 	when 2, 4, 6
-	  hour = $3[ 0, 2].to_i
-	  min  = $3[ 2, 2].to_i if $3.size >= 4
-	  sec  = $3[ 4, 2].to_i if $3.size >= 6
+	  e.hour = $3[ 0, 2].to_i
+	  e.min  = $3[ 2, 2].to_i if $3.size >= 4
+	  e.sec  = $3[ 4, 2].to_i if $3.size >= 6
 	end
       end
       if $4
-	sec_fraction = $4.to_i.to_r / (10**$4.size)
+	e.sec_fraction = $4.to_i.to_r / (10**$4.size)
       end
       if $5
-	zone = $5
+	e.zone = $5
       end
+      true
     end
+  end
+
+  private_class_method :_parse_day, :_parse_time, :_parse_beat,
+	:_parse_eu, :_parse_us, :_parse_iso, :_parse_jis, :_parse_vms,
+	:_parse_sla_ja, :_parse_sla_eu, :_parse_sla_us, :_parse_ddd
 
-    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/ino, ' ')
-      if year
-	year = -year + 1
+  def self._parse(str, comp=false)
+    str = str.dup
+
+    e = Format::Bag.new
+
+    e._comp = comp
+    e._parse_monthpat = Format::ABBR_MONTHS.keys.join('|')
+    e._parse_daypat   = Format::ABBR_DAYS  .keys.join('|')
+
+    str.gsub!(/[^-+,.\/:0-9@a-z\x80-\xff]+/in, ' ')
+
+    _parse_time(str, e) # || _parse_beat(str, e)
+    _parse_day(str, e)
+
+    _parse_eu(str, e)     ||
+    _parse_us(str, e)     ||
+    _parse_iso(str, e)    ||
+    _parse_jis(str, e)    ||
+    _parse_vms(str, e)    ||
+    _parse_sla_us(str, e) ||
+    _parse_ddd(str, e)
+
+    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/in, ' ')
+      if e.year
+	e.year = -e.year + 1
       end
     end
 
-    if comp and year
-      if year >= 0 and year <= 99
-	if year >= 69
-	  year += 1900
+    if e._comp and e.year
+      if e.year >= 0 and e.year <= 99
+	if e.year >= 69
+	  e.year += 1900
 	else
-	  year += 2000
+	  e.year += 2000
 	end
       end
     end
 
-    elem = {}
-    elem[:year] = year if year
-    elem[:mon] = mon if mon
-    elem[:mday] = mday if mday
-    elem[:hour] = hour if hour
-    elem[:min] = min if min
-    elem[:sec] = sec if sec
-    elem[:sec_fraction] = sec_fraction if sec_fraction
-    elem[:zone] = zone if zone
-    offset = zone_to_diff(zone) if zone
-    elem[:offset] = offset if offset
-    elem[:wday] = wday if wday
-    elem
+    e.offset ||= zone_to_diff(e.zone) if e.zone
+
+    e.to_hash
   end
 
-  def self.zone_to_diff(str)
-    abb, dst = str.downcase.split(/\s+/o, 2)
-    if ZONES.include?(abb)
-      offset  = ZONES[abb]
+  def self.zone_to_diff(zone) # :nodoc:
+    zone = zone.downcase
+    if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
+      dst = $1 == 'daylight'
+    else
+      dst = zone.sub!(/\s+dst\z/, '')
+    end
+    if Format::ZONES.include?(zone)
+      offset = Format::ZONES[zone]
       offset += 3600 if dst
-    elsif /\A([-+])(\d{2}):?(\d{2})?\Z/no =~ str
-      offset = $2.to_i * 3600 + $3.to_i * 60
-      offset *= -1 if $1 == '-'
+    elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
+      sign = $1
+      if zone.include?(':')
+	hour, min, sec, = zone.split(':')
+      elsif zone.include?(',') || zone.include?('.')
+	hour, fr, = zone.split(/[,.]/)
+	min = fr.to_i.to_r / (10**fr.size) * 60
+      else
+	case zone.size
+	when 3
+	  hour = zone[0,1]
+	  min = zone[1,2]
+	else
+	  hour = zone[0,2]
+	  min = zone[2,2]
+	  sec = zone[4,2]
+	end
+      end
+      offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
+      offset *= -1 if sign == '-'
     end
     offset
   end
 
   def strftime(fmt='%F')
-    o = ''
-    fmt.scan(/%[EO]?.|./mo) do |c|
-      cc = c.sub(/\A%[EO]?(.)\z/mo, '%\\1')
-      case cc
-      when '%A'; o << DAYNAMES[wday]
-      when '%a'; o << ABBR_DAYNAMES[wday]
-      when '%B'; o << MONTHNAMES[mon]
-      when '%b'; o << ABBR_MONTHNAMES[mon]
-      when '%C'; o << '%02d' % (year / 100.0).floor		# P2,ID
-      when '%c'; o << strftime('%a %b %e %H:%M:%S %Y')
-      when '%D'; o << strftime('%m/%d/%y')			# P2,ID
-      when '%d'; o << '%02d' % mday
-      when '%e'; o <<  '%2d' % mday
-      when '%F'; o << strftime('%Y-%m-%d')			# ID
-      when '%G'; o << '%.4d' %  cwyear				# ID
-      when '%g'; o << '%02d' % (cwyear % 100)			# ID
-      when '%H'; o << '%02d' %   hour
-      when '%h'; o << strftime('%b')				# P2,ID
-      when '%I'; o << '%02d' % ((hour % 12).nonzero? or 12)
-      when '%j'; o << '%03d' % yday
-      when '%k'; o <<  '%2d' %   hour				# AR,TZ,GL
-      when '%l'; o <<  '%2d' % ((hour % 12).nonzero? or 12)	# AR,TZ,GL
-      when '%M'; o << '%02d' % min
-      when '%m'; o << '%02d' % mon
-=begin
-      when '%N'							# GNU date
-	o << '%09d' % (sec_fraction / (1.to_r/86400/(10**9)))
-=end
-      when '%n'; o << "\n"					# P2,ID
-      when '%P'; o << if hour < 12 then 'am' else 'pm' end	# GL
-      when '%p'; o << if hour < 12 then 'AM' else 'PM' end
-      when '%R'; o << strftime('%H:%M')				# ID
-      when '%r'; o << strftime('%I:%M:%S %p')			# P2,ID
-      when '%S'; o << '%02d' % sec
-      when '%s'							# TZ,GL
+    fmt.gsub(/%[EO]?(.)/m) do |_|
+      case $1
+      when 'A'; DAYNAMES[wday]
+      when 'a'; ABBR_DAYNAMES[wday]
+      when 'B'; MONTHNAMES[mon]
+      when 'b'; ABBR_MONTHNAMES[mon]
+      when 'C'; '%02d' % (year / 100)				# P2,ID
+      when 'c'; strftime('%a %b %e %H:%M:%S %Y')
+      when 'D'; strftime('%m/%d/%y')				# P2,ID
+      when 'd'; '%02d' % mday
+      when 'e';  '%2d' % mday
+      when 'F'; strftime('%Y-%m-%d')				# ID
+      when 'G'; '%.4d' %  cwyear				# ID
+      when 'g'; '%02d' % (cwyear % 100)				# ID
+      when 'H'; '%02d' % hour
+      when 'h'; strftime('%b')					# P2,ID
+      when 'I'; '%02d' % ((hour % 12).nonzero? or 12)
+      when 'j'; '%03d' % yday
+      when 'k';  '%2d' % hour					# AR,TZ,GL
+      when 'L'							# JV
+	'%03d' % (sec_fraction / (1.to_r/86400/(10**3)))
+      when 'l';  '%2d' % ((hour % 12).nonzero? or 12)		# AR,TZ,GL
+      when 'M'; '%02d' % min
+      when 'm'; '%02d' % mon
+      when 'N'							# JV, GD
+	'%09d' % (sec_fraction / (1.to_r/86400/(10**9)))
+      when 'n'; "\n"						# P2,ID
+      when 'P'; strftime('%p').downcase				# GL
+      when 'p'; if hour < 12 then 'AM' else 'PM' end
+      when 'Q'							# JV
+	d = ajd - self.class.jd_to_ajd(self.class.civil_to_jd(1970,1,1), 0)
+	s = (d * 86400*10**3).to_i
+	'%d' % s
+      when 'R'; strftime('%H:%M')				# ID
+      when 'r'; strftime('%I:%M:%S %p')				# P2,ID
+      when 'S'; '%02d' % sec
+      when 's'							# TZ,GL
 	d = ajd - self.class.jd_to_ajd(self.class.civil_to_jd(1970,1,1), 0)
 	s = (d * 86400).to_i
-	o << '%d' % s
-      when '%T'; o << strftime('%H:%M:%S')			# P2,ID
-      when '%t'; o << "\t"					# P2,ID
-      when '%U', '%W'
-	a = self.class.civil_to_jd(year, 1, 1, ns?) + 6
-	k = if c[-1,1] == 'U' then 0 else 1 end
-	w = (jd - (a - ((a - k) + 1) % 7) + 7) / 7
-	o << '%02d' % w
-      when '%u'; o <<   '%d' % cwday				# P2,ID
-      when '%V'; o << '%02d' % cweek				# P2,ID
-      when '%v'; o << strftime('%e-%b-%Y')			# AR,TZ
-      when '%w'; o <<   '%d' % wday
-      when '%X'; o << strftime('%H:%M:%S')
-      when '%x'; o << strftime('%m/%d/%y')
-      when '%Y'; o << '%.4d' %  year
-      when '%y'; o << '%02d' % (year % 100)
-      when '%Z'; o << (if offset.zero? then 'Z' else strftime('%z') end)
-      when '%z'							# ID
-	o << if offset < 0 then '-' else '+' end
+	'%d' % s
+      when 'T'; strftime('%H:%M:%S')				# P2,ID
+      when 't'; "\t"						# P2,ID
+      when 'U', 'W'
+	k = if $1 == 'U' then 0 else 1 end
+	'%02d' % self.class.jd_to_weeknum(jd, k, fix_style)[1]
+      when 'u';   '%d' % cwday					# P2,ID
+      when 'V'; '%02d' % cweek					# P2,ID
+      when 'v'; strftime('%e-%b-%Y')				# AR,TZ
+      when 'w';   '%d' % wday
+      when 'X'; strftime('%H:%M:%S')
+      when 'x'; strftime('%m/%d/%y')
+      when 'Y'; '%.4d' %  year
+      when 'y'; '%02d' % (year % 100)
+      when 'Z'; (if offset.zero? then 'Z' else strftime('%z') end)
+      when 'z'							# ID
+	p = if offset < 0 then '-' else '+' end
 	of = offset.abs
 	hh, fr = of.divmod(1.to_r/24)
 	mm = fr / (1.to_r/1440)
-	o << '%02d' % hh
-	o << '%02d' % mm
-      when '%%'; o << '%'
-      when '%+'; o << strftime('%a %b %e %H:%M:%S %Z %Y')	# TZ
-=begin
-      when '%.'
-	o << '%06d' % (sec_fraction / (1.to_r/86400/(10**6)))
-=end
-      when '%1'
+	'%s%02d%02d' % [p, hh, mm]
+      when '%'; '%'
+      when '+'; strftime('%a %b %e %H:%M:%S %Z %Y')		# TZ
+      when '1'
 	if $VERBOSE
-	  warn("warning: %1 is deprecated; forget this")
+	  warn("warning: strftime: %1 is deprecated; forget this")
 	end
-	o <<   '%d' % jd
-      when '%2'
+	  '%d' % jd
+      when '2'
 	if $VERBOSE
-	  warn("warning: %2 is deprecated; use '%Y-%j'")
+	  warn("warning: strftime: %2 is deprecated; use '%Y-%j'")
 	end
-	o << strftime('%Y-%j')
-      when '%3'
+	strftime('%Y-%j')
+      when '3'
 	if $VERBOSE
-	  warn("warning: %3 is deprecated; use '%F'")
+	  warn("warning: strftime: %3 is deprecated; use '%F'")
 	end
-	o << strftime('%F')
-      when /\A%(.)/m
-	o << $1
+	strftime('%F')
       else
-	o << c
+	$1
       end
     end
-    o
   end
 
 # alias_method :format, :strftime