when_exe 0.3.4 → 0.3.5

data/lib/when_exe/region/shire.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  Copyright (C) 2011-2014 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -13,7 +13,7 @@ module When
                  "ja=http://ja.wikipedia.org/wiki/, " +
                  "cal=http://en.wikipedia.org/wiki/Middle-earth_calendar]",
       "locale:[=en:, ja=ja:, alias]",
-      "names:[ShireTerms]",
+      "names:[ShireTerms=]",
       "[Shire=en:The_Lord_of_the_Rings, ホビット庄暦=ja:%%<指輪物語>]",
 
       [self,
@@ -36,180 +36,163 @@ module When
     ]]
   end
 
-  module CalendarTypes
+  #
+  # ホビット庄暦の暦週
+  #
+  class CalendarNote::ShireWeek < CalendarNote
 
-    #
-    # ホビット庄暦の暦週
-    #
-    class CalendarNote::ShireWeek < CalendarNote
-
-      NoteObjects = [When::BasicTypes::M17n, [
-        "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
-        "locale:[=en:, ja=ja:, alias]",
-        "names:[Shire]",
+    NoteObjects = [When::BasicTypes::M17n, [
+      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+      "locale:[=en:, ja=ja:, alias]",
+      "names:[Shire]",
 
-        # 年の暦注 ----------------------------
-        [When::BasicTypes::M17n,
-          "names:[year]"
-        ],
+      # 年の暦注 ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[year]"
+      ],
 
-        # 月の暦注 ----------------------------
+      # 月の暦注 ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[month]",
         [When::BasicTypes::M17n,
-          "names:[month]",
-          [When::BasicTypes::M17n,
-            "names:[Month]"
-          ]
-        ],
+          "names:[Month]"
+        ]
+      ],
 
-        # 日の暦注 ----------------------------
+      # 日の暦注 ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[day]",
         [When::BasicTypes::M17n,
-          "names:[day]",
-          [When::BasicTypes::M17n,
-            "names:[Week]",
-            "[Saturday,     土曜日]",
-            "[Sunday,       日曜日]",
-            "[Monday,       月曜日]",
-            "[Tuesday,      火曜日]",
-            "[Wednesday,    水曜日]",
-            "[Thursday,     木曜日]",
-            "[Friday,       金曜日]",
-            "[lithe,        中日= ]",
-            "[double,       重日= ]"
-          ]
+          "names:[Week]",
+          "[Saturday,     土曜日]",
+          "[Sunday,       日曜日]",
+          "[Monday,       月曜日]",
+          "[Tuesday,      火曜日]",
+          "[Wednesday,    水曜日]",
+          "[Thursday,     木曜日]",
+          "[Friday,       金曜日]",
+          "[lithe,        中日= ]",
+          "[double,       重日= ]"
         ]
-      ]]
+      ]
+    ]]
 
-      # イベントの標準的な間隔を返す
-      # @private
-      def _delta(parameter=nil)
-        return When::DurationP1W
-      end
+    # イベントの標準的な間隔を返す
+    # @private
+    def _delta(parameter=nil)
+      return When::DurationP1W
+    end
 
-      # @private
-      def lithe_delta(parameter=nil)
-        return When::TM::PeriodDuration.new([0,0,7*52+1])
-      end
+    # @private
+    def lithe_delta(parameter=nil)
+      return When::TM::PeriodDuration.new([0,0,7*52+1])
+    end
 
-      # 当日または直前の lithe の日
-      # @param date [When::TM::TemporalPosition]
-      # @param parameter [nil] 未使用
-      # @return [When::TM::TemporalPosition]
-      #
-      def lithe(date, parameter=nil)
-        event_name = 'lithe'
-        date  = date.frame.jul_trans(date, {:events=>[event_name]})
-        y,m,d = date.cal_date
-        h,n   = (m+5).divmod(7)
-        dow   = 182 * h[0] + 30 * n + d + 1
-        if m==8
-          case d
-          when 2 ; dow = 0
-          when 3 ; dow = date.frame._sum([y]) == 365 ? 1 : 0
-          when 4 ; dow = 1
-          end
+    # 当日または直前の lithe の日
+    # @param date [When::TM::TemporalPosition]
+    # @param parameter [nil] 未使用
+    # @return [When::TM::TemporalPosition]
+    #
+    def lithe(date, parameter=nil)
+      event_name = 'lithe'
+      date  = date.frame.jul_trans(date, {:events=>[event_name]})
+      y,m,d = date.cal_date
+      h,n   = (m+5).divmod(7)
+      dow   = 182 * h[0] + 30 * n + d + 1
+      if m==8
+        case d
+        when 2 ; dow = 0
+        when 3 ; dow = date.frame._sum([y]) == 365 ? 1 : 0
+        when 4 ; dow = 1
         end
-        return date if dow == 0
-        date += When::TM::PeriodDuration.new([0,0,-dow])
-        date.events = [event_name]
-        date
       end
+      return date if dow == 0
+      date += When::TM::PeriodDuration.new([0,0,-dow])
+      date.events = [event_name]
+      date
+    end
 
-      # 当日または直前の week_day の日
-      # @method week_day(date, parameter=nil)
-      #   @param date [When::TM::TemporalPosition]
-      #   @param parameter [nil] 未使用
-      #   @return [When::TM::TemporalPosition]
-      #   @note week_day は saturday, sunday, monday, tuesday, wednesday, thursday, friday に読み替えてください。
-
-      # @private
-      7.times do |k|
-        name = When.CalendarNote('ShireWeek/NoteObjects::day::Week')[k].to_s.downcase
-        module_eval %Q{
-          def #{name}(date, parameter=nil)
-            event_name = 'from_#{name}'
-            date  = date.frame.jul_trans(date, {:events=>[event_name], :precision=>When::DAY})
-            y,m,d = date.cal_date
-            h,n   = (m+5).divmod(7)
-            dow   = (182 * h[0] + 30 * n + d - #{k}) % 7
-            case m
-            when 8
-              case d
-              when 2 ; dow = 7 - #{k}
-              when 3 ; dow = (date.frame._sum([y]) == 365 && #{k} == 0) ? 0 : 8 - #{k}
-              when 4 ; dow = #{k} == 0 ? 0 : 9 - #{k}
-              end
-            when 9
-              dow += (date.frame._sum([y]) == 365) ? 1 : 2 if d < #{k}
+    # 当日または直前の week_day の日
+    # @method week_day(date, parameter=nil)
+    #   @param date [When::TM::TemporalPosition]
+    #   @param parameter [nil] 未使用
+    #   @return [When::TM::TemporalPosition]
+    #   @note week_day は saturday, sunday, monday, tuesday, wednesday, thursday, friday に読み替えてください。
+
+    # @private
+    7.times do |k|
+      name = When.CalendarNote('ShireWeek/NoteObjects::day::Week')[k].to_s.downcase
+      module_eval %Q{
+        def #{name}(date, parameter=nil)
+          event_name = 'from_#{name}'
+          date  = date.frame.jul_trans(date, {:events=>[event_name], :precision=>When::DAY})
+          y,m,d = date.cal_date
+          h,n   = (m+5).divmod(7)
+          dow   = (182 * h[0] + 30 * n + d - #{k}) % 7
+          case m
+          when 8
+            case d
+            when 2 ; dow = 7 - #{k}
+            when 3 ; dow = (date.frame._sum([y]) == 365 && #{k} == 0) ? 0 : 8 - #{k}
+            when 4 ; dow = #{k} == 0 ? 0 : 9 - #{k}
             end
-            return date if dow == 0
-            date += When::TM::PeriodDuration.new([0,0,-dow])
-            date.events = [event_name]
-            date
+          when 9
+            dow += (date.frame._sum([y]) == 365) ? 1 : 2 if d < #{k}
           end
+          return date if dow == 0
+          date += When::TM::PeriodDuration.new([0,0,-dow])
+          date.events = [event_name]
+          date
+        end
 
-          alias :#{name}_delta :_delta
-        }
-      end
+        alias :#{name}_delta :_delta
+      }
+    end
 
-      alias :week :saturday
+    alias :week :saturday
 
-      # Enumeratorの生成
-      #
-      # @param [When::TM::TemporalPosition] first 始点
-      # @param [Symbol] direction
-      #   [ :forward - 昇順 ]
-      #   [ :reverse - 降順 ]
-      # @param [String] event イベント名
-      # @param [Integer] count_limit 繰り返し回数(デフォルトは指定なし)
-      #
-      # @return [When::CalendarTypes::ShireWeek::Enumerator]
-      #
-      def enum_for(first, direction=:forward, event=@event, count_limit=nil)
-        Enumerator.new(self, first, direction, event, count_limit)
-      end
-      alias :to_enum :enum_for
+    # オブジェクトの正規化
+    # @private
+    def _normalize(args=[], options={})
+      @event ||= 'saturday'
+      super
+    end
 
-      # オブジェクトの正規化
-      # @private
-      def _normalize(args=[], options={})
-        @event ||= 'saturday'
-        super
-      end
+    #
+    # イベントを取得する Enumerator
+    #
+    class Enumerator < When::CalendarNote::Enumerator
 
       #
-      # イベントを取得する Enumerator
+      # 次のイベントを得る
       #
-      class Enumerator < CalendarNote::Enumerator
-
-        #
-        # 次のイベントを得る
-        #
-        # @return [When::TM::TemporalPosition]
-        #
-        def succ
-          value = @current
-          plus  = @delta.sign > 0
-          if @current==:first
-            @first   = event_eval(@first) unless plus
-            @current = @first
+      # @return [When::TM::TemporalPosition]
+      #
+      def succ
+        value = @current
+        plus  = @delta.sign > 0
+        if @current==:first
+          @first   = event_eval(@first) unless plus
+          @current = @first
+        else
+          if plus
+            @current = event_eval(@current + @delta)
           else
-            if plus
-              @current = event_eval(@current + @delta)
-            else
-              @last    = event_eval(@current - When.Duration('P1D'))
-              @current = event_eval(@current + @delta)
-              unless [@current.to_i, value.to_i].include?(@last.to_i) 
-                @current = @last
-                return value
-              end
+            @last    = event_eval(@current - When.Duration('P1D'))
+            @current = event_eval(@current + @delta)
+            unless [@current.to_i, value.to_i].include?(@last.to_i) 
+              @current = @last
+              return value
             end
-            @current = event_eval(@current + @delta * 2) if @current.to_i == value.to_i
           end
-          return value
+          @current = event_eval(@current + @delta * 2) if @current.to_i == value.to_i
         end
+        return value
       end
     end
+  end
 
+  module CalendarTypes
     #
     # Shire Calendar based on summer solstice date
     #

data/lib/when_exe/region/thai.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2012 Takashi SUGA
+  Copyright (C) 2011-2014 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -11,7 +11,7 @@ module When
     ThaiTerms = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
-      "names:[ThaiTerms]",
+      "names:[ThaiTerms=]",
       "[ThaiLuniSolar=en:Thai_lunar_calendar, タイ太陰太陽暦=ja:%%<チャントラカティ>]"
     ]]
   end

data/lib/when_exe/region/tibetan.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2012 Takashi SUGA
+  Copyright (C) 2011-2014 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -11,7 +11,7 @@ module When
     TibetanTerms = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
-      "names:[TibetanTerms]",
+      "names:[TibetanTerms=]",
       "[Tibetan=en:Tibetan_calendar, 時輪暦=ja:%%<チベット暦>]",
 
       [self,

data/lib/when_exe/region/vietnamese.rb

@@ -1,172 +1,441 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2013 Takashi SUGA
+  Copyright (C) 2013-2014 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
 require 'when_exe/region/chinese_calendar'
 
-#
-#  ベトナム王位年号一覧表
-#
-# （参考文献）
-# コンサイス世界年表（三省堂）
-# 歴代紀元編（台湾中華書局）
 module When
+
+  module CalendarTypes
+
+    _Indices = [
+      Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
+                              :trunk=>When.Resource('_m:ChineseTerms::Month::*')}),
+      Coordinates::DefaultDayIndex
+    ]
+
+    _year1884 = {
+      'Years'  =>   1,
+      'Months' =>  13,
+      'Days'   => 385,
+      'IDs'    => [1,2,3,4,5, When::Coordinates::Pair.new(5,1),6,7,8,9,10,11,12],
+      'Length' => [31,29,29,30, 29, 29, 30, 29, 30, 30, 29, 30, 30],
+      'Offset' => [ 0,31,60,89,119,148,177,207,236,266,296,325,355]
+    }
+
+    #
+    #  ベトナム暦日
+    #
+    # （参考文献）
+    # 岡崎彰「ベトナムの旧暦について」(「天文学史研究会」集録 第２回)
+    # Đối chiếu lịch dương với lịch âm dương của Việt nam và Trung quốc 2030 năm (0001-2030)
+    #
+
+    # 欽授暦 1544 - 1788
+    Vietnamese1544 = [PatternTableBasedLuniSolar, {
+      'origin_of_MSC'=>1544, 'origin_of_LSC'=>2285027, 'indices'=> _Indices,
+      'rule_table'=> %w(				AbCdEFgHiJkL	aAbCdEfGHiJKl
+	aBcdEfGHIjKL	abCdeFgHIiJKL	abCdeFgHiJKL	aBcDefGhIjKL	AbCdEffGhIjKl
+
+	ABCdEfgHiJkL	aBCdEfGhIjKl	AbCcDEfGhIjKl	AbCdEfGHiJkL	aBcdEfGHiJKkL
+	aBcdEfGhIJKl	AbCdeFgHiJKL	aBcDefGghIJKl	ABcDefGhIjKl	ABcDEfgHiJkL
+	aBcDEeFgHiJkL	aBcDeFGhIjKl	AbcDeFGhIJkL	aBbcDeFgHIJkL	aBcdEfGhIJKl
+	AbCdeFghIJjKL	AbCdeFghIJkL	ABcDefGhiJkL	ABcDeFfGhIjKl	AbCDeFgHiJkL
+	abCDeFgHIjKl	AbbCdEfGHIjKl	AbcDeFgHIjKL	aBcdEfgHIjKLL	aBcdEfgHiJKL
+	AbCdeFghIjKL	AbCDefGhhIjKL	aBCdEfGhiJkL	aBCdEFgHiJkl	AbCdDEfGHiJkL
+	abCdEfGHiJKl	AbcDefGHiJKL	aBbcDefGhIJKL	aBcdEfgHiJKL	aBCdeFghIiJKl
+	ABcDeFghIjKl	ABCdEfGhiJkL	aBCdEfFGhIjkL	aBcDeFGhIJkL	abCdEfGHiJKl
+	AbcCdeFgHIJKl	AbcDefGhIJKl	ABcdEfgHiJKkL	AbCdEfgHiJkL	ABcDeFghIjKl
+	ABcDEfGhhIjKl	AbCDeFgHiJkL	aBcDeFGhIjKL	abCddEFgHIjKL	abCdeFgHIJkL
+
+	AbcDefGhIJkL	ABbcDefGhIjKL	AbCdEfgHiJkL	AbCDeFghIiJkL	aBCdEfGhIjKl
+	AbCdEFgHiJkL	aBcDeFfGHiJkL	aBcdEfGHIjKL	abCdeFgHIjKL	aBcCdeFgHiJKL
+	aBcDefGhIjKL	AbCdEfgHiJkKl	ABCdEfgHiJkL	aBCdEfGhIjKl	AbCdEFgHhIjKl
+	AbcDEFgHiJkL	aBcdEfGHiJKl	AbCddEfGhIJKl	AbCdeFghIJKL	aBcDefGhiJKl
+	ABcCDefGhiJKl	ABcDeFgHiJkL	aBcDEfGhIjJkL	aBcDeFGhIjKl	AbcDeFGhIJkL
+	aBcdEfFgHIJkL	aBcdEfgHIJKl	AbCdeFghIJkL	ABcDdeFghIJkL	ABcDefGhiJkL
+	ABcDeFgHijKkL	AbCDeFgHiJkl	AbCDeFgHIjKl	AbcDeFgHHIjKl	AbcDeFgHIjKL
+	aBcdEfgHIjKL	AbCddEfgHiJKL	AbCdeFghIjKL	AbCdEfGhiJkL	AaBCdEfGhiJkL
+	aBCdEFgHiJkL	abCdEFgHIjKkL	abCdEfGHiJKl	AbcDefGHiJKL	aBcdEffGhIJKL
+	aBcdEfgHiJKL	aBCdeFghIjKL	aBCdDeFghIjKl	ABcDEfGhiJkL	aBCdEfGHiJkkL
+
+	aBcDeFGhIJkL	abCdEfGhIJKl	AbcDefGgHIJkL	AbcDefGhIJKl	ABcdEfgHiJKl
+	ABcDeEfgHiJkL	ABcDeFghIjKl	ABcDEfGhiJkL	aAbCDeFgHiJkL	aBcDeFGhIjKl
+	AbCdeFGhIJjKL	abCdeFgHIJkL	AbcDefGhIJkL	AbCdEffGhIjKL	AbCdEfgHiJkL
+	AbCDeFghIjKl	AbCDdEfGhIjKl	AbCdEFgHiJkL	aBcDeFgHIjKlL	aBcdEfGHIjKl
+	AbCdeFgHIjKL	aBcDefGhHiJKL	aBcDefGhIjKL	aBCdEfgHijKL	aBCDeeFgHiJkL
+	aBCdEfGhIjKl	AbCdEfGHiJkL	aBbcDeFGHiJkL	aBcdEfGHiJKl	AbCdeFgHiJJKl
+	AbCdeFghIJKL	aBcDefGhiJKl	ABCdEffGhiJKl	ABcDeFgHijKL	aBcDEfGhIjKl
+	AbCcDeFGhIjKl	AbcDeFGhIJkL	aBcdEfGhIJKl	AaBcdEfgHIJKl	AbCdeFghIJkL
+	ABcDefGhhIJkL	AbCDefGhiJkL	AbCDeFgHijKl	ABcDeEFgHiJkl	AbCdEFgHIjKl
+	AbcDeFgHIJkL	aBbcDeFgHIjKL	aBcdEfgHIjKL	AbCdeFghIiJKL	AbCdeFghIjKL
+
+	AbCdEfGhiJkL	AbCDeFgGhiJkL	aBCdEfGHiJkl	AbCdEFgHIjKl	aBccDEfGHiJKl
+	AbcDefGHiJKL	aBcdEfgHiJKL	AaBcdEfgHiJKL	aBCdeFghIjKL	aBCdEfGhhIjKl
+	ABcDEfGhiJkL	aBcDEfGhIjKl	AbCdEeFGhIJkl	AbCdeFGhIJKl	AbcDefGhIJKL
+	aBbcDefGhIJKl	ABcdEfgHiJKl	ABcDeFghIjJkL	ABcDeFghIjKl	ABcDeFgHiJkL
+	aBcDEfGgHiJkL	aBcDeFGhIjKl	AbCdeFGhIJkL	AbcDdeFgHIJkL	AbcDefGhIJkL
+	AbCdEfgHiJkLL	AbCdEfgHiJkL	AbCDefGhIjKl	AbCDeFgHhIjKl	AbCdEFgHiJkL
+	aBcdEFgHIjKl	AbCddEfGHIjKl	AbCdeFgHiJKL	aBcDefGhIjKL	AbCcDefGhiJKL
+	aBCdEfgHijKL	aBCdEfGhIjKkL	aBCdEfGhIjKl	AbCdEfGHiJkL	aBcdEfGGHiJkL
+	aBcdEfGHiJKl	AbCdeFgHiJKL	aBcDdefGhIJKl	ABcDefgHiJKl	ABCdeFgHijKLl
+	ABcDeFgHijKl	ABcDEfGhIjKl	aBcDEfGHiIjKl	aBcDeFGhIJkL	aBcdEfGhIJKl
+
+	AbCdeeFgHIJkL	AbCdefGhIJkL	ABcDefgHiJkL	ABbCdEfGhiJkL	AbCDeFgHijKl
+	ABcDeFGhIjKkl	AbCdEFgHIjKl	aBcDeFgHIJkL	aBcdEffGHIjKL	aBcdeFgHIjKL
+	AbCdefGhIjKL	ABcDdefGhIjKL	AbCdEfGhiJkL	AbCDeFgHijKlL	aBCdEfGHijKl
+	AbCdEFgHiJKl	aBcDeFgHIiJKl	AbcDefGHiJKL	aBcdeFgHiJKL	AbCdeeFgHiJKL
+	aBcDefGhIjKL	aBCdEfGhiJkL	aBBcDEfGhiJkL	aBcDEfGhIjKl	AbCdEfGHiJKkl
+	AbCdeFGhIJKl	AbcDefGhIJKl	ABcdeFfGhIJKl	AbCdeFgHiJKl	ABcDeFghIjKl
+	ABCdEefGhIjKl	ABcDeFgHiJkL	aBcDeFGhIjKl	AaBcDeFgHIjKl	AbCdeFgHIJkL
+	aBcDefGhIIJkL	aBcDefGhIjKL	AbCdEfgHiJkL)
+      }
+    ]
+
+    # 西山朝の暦 1789-1801
+    Vietnamese1789 = [PatternTableBasedLuniSolar, {
+      'origin_of_MSC'=>1789, 'origin_of_LSC'=>2374505, 'indices'=> _Indices,
+      'rule_table'=> %w(				ABcDeeFgHiJkL	AbCDefGhIjKl
+	AbCDeFgHiJkL	aBcDdEFgHiJkL	aBcdEFgHIjKl	AbcDeFgHIJkL	aBbcDeFgHIjKL
+	aBcDefgHIjKL	AbCdEffgHiJKL	aBCdeFghIjKL	aBCdEfGhIjkL	AbCdDEfGhIjKl
+
+	aBCdEfGHiJkL)
+      }
+    ]
+
+    # 萬全暦 1631-1812
+    Vietnamese1631 = [PatternTableBasedLuniSolar, {
+      'origin_of_MSC'=>1631, 'origin_of_LSC'=>2316802, 'indices'=> _Indices,
+      'rule_table'=> %w(
+	ABcDeFgHiJklL	AbCDeFgHiJkL	aBcDeFGhIjKl	AbcDeFGhHIjKl	AbcDeFgHIjKL
+	aBcdEfgHIjKL	AbCddEfgHiJKL	AbCdeFghIjKL	AbCDefGhiJkL	AaBCdEfGhIjkL
+	AbCdEFgHiJkL	abCdEFgHIjKkL	abCdEfGHiJKl	AbcDeFgHiJKL	aBcdEffGhIJKL
+	aBcdEfgHiJKL	aBCdeFghIjKL	aBCdDeFghIjKL	aBCdEfGhIjkL	aBCdEfGHiJKkl
+
+	aBcDeFGhIJkL	abCdEfGHiJKl	AbcDefgGHIJkL	AbcDefGhIJKl	ABcdEfgHiJKl
+	ABCdeEfgHiJkL	ABcDeFghIjKl	ABcDEfGhiJkL	AabCDeFgHIjkL	aBcDeFGhIJkL
+	abCdEfGhIJjKL	abCdeFgHIJkL	AbcDefGhIJkL	ABcdEffGhIjKL	AbCdEfgHiJkL
+	AbCDeFghIjKl	AbCDdEfGhIjKl	AbCdEFgHiJkL	aBcDeFgHIjKlL	aBcdEfGHIjKl
+	AbCdeFgHIjKL	aBcDefGhHiJKL	aBcDefGhIjKL	AbCdEfgHiJkL	aBCDefFgHiJkL
+	aBCdEfGhIjKl	AbCdEfGHiJkL	aBbCdEfGHiJkL	aBcdEfGHiJKl	AbCdeFgHiJJKl
+	AbCdeFghIJKL	aBcDefGhiJKl	ABCdEffGhiJKl	ABcDeFgHijKl	ABcDEfGhIjKl
+	aBCdDeFGhIjKl	AbcDeFGhIJkL	aBcdEfGhIJKl	AbCcdEfgHIJkL	AbCdeFghIJkL
+	ABcDefGghIjKL	AbCDefGhiJkL	AbCDeFgHijKl	ABcDeEFgHiJkl	AbCDeFgHIjKl
+	AbcDeFgHIJkL	aBccDeFgHIjKL	aBcdEfgHIjKL	AbCdeFggHiJKL	AbCdeFghIjKL
+
+	AbCdEfGhiJkL	AbCDeFgGhiJkL	aBCdEfGHiJkl	AbCdEFgHIjKl	aBccDEfGHiJKl
+	AbcDefGHiJKL	aBcdEfgHiJKL	AaBcdEfgHiJKL	aBCdeFghIjKL	aBCdEfGhhIjKl
+	ABcDEfGhiJkL	aBcDEfGhIjKl	AbCdEeFGhIJkl	AbCdEfGhIJKl	AbcDefGhIJKL
+	aBccDefGhIJKl	ABcdEfgHiJKl	ABcDeFghHiJkL	ABcDeFghIjKl	ABcDeFgHiJkL
+	aBcDEfFgHiJkL	aBcDeFGhIjKl	AbCdeFGhIJkL	AbcDdeFgHIJkL	aBcDefGhIjKL
+	AbCdEfgHiJkLL	AbCdEfgHiJkL	AbCDefGhIjKl	AbCDeFgHhIjKl	AbCdEFgHiJkL
+	aBcdEFgHIjKl	AbCddEfGHIjKl	AbCdeFgHiJKL	aBcDefGhIjKL	AbCcDefGhiJKL
+	aBCdEfgHijKL	aBCdEfGhIjKkL	aBCdEfGhIjKl	AbCdEfGHiJkL	aBcdEfGGHiJkL
+	aBcdEfGHiJKl	AbCdeFgHiJKL	aBcDdefGhIJKl	ABcDefgHiJKl	ABCdEfgHijKLl
+	ABcDeFgHijKl	ABcDEfGhIjKl	aBcDEfGHiIjKl	aBcDeFGhIJkL	aBcdEfGhIJKl
+
+	AbCdeeFgHIJkL	AbCdefGhIJkL	ABcDefgHiJkL	ABbCdEfGhiJkL	AbCDeFgHijKl
+	ABcDeFGhIjKkl	AbCdEFgHIjKl	aBcDeFgHIJkL	aBcdEffGHIjKL	aBcdeFgHIjKL
+	AbCdefGhIjKL	ABcDdefGhIjKL	AbCdEfGhiJkL	AbCDeFgHijKlL	aBCdEfGHijKl
+	AbCdEFgHiJKl	aBcDeFgHIiJKl	AbcDefGHiJKL	aBcdeFgHiJKL	AbCdeeFgHiJKL
+	aBcDefGhIjKL	aBCdEfGhiJkL	aBBcDEfGhiJkL	aBcDEfGhIjKl	AbCdEfGHiJKkl
+	AbCdeFGhIJKl	AbcDefGhIJKl	ABcdeFfGhIJKl	AbCdeFgHiJKl	ABcDeFghIjKl
+	ABCdEefGhIjKl	ABcDeFgHiJkL	aBcDeFGhIjKl	AaBcDeFgHIjKl	AbCdeFgHIJkL
+	aBcDefGhIIJkL	aBcDefGhIjKL	AbCdEfgHiJkL	ABcDeeFgHiJkL	AbCDefGhIjKl
+	AbCDeFgHiJkL	aBbCdEFgHiJkL	aBcdEFgHIjKl	AbcDeFgHIJkKl	AbcDeFgHiJKL
+	aBcDefgHIjKL	AbCdEfggHiJKL	aBCdeFghIjKL	aBCdEfGhIjkL	AbCDdEfGhIjKl
+
+	aBCdEfGHiJkL	abCdEfGHIjKl	AabCdEfGHiJKl	AbcDefGHiJKL	aBcDefgHhIJKl
+	ABcDefgHiJKl	ABCdeFghIjKL	aBCdEfFgHijKl	ABcDEfGhIjkL	aBcDEfGHiJkL
+	abBcDeFGhIJkL	abCdEfGhIJKl)
+      }
+    ]
+
+    # 協紀暦以降 1813-2030
+    Vietnamese1813 = [PatternTableBasedLuniSolarExtended, {
+      'origin_of_MSC'=>1813, 'origin_of_LSC'=>2383276, 'indices'=> _Indices,
+      'rule_table'=> %w(		AbCdefGhIJKl	ABbCdefGhIJkL	ABcdEfgHiJkL
+	ABcDeFfgHiJkL	AbCDeFgHijKl	AbCDeFGhIjkL	aBcDdEFgHIjKl	aBcDeFgHIJkL
+	abCdeFgHIJkL	AbCcdeFgHIjKL	AbCdefGhIjKL	AbCdEfgGhIjKL	AbCdEfgHiJkL
+	AbCDeFghIjKl	AbCDeEfGhIjKl	AbCdEFgHiJkL	aBcDeFgHIjKL	abCddEfGHiJKL
+	abCdeFgHiJKL	aBcDefGhIiJKL	aBcDefGhIjKL	aBCdEfgHiJkL	aBCdEFfgHiJkL
+	aBcDEfGhIjKl	AbCdEfGHiJkL	aBcDdeFGhIJkL	aBcdEfGhIJKl	AbCdeFgHiJKL
+	aBcCdeFgHiJkL	ABcDefGhIjKl	ABCdEfgGhIjKl	ABcDeFgHiJkL	aBcDEfGhIjKl
+	AbCdEeFgHIjKl	AbcDeFgHIJkL	aBcdEfGhIJKl	AbCddEfgHIjKL	AbCdeFghIJkL
+
+	ABcDefGhhIjKL	AbCDefGhIjkL	AbCDeFgHiJkL	aBcDeFGgHiJkL	abCdEFgHIjKl
+	AbcDeFgHIJkL	aBcdEeFgHiJKL	aBcdEfgHIjKL	AbCdeFghIjKL	AbCCdeFghIjKL
+	aBCdEfGhIjkL	AbCdEFgHhIjkL	aBCdEfGHiJkL	abCdEfGHiJKl	AbcDeEfGHiJKl
+	AbcDefGHiJKL	aBcdEfgHiJKL	aBCddEfgHiJKl	ABCdeFghIjKl	ABCdEfGhiJjKl
+	ABcDEfGhIjkL	aBcDEfGhIJkL	abCdEfFGhIJkL	abCdEfGhIJKl	AbcDefGhIJKl
+	ABcdEefGhIJkL	ABcdEfgHiJkL	ABcDeFghIjKl	ABcCDeFghIjKl	AbCDeFGhIjkL
+	aBcDeFGgHIjKl	aBcDeFgHIjKL	abCdeFgHIJkl) + [_year1884] + %w(AbcDefGhIjKL
+	AbCdEfgHiJkL	AbCDdEfgHiJkL	AbCDeFghIjKl	AbCDeFgHiJkL	aBbCdEfGHiJkL
+	aBcDeFgHIjKL	abCdeFfGHiJKL	abCdeFgHiJKL	aBcDefGhIjKL	AbCdEefGhIjKL
+	aBCdEfgHiJkL	aBCdEfGhIjKl	AbCcDEfGhIjKl	AbCdEfGHiJkL	aBcdEfGHhIJkL
+
+	aBcdEfGhIJKl	AbCdeFgHiJKL	aBcDeeFghIJkL	ABcDefGhiJKl	ABcDEfgHiJkL
+	aBCdDeFgHiJkL	aBcDeFGhIjKl	AbcDEfGhIJkL	aBbcDeFgHIJkL	aBcdEfGhIJKl
+	AbCdeFfgHIjKL	AbCdeFghIJkL	ABcDefGhiJkL	ABcDeEfGhiJkL	AbCDeFgHiJkl
+	ABcDeFGhIjKl	AbbCdEFgHIjKl	AbcDeFgHIjKL	aBcdEfgGHiJKL	aBcdEfgHiJKL
+	AbCdeFghIjKL	AbCDeeFghIjKL	aBCdEfGhiJkL	aBCdEFgHiJkL	abCdDEfGHiJkL
+	abCdEfGHiJKl	AbcDeFgHIjKL	aBbcDefGhIJKL	aBcdEfgHiJKL	aBCdeFfgHiJKl
+	ABcDeFghIjKl	ABCdEfGhiJkL	aBCdEEfGhIjkL	aBcDEfGhIJkL	abCdEfGHiJKl
+	AbcCdeFGhIJKl	AbcDefGhIJKl	ABcdEfgGhIJkL	ABcdEfgHiJkL	ABcDeFghIjKl
+	ABcDEfFghIjKl	AbCDeFgHiJkL	aBcDeFGhIjKl	AbCdDeFgHIjKL	abCdeFgHIJkL
+	AbcDefGhIJkL	ABbcDefGhIjKL	AbCdEfgHiJkL	AbCDeFggHiJkL	aBCdEFghIjKl
+
+	AbCDeFgHiJkL	aBcDeEfGHiJkL	aBcdEfGHIjKl	AbCdeFgHIjKL	aBcCdeFgHiJKL
+	aBcDefGhIjKL	AbCdEfgHhIjKl	ABCdEfgHiJkL	aBCdEfGhIjKl	AbCdEFfGhIjKl
+	AbCdEfGHiJkL	aBcdEfGHiJKl	AbCddEfGhIJKl	AbCdeFgHiJKL	aBcDefGhiJKl
+	ABCcDefGhiJKl	ABcDEfgHiJkl	ABcDEfGgHiJkl	ABcDeFGhIjKl	AbcDeFGhIJkL
+	aBcdEeFgHIJkL	aBcdEfGhIJkL	AbCdeFghIJkL	ABcDdeFghIjKL	AbCDefGhiJkL
+	ABcDeFgHhiJkL	AbCDeFgHiJkl	AbCDeFgHIjKl	aBcDeFFgHIjKl	AbcDeFgHIjKL
+	aBcdEfgHIjKL	AbCddEfgHiJKL	AbCdeFghIjKL	AbCdEfGhiJkL	AbBCdEfGhiJkL
+	aBCdEFgHijKl	AbCdEFgGHiJkl	AbCdEfGHiJKl	AbcDefGHiJKL	aBcdEefGhIJKL
+	aBcdEfgHiJKL	aBCdeFghIjKL	aBCcDeFghIjKl	ABCdEfGhiJkL	aBCdEfGhHiJkL
+	aBcDeFGhIjKl	AbCdEfGhIJKl	AbcDeeFGhIJkL	AbcDefGhIJKl	ABcdEfgHiJKl
+
+	ABcDdEfgHiJkL	ABcDeFghIjKl	ABcDEfGhiJkL	aBbCDeFgHiJkL	aBcDeFGhIjKl
+	AbCdeFGgHIjKl	AbCdeFgHIJkL	AbcDefGhIjKL	AbCdEefGhIjKL	AbCdEfgHiJkL
+	AbCDeFghIjKl	AbCDdEfGhIjKl	AbCdEFgHiJkL	aBcDeFgHIiJkL	aBcdEfGHIjKl
+	AbCdeFgHIjKL	aBcDefFgHiJKL	aBcDefGhiJKL	aBCdEfgHijKL	aBCDdEfgHijKL
+	aBCdEfGhIjKl	AbCdEFgHiJkL	aBbcDEfGHiJkL	aBcdEfGHiJKl	AbCdeFfGhIJKl
+	AbCdeFghIJKl	ABcDefGhiJKl	ABCdEefGhiJKl	ABcDeFgHijKl	ABcDEfGhIjKl)
+      }
+    ]
+  end
+
   class TM::CalendarEra
 
     #
-    # ベトナム
+    #  ベトナム王位年号一覧表
+    #
+    # （参考文献）
+    # コンサイス世界年表（三省堂）
+    # 歴代紀元編（台湾中華書局）
+    # wikipedia 元号一覧 (ベトナム)
     #
-    Vietnamese = [self, [
+    Vietnamese = [{'LY'=>{'TT'    => {'A'=>'1072', 'B'=>'1076', 'C'=>'1138',    'D'=>'1140.02', 'E'=>'1224.10'},
+                          'VSL'   => {'A'=>'1073', 'B'=>'1075', 'C'=>'1137.09', 'D'=>'1140.01', 'E'=>'1225.06'}},
+                   'DN'=>{'KDVNT' => {'Z'=>'Chinese1645',  },
+                          'LDNK'  => {'Z'=>'Vietnamese1813'}}}, self, [
       "namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
       "locale:[=ja:, en=en:, alias]",
-      "area:[ベトナム=ja:%%<元号>#%.<ベトナム>,Vietnam]",
+      'area:[ベトナム#{?LY=LY}#{&DN=DN}=ja:%%<元号>#%.<ベトナム>,Vietnam#{?LY=LY}#{&DN=DN}=en:Vietnam]',
+      [self,
+	"period:[前李朝,Early Lý Dynasty]",
+	["[天徳,alias:大徳]1","@F","name=[李賁];544.01^Chinese0445", "548.03.21="],
+	["[桃郎王]1",  "@A","name=[李天宝];548.03.21", "555="],
+	["[趙越王]1",  "@A","name=[趙光復];548.03.21"],
+	["[後李南帝]1","@A","name=[李仏子];571", "590^Chinese0523", "602="]
+      ],
       [self,
-	"period:[呉朝]",
-	["[呉権]1",	"@F",	 "name=[呉権];939^Chinese0939", "943="],
-	["[天策王]1",	"@A",  "name=[天策王];952"],
-	["[南晋王]1",	"@A",  "name=[南晋王];954"],
+	"period:[呉朝,Ngô Dynasty]",
+	["[呉権]1",	"@F",	 "name=[呉権];939^Chinese0939"],
+	["[平王]1",	"@A",  "name=[楊三哥];944"],
+	["[天策王]1",	"@A",  "name=[呉昌岌];951"],
+	["[南晋王]1",	"@A",  "name=[呉昌文];954"],
 	["[呉昌熾]1",	"@A",  "name=[呉昌熾];966", "968"]
       ],
       [self,
-	"period:[丁朝]",
-	["[太平]1",	"@F",  "name=[丁部領];968^Chinese0939"],
-	["[太平]12",	"@A",	 "name=[衛王];979", "980"]
+	"period:[丁朝,Đinh Dynasty]",
+	["[太平]1",	"@F",  "name=[丁部領];970^Chinese0939",
+				 "name=[衛王];979", "980="]
       ],
       [self,
-	"period:[前黎朝]",
+	"period:[前黎朝,Early Lê dynasty]",
 	["[天福]1",	"@F",	 "name=[黎桓];980^Chinese0939"],
 	["[興統]1",	"@A",		     "989"],
-	["[応天]1",	"@A",		     "994"],
-	["[応天]12",	"@A",	"name=[中宗];1005"],
-	["[景瑞]1",	"@A", "name=[臥朝王];1005", "1009"]
+	["[応天]1",	"",		     "994",
+				"name=[中宗];1005", ""],
+	["[景瑞,alias:建瑞]1","@A","name=[臥朝王];1008", "1009="]
       ],
       [self,
-	"period:[李朝]",
-	["[順天]1",	"@F",	"name=[太祖];1009^Chinese0939"],
-	["[天成]1",	"@A",	"name=[太宗];1028"],
-	["[通瑞]1",	"@A",		    "1034"],
-	["[乾符有道]1",	"@A",		    "1039"],
-	["[明道]1",	"@A",		    "1042"],
-	["[天感聖武]1",	"@A",		    "1044"],
-	["[崇興大宝]1",	"@A",		    "1049"],
-	["[龍瑞太平]1",	"@A",	"name=[聖宗];1054"],
-	["[彰聖嘉慶]1",	"@A",		    "1059"],
-	["[龍章天嗣]1",	"@A",		    "1065"],
-	["[天貺宝象]1",	"@A",		    "1067"],
-	["[神武]1",	"@A",		    "1068"],
-	["[太寧]1",	"@A",	"name=[仁宗];1072"],
-	["[英武昭聖]1",	"@A",		    "1076"],
-	["[広祐]1",	"@A",		    "1085"],
-	["[会豊]1",	"@A",		    "1092"],
-	["[龍符]1",	"@A",		    "1101"],
-	["[会祥大慶]1",	"@A",		    "1109"],
-	["[天符睿武]1",	"@A",		    "1118"],			# このあたり２年のズレがあるか？
-	["[天符慶寿]1",	"@A",		    "1127"],
-	["[天順]1",	"@A",	"name=[神宗];1128"],
-	["[天彰宝嗣]1",	"@A",		    "1133.01.01"],
-	["[紹明]1",	"@A",	"name=[英宗];1138"],
-	["[大定]1",	"@A",		    "1140.01.01"],
-	["[政隆宝応]1",	"@A",		    "1163.01.01"],
-	["[天感至宝]1",	"@A",		    "1174.01.01"],
-	["[貞符]1",	"@A",	"name=[高宗];1176"],
-	["[天資嘉瑞]1",	"@A",		    "1186.01.01"],
-	["[天資宝祐]1",	"@A",		    "1202.01.01"],
-	["[治平龍応]1",	"@A",		    "1205"],
+	"period:[李朝,Lý Dynasty]",
+	["[順天]1",	"@F",	"name=[太祖];1010.01.01^Chinese0939"],
+	["[天成,alias:徳成]1","@A","name=[太宗];1028.04.01"],
+	["[通瑞]1",	"",		    "1034.04"],
+	["[乾符有道]1",	"",		    "1039.06"],
+	["[明道]1",	"",		    "1042.10"],
+	["[天感聖武]1",	"",		    "1044.10"],
+	["[崇興大宝]1",	"",		    "1049.03"],
+	["[龍瑞太平]1",	"@A",	"name=[聖宗];1054.10"],
+	["[彰聖嘉慶]1",	"",		    "1059"],
+	["[龍彰天嗣]1",	"",		    "1066"],
+	["[天貺宝象,alias:天祝宝象]1","",   "1068"],
+	["[神武]1",	"",		    "1069"],
+	["[太寧,alias:泰寧]1","@A",'name=[仁宗];#{A:1072}'],
+	["[英武昭聖,alias:英武昭勝]1","",'#{B:1076}'],
+	["[広祐,alias:広佑]1","",	    "1085"],
+	["[会豊]1",	"",		    "1092"],
+	["[龍符,alias:龍符元化,alias:乾符]1","","1101"],
+	["[会祥大慶]1",	"",		    "1110"],
+	["[天符睿武]1",	"",		    "1120"],
+	["[天符慶寿]1",	"",		    "1127"],
+	["[天順,alias:大順]1","@A","name=[神宗];1128"],
+	["[天彰宝嗣]1",	"",		    "1133.01.01"],
+	["[紹明]1",    "@A",'name=[英宗];#{C:1138}'],
+	["[大定]1",	"",		'#{D:1140.02}'],
+	["[政隆宝応]1",	"",		    "1163.01.01"],
+	["[天感至宝]1",	"",		    "1174.02"],
+	["[貞符,alias:宝符]1","@A","name=[高宗];1176"],
+	["[天資嘉瑞]1",	"",		    "1186.07"],
+	["[天嘉宝祐]1",	"",		    "1202.08"],
+	["[治平龍応]1",	"",		    "1205.03"],
 	["[建嘉]1",	"@A",	"name=[恵宗];1211"],
-	["[天彰有道]1",	"@A",	"name=[昭皇];1224", "1225"]
+	["[天彰有道]1","@A",'name=[昭皇];#{E:1224.10}', "1225.12.11="]
       ],
       [self,
-	"period:[陳朝]",
-	["[建中]1",	"@F",	"name=[太宗];1225^Chinese0939"],
-	["[天応政平]1",	"@A",		    "1232.01.01"],
-	["[元豊]1",	"@A",		    "1251.01.01"],
-	["[紹隆]1",	"@A",	"name=[聖宗];1258"],
-	["[宝符]1",	"@A",		    "1273.01.01"],
-	["[紹宝]1",	"@A",	"name=[仁宗];1279"],
-	["[重興]1",	"@A",		    "1285"],
-	["[興隆]1",	"@A",	"name=[英宗];1293"],
-	["[大慶]1",	"@A",	"name=[明宗];1314"],
-	["[開泰]1",	"@A",		    "1324.01.01"],
-	["[開祐]1",	"@A",	"name=[憲宗];1329"],
-	["[紹豊]1",	"@A",	"name=[裕宗];1341"],
-	["[大治]1",	"@A",		    "1358.01.01"],
+	"period:[陳朝,Trần Dynasty]",
+	["[建中]1",	"@F",	"name=[太宗];1225.12.11^Chinese0939"],
+	["[天応政平]1",	"",		    "1232.07.23"],
+	["[元豊]1",	"",		    "1251.02"],
+	["[紹隆]1",	"@A",	"name=[聖宗];1258.02.24"],
+	["[宝符]1",	"",		    "1273.01.01"],
+	["[紹宝]1",	"@A",	"name=[仁宗];1279.01"],
+	["[重興]1",	"",		    "1285.09"],
+	["[興隆]1",	"@A",	"name=[英宗];1293.03.09"],
+	["[大慶]1",	"@A",	"name=[明宗];1314.03.18"],
+	["[開泰]1",	"",		    "1324.01"],
+	["[開祐]1",	"@A",	"name=[憲宗];1329.02.15"],
+	["[紹豊]1",	"@A",	"name=[裕宗];1341.08.21"],
+	["[大治,alias:太治]1","",	    "1358.01.01"],
 	["[大定]1",	"@A", "name=[楊日礼];1369"],
 	["[紹慶]1",	"@A",	"name=[芸宗];1370"],
-	["[隆慶]1",	"@A",	"name=[睿宗];1373"],
+	["[隆慶]1",	"@A",	"name=[睿宗];1373.01.01"],
 	["[昌符]1",	"@A",	"name=[廃帝];1377"],
-	["[光泰]1",	"@A",	"name=[順宗];1388"],
+	["[光泰]1",	"@A",	"name=[順宗];1388.12"],
 	["[建新]1",	"@A",	"name=[少帝];1398", "1400="]
       ],
       [self,
-	"period:[後陳朝]",
+	"period:[胡朝,Hồ Dynasty]",
+	["[聖元]1",	"@F", "name=[胡季犛];1400^Chinese0939"],
+	["[紹成,alias:紹聖]1","@A","name=[胡漢蒼];1401"],
+	["[開大]1",	"",		    "1403", "1407="]
+      ],
+      [self,
+	"period:[後陳朝,Later Trần dynasty]",
 	["[興慶]1",	"@F", "name=[簡定帝];1407^Chinese0939"],
-	["[重光]1",	"@A", "name=[重光帝];1409", "1414.03="]
+	["[重光]1",	"@A", "name=[重光帝];1409", "1414.03="],
+	["[天慶,alias:慶天]1","@A","name=[陳暠];1426.11","1428.01.10="]
       ],
       [self,
-	"period:[後黎朝]",
-	["[順天]1",	"@F",	"name=[太祖];1428^Chinese0939"],
+	"period:[前期黎朝,Later Lê Dynasty early period]",
+	["[順天]1",	"@F",	"name=[太祖];1428.04.15^Chinese0939"],
 	["[紹平]1",	"@A",	"name=[太宗];1434"],
-	["[大宝]1",	"@A",		    "1440.01.01"],
-	["[太和]1",	"@A",	"name=[仁宗];1443"],
-	["[延寧]1",	"@A",		    "1454.01.01"],
-	["[天興]1",	"@A",	"name=[廃帝];1459"],
-	["[光順]1",	"@A",	"name=[聖宗];1460"],
-	["[洪徳]1",	"@A",		    "1470.01.01"],
+	["[大宝]1",	"",		    "1440.01.01"],
+	["[太和,alias:太和]1","@A","name=[仁宗];1443"],
+	["[延寧]1",	"",		    "1454.01.01"],
+	["[天興,alias:天與]1","@A","name=[廃帝];1459.10.07"],
+	["[光順]1",	"@A",	"name=[聖宗];1460.06.08"],
+	["[洪徳]1",	"",		    "1470.01.01"],
 	["[景統]1",	"@A",	"name=[憲宗];1498"],
-	["[泰貞]1",	"@A",	"name=[粛宗];1504"],
+	["[泰貞]1",	"@A",	"name=[粛宗];1504.06"],
 	["[端慶]1",	"@A", "name=[威穆帝];1505"],
-	["[洪順]1",	"@A", "name=[襄翼帝];1509"],
-	["[光紹]1",	"@A",	"name=[昭宗];1516"],
-	["[統元]1",	"@A",	"name=[恭帝];1522", "1527="],
-	["[元和]1",	"@A",	"name=[荘宗];1533"],
+	["[洪順]1",	"@A", "name=[襄翼帝];1509.12.04"],
+	["[光紹]1",	"@A",	"name=[昭宗];1516.04.27"],
+	["[統元]1",	"@A",	"name=[恭帝];1522.08", "1527.06="],
+      ],
+      [self,
+	"period:[莫朝,Mạc dynasty]",
+	["[明徳]1",	"@F",	"name=[太祖];1527.06^Chinese0939"],
+	["[大正,alias:天正,alias:大政]1","@A","name=[太宗];1530"],
+	["[広和]1",	"@A",	"name=[憲宗];1541", "1544^Vietnamese1544", ""],
+	["[永定]1",	"@A",	"name=[宣宗];1547"],
+	["[景暦,alias:景歴]1","",	    "1548"],
+	["[光宝]1",	"",		    "1554"],
+	["[淳福]1",	"@A",	"name=[英宗];1562"],
+	["[崇康]1",	"",		    "1566"],
+	["[延成]1",	"",		    "1578"],
+	["[端泰]1",	"",		    "1586"],
+	["[興治]1",	"",		    "1588"],
+	["[洪寧]1",	"",		    "1591"],
+	["[武安]1",	"@A",	"name=[景宗];1592.10", "1593.01="],
+	["[宝定]1",	"@A",	"name=[閔宗];1592.12"],
+	["[康佑,alias:康祐]1",	"",	    "1593.01"],
+	["[乾統]1",	"@A",	"name=[代宗];1593", "1625="],
+	["[隆泰]1",	"@A",	"name=[光祖];1618", "1625="],
+	["[順徳]1",	"@A",	"name=[明宗];1638", "1677="],
+      ],
+      [self,
+	"period:[後期黎朝,Later Lê Dynasty warlord period]",
+	["[元和]1",	"@A",	"name=[荘宗];1533^Chinese0939", "1544^Vietnamese1544", ""],
 	["[順平]1",	"@A",	"name=[中宗];1549"],
-	["[天祐]1",	"@A",	"name=[英宗];1557"],
-	["[正治]1",	"@A",		    "1558.01.01"],
-	["[洪福]1",	"@A",		    "1572.01.01"],
+	["[天祐,alias:天佑]1","@A","name=[英宗];1557"],
+	["[正治]1",	"",		    "1558.01.01"],
+	["[洪福]1",	"",		    "1572.01.01"],
 	["[嘉泰]1",	"@A",	"name=[世宗];1573"],
-	["[光興]1",	"@A",		    "1578.01.01"],
-	["[慎徳]1",	"@A",	"name=[敬宗];1600"],
-	["[弘定]1",	"@A",		    "1600"],
-	["[永祚]1",	"@A",	"name=[神宗];1619"],
-	["[徳隆]1",	"@A",		    "1629.01.01"],
-	["[陽和]1",	"@A",		    "1635.01.01"],
-	["[福泰]1",	"@A",	"name=[真宗];1643", "1645^Chinese1645", ""],
+	["[光興]1",	"",		    "1578.01.01"],
+	["[慎徳]1",	"@A",	"name=[敬宗];1600.01"],
+	["[弘定]1",	"",		    "1600.11"],
+	["[永祚]1",	"@A",	"name=[神宗];1619.06"],
+	["[徳隆]1",	"",		    "1629.04"],
+	["[陽和]1",	"",		    "1635.01.01"],
+	["[福泰]1",	"@A",	"name=[真宗];1643"],
 	["[慶徳]1",	"@A",	"name=[神宗];1649"],
-	["[盛徳]1",	"@A",		    "1653"],
-	["[永寿]1",	"@A",		    "1658"],
+	["[盛徳]1",	"",		    "1653"],
+	["[永寿]1",	"",		    "1658.02"],
 	["[万慶]1",	"@A",	"name=[玄宗];1662"],
-	["[景治]1",	"@A",		    "1663.01.01"],
+	["[景治]1",	"",		    "1663.01.01"],
 	["[陽徳]1",	"@A",	"name=[嘉宗];1672"],
-	["[徳元]1",	"@A",		    "1674"],
+	["[徳元]1",	"",		    "1674.10"],
 	["[永治]1",	"@A",	"name=[熙宗];1676"],
-	["[正和]1",	"@A",		    "1680"],
+	["[正和]1",	"",		    "1680.11"],
 	["[永盛]1",	"@A",	"name=[裕宗];1705"],
-	["[保泰]1",	"@A",		    "1720.01.01"],
+	["[保泰]1",	"",		    "1720.01.01"],
 	["[永慶]1",	"@A",	"name=[廃帝];1729"],
 	["[龍徳]1",	"@A",	"name=[純宗];1732"],
-	["[永佑]1",	"@A",	"name=[懿宗];1735"],
+	["[永佑,alias:永祐]1","@A","name=[懿宗];1735"],
 	["[景興]1",	"@A",	"name=[顕宗];1740"],
-	["[昭統]1",	"@A",	"name=[愍帝];1787", "1789.10="]
+	["[昭統]1",	"@A",	"name=[愍帝];1787", "1789^Vietnamese1789", "1789.10="]
+      ],
+      [self,
+	"period:[西山朝,Tây Sơn Dynasty]",
+	[self,
+	  "period:[帰仁朝廷,Quy Nhơn]",
+	  ["[泰徳]1",	"@F", "name=[阮文岳];1778^Vietnamese1544"],
+	  ["[太祖]12",	"",		    "1789^Vietnamese1789"],
+	  ["[孝公]1",	"@A", "name=[阮文宝];1793", "1798="]
+        ],
+	[self,
+	  "period:[富春朝廷,Phú Xuân]",
+	  ["[光中]1",	"@A", "name=[阮光平];1788^Vietnamese1544", "1789^Vietnamese1789", ""],
+	  ["[景盛]1",	"@A", "name=[阮光纉];1793"],
+	  ["[宝興]1",	"",		    "1801", "1802="],
+        ]
+      ],
+      [self,
+	"period:[広南,Nguyễn lords]",
+	["[阮潢]1",	"@A",	"name=[太祖];1558^Vietnamese1544"],
+	["[阮福源]1",	"@A",	"name=[熙宗];1613^Vietnamese1544", "1631^Vietnamese1631", ""],
+	["[阮福瀾]1",	"@A",	"name=[神宗];1635.10.11"],
+	["[阮福瀕]0",	"@A",	"name=[太宗];1648.02.27"],
+	["[阮福溙]0",	"@A",	"name=[英宗];1687.03.20"],
+	["[阮福淍]0",	"@A",	"name=[顕宗];1691.01.11"],
+	["[阮福澍]0",	"@A",	"name=[粛宗];1725.04.22"],
+	["[阮福闊]0",	"@A",	"name=[世宗];1738.04.21"],
+	["[阮福淳]0",	"@A",	"name=[睿宗];1765.05.21"],
+ 	["[阮福暎]1",	"@A",	"name=[世祖];1778", "1778"]
       ],
       [self,
-	"period:[阮朝]",
-	["[嘉隆]1",	"@F",	"name=[世祖];1802^Chinese1645"],
+	"period:[阮朝,Nguyễn Dynasty]",
+	["[嘉隆]1",	"@F",	"name=[世祖];1802.05.02^Vietnamese1631", "1813^Vietnamese1813", ""],
 	["[明命]1",	"@A",	"name=[聖祖];1820"],
 	["[紹治]1",	"@A",	"name=[憲祖];1841"],
-	["[嗣徳]1",	"@A",	"name=[翼宗];1848"],
-	["[育徳]1",	"@A", "name=[育徳帝];1883"],
-	["[協和]1",	"@A", "name=[協和帝];1883"],
+	["[嗣徳]1",	"@A",	"name=[翼宗];1848", '1849^#{Z:Chinese1645}', "1850^Vietnamese1813", ""],
+	["[育徳]1",	"@A",	"name=[恭宗];1883"],
+	["[協和]1",	"@A",	"name=[廃帝];1883"],
 	["[建福]1",	"@A",	"name=[簡宗];1884"],
-	["[咸宜]1",	"@A", "name=[咸宜帝];1885"],
-	["[同慶]1",	"@A",	"name=[景宗];1885",
-					    "1887.10.17^Gregorian?note=ChineseNotes", ""],
-	["[成泰]1",	"@A", "name=[成泰帝];1889"],
-	["[維新]1",	"@A", "name=[維新帝];1907"],
-	["[啓定]1",	"@A", "name=[啓定帝];1916"],
-	["[保大]1",	"@A", "name=[保大帝];1926", "1945.09.02="]
+	["[咸宜]1",	"@A",	"name=[出帝];1885.01.01"],
+	["[同慶]0.10.01","@A",	"name=[敬宗];1885.10.01"],
+	["[成泰]1",	"@A", "name=[阮福昭];1889"],
+	["[維新]1",	"@A", "name=[阮福晃];1907"],
+	["[啓定]1",	"@A",	"name=[弘宗];1916"],
+	["[保大]1",	"@A", "name=[阮福晪];1926", "1945.09.02=^Gregorian"]
       ]
     ]]
   end