From b83fbe8cc7c3190b2c84e1bec2f312936240eeed Mon Sep 17 00:00:00 2001
From: 6tail <6tail@6tail.cn>
Date: Sun, 23 May 2021 22:33:25 +0800
Subject: [PATCH] =?UTF-8?q?v1.2.3=20=E4=BF=AE=E6=AD=A32016=E5=B9=B4?=
 =?UTF-8?q?=E5=9B=BD=E5=BA=86=E8=8A=82=E6=95=B0=E6=8D=AE=EF=BC=9B=E5=88=A0?=
 =?UTF-8?q?=E9=99=A45=E6=9C=8823=E6=97=A5=E4=B8=96=E7=95=8C=E8=AF=BB?=
 =?UTF-8?q?=E4=B9=A6=E6=97=A5=EF=BC=9B=E4=BF=AE=E5=A4=8Dv1.2.0=E5=92=8Cv1.?=
 =?UTF-8?q?2.1=E7=9A=84=E9=87=8D=E5=A4=A7bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                  |   2 +
 __tests__/EightChar.test.js |  11 +-
 __tests__/Holiday.test.js   |   4 +
 __tests__/Lunar.test.js     | 181 +++++++++++++++++++++-
 __tests__/Yun.test.js       |  23 ++-
 lunar.js                    | 294 ++++++++++++++++--------------------
 package.json                |   2 +-
 7 files changed, 345 insertions(+), 172 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1062418..ef1714b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .idea/
 *.iml
+node_modules/
+package-lock.json
diff --git a/__tests__/EightChar.test.js b/__tests__/EightChar.test.js
index 81f0ec4..a903a73 100644
--- a/__tests__/EightChar.test.js
+++ b/__tests__/EightChar.test.js
@@ -1,4 +1,4 @@
-var {Solar} = require('../lunar');
+var {Solar, Lunar} = require('../lunar');
 
 test('test1', () => {
   const solar = Solar.fromYmdHms(2005, 12, 23, 8, 37, 0);
@@ -53,6 +53,15 @@ test('test4', () => {
   expect(eightChar.getTime()).toBe('辛亥');
 });
 
+test('test5', () => {
+  const lunar = Lunar.fromYmdHms(2019,12,12,11,22,0);
+  const eightChar = lunar.getEightChar();
+  expect(eightChar.getYear()).toBe('己亥');
+  expect(eightChar.getMonth()).toBe('丁丑');
+  expect(eightChar.getDay()).toBe('戊申');
+  expect(eightChar.getTime()).toBe('戊午');
+});
+
 test('地支藏干', () => {
   const solar = Solar.fromYmdHms(2005, 12, 23, 8, 37, 0);
   const lunar = solar.getLunar();
diff --git a/__tests__/Holiday.test.js b/__tests__/Holiday.test.js
index 85702ea..53d4ddc 100644
--- a/__tests__/Holiday.test.js
+++ b/__tests__/Holiday.test.js
@@ -38,3 +38,7 @@ test('test1', () => {
   expect(HolidayUtil.getHoliday('2021-11-11') + '').toBe('2021-11-11 结婚纪念日 2021-11-11');
   expect(HolidayUtil.getHoliday('2021-12-01') + '').toBe('2021-12-01 她的生日 2021-12-01');
 });
+
+test('test2', () => {
+  expect(HolidayUtil.getHoliday('2016-10-04').getTarget()).toBe('2016-10-01');
+});
diff --git a/__tests__/Lunar.test.js b/__tests__/Lunar.test.js
index c0a88bb..cfe1c34 100644
--- a/__tests__/Lunar.test.js
+++ b/__tests__/Lunar.test.js
@@ -1,4 +1,4 @@
-var {Solar} = require('../lunar');
+var {Solar, Lunar} = require('../lunar');
 
 test('干支', () => {
   let solar = Solar.fromYmdHms(2020, 1, 1, 13, 22, 0);
@@ -182,3 +182,182 @@ expect(lunar.getYearInGanZhiExact()).toBe('丙寅');
 expect(lunar.getMonthInGanZhi()).toBe('癸巳');
 expect(lunar.getMonthInGanZhiExact()).toBe('癸巳');
 });
+
+test('test8', () => {
+  const lunar = Lunar.fromYmdHms(2020,12,10,13,0,0);
+  expect(lunar.toString()).toBe('二〇二〇年腊月初十');
+  expect(lunar.getSolar().toString()).toBe('2021-01-22');
+});
+
+test('test9', () => {
+  const lunar = Lunar.fromYmdHms(1500,1,1,12,0,0);
+  expect(lunar.getSolar().toString()).toBe('1500-01-31');
+});
+
+test('test10', () => {
+  const lunar = Lunar.fromYmdHms(1500,12,29,12,0,0);
+  expect(lunar.getSolar().toString()).toBe('1501-01-18');
+});
+
+test('test11', () => {
+  const solar = Solar.fromYmdHms(1500,1,1,12,0,0);
+  expect(solar.getLunar().toString()).toBe('一四九九年腊月初一');
+});
+
+test('test12', () => {
+  const solar = Solar.fromYmdHms(1500,12,31,12,0,0);
+  expect(solar.getLunar().toString()).toBe('一五〇〇年腊月十一');
+});
+
+test('test13', () => {
+  const solar = Solar.fromYmdHms(1582,10,4,12,0,0);
+  expect(solar.getLunar().toString()).toBe('一五八二年九月十八');
+});
+
+test('test14', () => {
+  const solar = Solar.fromYmdHms(1582,10,15,12,0,0);
+  expect(solar.getLunar().toString()).toBe('一五八二年九月十九');
+});
+
+test('test15', () => {
+  const lunar = Lunar.fromYmdHms(1582,9,18,12,0,0);
+  expect(lunar.getSolar().toString()).toBe('1582-10-04');
+});
+
+test('test16', () => {
+  const lunar = Lunar.fromYmdHms(1582,9,19,12,0,0);
+  expect(lunar.getSolar().toString()).toBe('1582-10-15');
+});
+
+test('test17', () => {
+  const lunar = Lunar.fromYmdHms(2019,12,12,11,22,0);
+  expect(lunar.getSolar().toString()).toBe('2020-01-06');
+});
+
+test('test18', () => {
+  const solar = Solar.fromYmdHms(2020,2,4,13,22,0);
+  const lunar = solar.getLunar();
+  expect(lunar.getYearInGanZhi()).toBe('庚子');
+  expect(lunar.getYearInGanZhiByLiChun()).toBe('庚子');
+  expect(lunar.getYearInGanZhiExact()).toBe('己亥');
+  expect(lunar.getMonthInGanZhi()).toBe('戊寅');
+  expect(lunar.getMonthInGanZhiExact()).toBe('丁丑');
+});
+
+test('test19', () => {
+  const solar = Solar.fromYmdHms(2019, 2, 8, 13, 22, 0);
+  const lunar = solar.getLunar();
+  expect(lunar.getYearInGanZhi()).toBe('己亥');
+  expect(lunar.getYearInGanZhiByLiChun()).toBe('己亥');
+  expect(lunar.getYearInGanZhiExact()).toBe('己亥');
+  expect(lunar.getMonthInGanZhi()).toBe('丙寅');
+  expect(lunar.getMonthInGanZhiExact()).toBe('丙寅');
+});
+
+test('test20', () => {
+  const solar = Solar.fromYmdHms(1988, 2, 15, 23, 30,0);
+  const lunar = solar.getLunar();
+  expect(lunar.getYearInGanZhi()).toBe('丁卯');
+  expect(lunar.getYearInGanZhiByLiChun()).toBe('戊辰');
+  expect(lunar.getYearInGanZhiExact()).toBe('戊辰');
+});
+
+test('test21', () => {
+  const solar = Solar.fromYmd(1988, 2, 15);
+  const lunar = solar.getLunar();
+  expect(lunar.getYearInGanZhi()).toBe('丁卯');
+});
+
+test('test22', () => {
+  const solar = Solar.fromYmd(2012, 12, 27);
+  const lunar = solar.getLunar();
+  expect(lunar.getYearInGanZhi()).toBe('壬辰');
+  expect(lunar.getMonthInGanZhi()).toBe('壬子');
+  expect(lunar.getDayInGanZhi()).toBe('壬戌');
+});
+
+test('test23', () => {
+  const solar = Solar.fromYmd(2012, 12, 20);
+  const lunar = solar.getLunar();
+  expect(lunar.getYearInGanZhi()).toBe('壬辰');
+  expect(lunar.getMonthInGanZhi()).toBe('壬子');
+  expect(lunar.getDayInGanZhi()).toBe('乙卯');
+});
+
+test('test24', () => {
+  const solar = Solar.fromYmd(2012, 11, 20);
+  const lunar = solar.getLunar();
+  expect(lunar.getYearInGanZhi()).toBe('壬辰');
+  expect(lunar.getMonthInGanZhi()).toBe('辛亥');
+  expect(lunar.getDayInGanZhi()).toBe('乙酉');
+});
+
+test('test25', () => {
+  const solar = Solar.fromYmd(2012, 10, 20);
+  const lunar = solar.getLunar();
+  expect(lunar.getYearInGanZhi()).toBe('壬辰');
+  expect(lunar.getMonthInGanZhi()).toBe('庚戌');
+  expect(lunar.getDayInGanZhi()).toBe('甲寅');
+});
+
+test('test26', () => {
+  const solar = Solar.fromYmd(2012, 9, 20);
+  const lunar = solar.getLunar();
+  expect(lunar.getYearInGanZhi()).toBe('壬辰');
+  expect(lunar.getMonthInGanZhi()).toBe('己酉');
+  expect(lunar.getDayInGanZhi()).toBe('甲申');
+});
+
+test('test26', () => {
+  const solar = Solar.fromYmd(2012, 8, 5);
+  const lunar = solar.getLunar();
+  expect(lunar.getDayInGanZhi()).toBe('戊戌');
+});
+
+test('test27', () => {
+  const solar = Solar.fromYmd(2000, 2, 2);
+  const lunar = solar.getLunar();
+  expect(lunar.getDayInGanZhi()).toBe('庚寅');
+});
+
+test('test28', () => {
+  const solar = Solar.fromYmd(1996, 1, 16);
+  const lunar = solar.getLunar();
+  expect(lunar.getDayInGanZhi()).toBe('壬子');
+});
+
+test('test29', () => {
+  const solar = Solar.fromYmd(1997, 2, 16);
+  const lunar = solar.getLunar();
+  expect(lunar.getDayInGanZhi()).toBe('己丑');
+});
+
+test('test30', () => {
+  const solar = Solar.fromYmd(1998, 3, 16);
+  const lunar = solar.getLunar();
+  expect(lunar.getDayInGanZhi()).toBe('壬戌');
+});
+
+test('test31', () => {
+  const solar = Solar.fromYmd(1999, 4, 16);
+  const lunar = solar.getLunar();
+  expect(lunar.getDayInGanZhi()).toBe('戊戌');
+});
+
+test('test32', () => {
+  const solar = Solar.fromYmd(2000, 7, 16);
+  const lunar = solar.getLunar();
+  expect(lunar.getDayInGanZhi()).toBe('乙亥');
+});
+
+test('test33', () => {
+  const solar = Solar.fromYmd(2000, 1, 6);
+  const lunar = solar.getLunar();
+  expect(lunar.getDayInGanZhi()).toBe('癸亥');
+});
+
+test('test34', () => {
+  const solar = Solar.fromYmd(2000, 1, 9);
+  const lunar = solar.getLunar();
+  expect(lunar.getDayInGanZhi()).toBe('丙寅');
+});
diff --git a/__tests__/Yun.test.js b/__tests__/Yun.test.js
index 9217d64..1cb0052 100644
--- a/__tests__/Yun.test.js
+++ b/__tests__/Yun.test.js
@@ -1,4 +1,4 @@
-var {Solar} = require('../lunar');
+var {Solar, Lunar} = require('../lunar');
 
 it('起运', () => {
   const solar = Solar.fromYmdHms(1981, 1, 29, 23, 37, 0);
@@ -10,3 +10,24 @@ it('起运', () => {
   expect(yun.getStartDay()).toBe(20);
   expect(yun.getStartSolar().toYmd()).toBe('1989-02-18');
 });
+
+it('test2', () => {
+  const lunar = Lunar.fromYmdHms(2019, 12, 12, 11, 22, 0);
+  const eightChar = lunar.getEightChar();
+  const yun = eightChar.getYun(1);
+  expect(yun.getStartYear()).toBe(0);
+  expect(yun.getStartMonth()).toBe(1);
+  expect(yun.getStartDay()).toBe(0);
+  expect(yun.getStartSolar().toYmd()).toBe('2020-02-06');
+});
+
+it('test3', () => {
+  const solar = Solar.fromYmdHms(2020, 1, 6, 11, 22, 0);
+  const lunar = solar.getLunar();
+  const eightChar = lunar.getEightChar();
+  const yun = eightChar.getYun(1);
+  expect(yun.getStartYear()).toBe(0);
+  expect(yun.getStartMonth()).toBe(1);
+  expect(yun.getStartDay()).toBe(0);
+  expect(yun.getStartSolar().toYmd()).toBe('2020-02-06');
+});
diff --git a/lunar.js b/lunar.js
index efd0b18..791d992 100644
--- a/lunar.js
+++ b/lunar.js
@@ -18,6 +18,7 @@
           date.setMonth(m-1);
           date.setDate(d);
         }
+        date.setMilliseconds(0);
         return date;
       },
       fromYmd:function(y,m,d){
@@ -67,6 +68,11 @@
       return _fromYmdHms(year,month,day,hour,minute,second);
     };
     var _fromYmdHms = function(y,m,d,hour,minute,second){
+      if(y===1582&&m==10){
+        if(d>=15){
+          d -= 10;
+        }
+      }
       return {
         _p:{
           year:y,
@@ -167,7 +173,13 @@
           return SolarUtil.XINGZUO[index];
         },
         toYmd:function(){
-          return [this._p.year,(this._p.month<10?'0':'')+this._p.month,(this._p.day<10?'0':'')+this._p.day].join('-');
+          var d = this._p.day;
+          if(this._p.year===1582&&this._p.month==10){
+            if(d>=5){
+              d += 10;
+            }
+          }
+          return [this._p.year,(this._p.month<10?'0':'')+this._p.month,(d<10?'0':'')+d].join('-');
         },
         toYmdHms:function(){
           return this.toYmd()+' '+[(this._p.hour<10?'0':'')+this._p.hour,(this._p.minute<10?'0':'')+this._p.minute,(this._p.second<10?'0':'')+this._p.second].join(':');
@@ -344,15 +356,20 @@
       var gExact = yearGanIndex;
       var zExact = yearZhiIndex;
 
-      //获取立春的阳历时刻
-      var liChun = o['jieQi']['立春'];
-      var liChunYmd = liChun.toYmd();
-      var liChunYmdHms = liChun.toYmdHms();
+      var solarYear = solar.getYear();
       var solarYmd = solar.toYmd();
       var solarYmdHms = solar.toYmdHms();
 
+      //获取立春的阳历时刻
+      var liChun = o['jieQi']['立春'];
+      if (liChun.getYear() != solarYear) {
+        liChun = o['jieQi']['LI_CHUN'];
+      }
+      var liChunYmd = liChun.toYmd();
+      var liChunYmdHms = liChun.toYmdHms();
+
       //阳历和阴历年份相同代表正月初一及以后
-      if(year===solar.getYear()){
+      if(year===solarYear){
         //立春日期判断
         if(solarYmd<liChunYmd) {
           g--;
@@ -363,7 +380,7 @@
           gExact--;
           zExact--;
         }
-      }else{
+      }else if (year < solarYear){
         if(solarYmd>=liChunYmd) {
           g++;
           z++;
@@ -373,96 +390,49 @@
           zExact++;
         }
       }
-      if(yearGanIndex<0){
-        yearGanIndex += 10;
-      }
-      if(yearGanIndex>=10){
-        yearGanIndex-=10;
-      }
-      if(yearZhiIndex<0){
-        yearZhiIndex += 12;
-      }
-      if(yearZhiIndex>=12){
-        yearZhiIndex-=12;
-      }
-      if(g<0){
-        g += 10;
-      }
-      if(g>=10){
-        g-=10;
-      }
-      if(z<0){
-        z += 12;
-      }
-      if(z>=12){
-        z-=12;
-      }
-      if(gExact<0){
-        gExact += 10;
-      }
-      if(gExact>=10){
-        gExact-=10;
-      }
-      if(zExact<0){
-        zExact += 12;
-      }
-      if(zExact>=12){
-        zExact-=12;
-      }
 
       o['yearGanIndex'] = yearGanIndex;
       o['yearZhiIndex'] = yearZhiIndex;
-      o['yearGanIndexByLiChun'] = g;
-      o['yearZhiIndexByLiChun'] = z;
-      o['yearGanIndexExact'] = gExact;
-      o['yearZhiIndexExact'] = zExact;
+      o['yearGanIndexByLiChun'] = (g<0?g+10:g)%10;
+      o['yearZhiIndexByLiChun'] = (z<0?z+12:z)%12;
+      o['yearGanIndexExact'] = (gExact<0?gExact+10:gExact)%10;
+      o['yearZhiIndexExact'] = (zExact<0?zExact+12:zExact)%12;
     };
     var _computeMonth = function(o,solar){
-      var start = null,i,j,jie;
+      var start = null,i,j;
       var end;
-      var gOffset = ((o.yearGanIndexByLiChun%5+1)*2)%10;
-      var gOffsetExact = ((o.yearGanIndexExact%5+1)*2)%10;
 
-      //序号：大雪到小寒之间-2，小寒到立春之间-1，立春之后0
-      var index = -2;
-      for(i=0,j=LunarUtil.JIE.length;i<j;i++){
-        jie = LunarUtil.JIE[i];
-        end = o.jieQi[jie];
+      //序号：大雪以前-3，大雪到小寒之间-2，小寒到立春之间-1，立春之后0
+      var index = -3;
+      for(i=0,j=Lunar.JIE_QI_IN_USE.length;i<j;i+=2){
+        end = o.jieQi[Lunar.JIE_QI_IN_USE[i]];
         var ymd = solar.toYmd();
         var symd = null==start?ymd:start.toYmd();
-        var eymd = end.toYmd();
-        if(ymd>=symd&&ymd<eymd){
+        if(ymd>=symd&&ymd<end.toYmd()){
           break;
         }
         start = end;
         index++;
       }
-      if(index<0){
-        index += 12;
-      }
+      var gOffset = (((o.yearGanIndexByLiChun+(index<0?1:0)) % 5 + 1) * 2) % 10;
+      o['monthGanIndex'] = ((index<0?index+10:index) + gOffset) % 10;
+      o['monthZhiIndex'] = ((index<0?index+12:index) + LunarUtil.BASE_MONTH_ZHI_INDEX) % 12;
 
-      o['monthGanIndex'] = (index+gOffset)%10;
-      o['monthZhiIndex'] = (index+LunarUtil.BASE_MONTH_ZHI_INDEX)%12;
-
-      //序号：大雪到小寒之间-2，小寒到立春之间-1，立春之后0
-      var indexExact = -2;
-      for(i=0,j=LunarUtil.JIE.length;i<j;i++){
-        jie = LunarUtil.JIE[i];
-        end = o.jieQi[jie];
+      var indexExact = -3;
+      start = null;
+      for(i=0,j=Lunar.JIE_QI_IN_USE.length;i<j;i+=2){
+        end = o.jieQi[Lunar.JIE_QI_IN_USE[i]];
         var time = solar.toYmdHms();
         var stime = null==start?time:start.toYmdHms();
-        var etime = end.toYmdHms();
-        if(time>=stime&&time<etime){
+        if(time>=stime&&time<end.toYmdHms()){
           break;
         }
         start = end;
         indexExact++;
       }
-      if(indexExact<0){
-        indexExact += 12;
-      }
-      o['monthGanIndexExact'] = (indexExact+gOffsetExact)%10;
-      o['monthZhiIndexExact'] = (indexExact+LunarUtil.BASE_MONTH_ZHI_INDEX)%12;
+      var gOffsetExact = (((o.yearGanIndexExact+(indexExact<0?1:0)) % 5 + 1) * 2) % 10;
+      o['monthGanIndexExact'] = ((indexExact<0?indexExact+10:indexExact) + gOffsetExact) % 10;
+      o['monthZhiIndexExact'] = ((indexExact<0?indexExact+12:indexExact) + LunarUtil.BASE_MONTH_ZHI_INDEX) % 12;
     };
     var _computeDay = function(o,solar,hour,minute){
       var noon = Solar.fromYmdHms(solar.getYear(), solar.getMonth(), solar.getDay(), 12, 0, 0);
@@ -840,43 +810,44 @@
         getSeason:function(){
           return LunarUtil.SEASON[Math.abs(this._p.month)];
         },
+        _convertJieQi:function(name){
+          var jq = name;
+          if('DONG_ZHI'===jq){
+            jq = '冬至';
+          }else if('DA_HAN'===jq){
+            jq = '大寒';
+          }else if('XIAO_HAN'===jq){
+            jq = '小寒';
+          }else if('LI_CHUN'===jq){
+            jq = '立春';
+          }else if('DA_XUE'===jq){
+            jq = '大雪';
+          }
+          return jq;
+        },
         getJie:function(){
-          var d;
-          for(var i=0,j=LunarUtil.JIE.length;i<j;i++){
-            var jie = LunarUtil.JIE[i];
-            d = this._p.jieQi[jie];
+          var d,jie='';
+          for(var i=1,j=Lunar.JIE_QI.length;i<j;i+=2){
+            var key = Lunar.JIE_QI[i];
+            d = this._p.jieQi[key];
             if(d.getYear()===this._p.solar.getYear()&&d.getMonth()===this._p.solar.getMonth()&&d.getDay()===this._p.solar.getDay()){
-              return jie;
+              jie=key;
+              break;
             }
           }
-          d = this._p.jieQi[Lunar.JIE_QI_PREPEND];
-          if(d.getYear()==this._p.solar.getYear()&&d.getMonth()==this._p.solar.getMonth()&&d.getDay()==this._p.solar.getDay()){
-            return Lunar.JIE_QI_LAST;
-          }
-          d = this._p.jieQi[Lunar.JIE_APPEND_SOLAR_FIRST];
-          if(d.getYear()==this._p.solar.getYear()&&d.getMonth()==this._p.solar.getMonth()&&d.getDay()==this._p.solar.getDay()){
-            return Lunar.JIE_SOLAR_FIRST;
-          }
-          return '';
+          return this._convertJieQi(jie);
         },
         getQi:function(){
-          var d;
-          for(var i=0,j=LunarUtil.QI.length;i<j;i++){
-            var qi = LunarUtil.QI[i];
-            d = this._p.jieQi[qi];
+          var d,qi='';
+          for(var i=0,j=Lunar.JIE_QI.length;i<j;i+=2){
+            var key = Lunar.JIE_QI[i];
+            d = this._p.jieQi[key];
             if(d.getYear()===this._p.solar.getYear()&&d.getMonth()===this._p.solar.getMonth()&&d.getDay()===this._p.solar.getDay()){
-              return qi;
+              qi=key;
+              break;
             }
           }
-          d = this._p.jieQi[Lunar.JIE_QI_APPEND];
-          if(d.getYear()==this._p.solar.getYear()&&d.getMonth()==this._p.solar.getMonth()&&d.getDay()==this._p.solar.getDay()){
-            return Lunar.JIE_QI_FIRST;
-          }
-          d = this._p.jieQi[Lunar.QI_APPEND_SOLAR_SECOND];
-          if(d.getYear()==this._p.solar.getYear()&&d.getMonth()==this._p.solar.getMonth()&&d.getDay()==this._p.solar.getDay()){
-            return Lunar.QI_SOLAR_SECOND;
-          }
-          return '';
+          return this._convertJieQi(qi);
         },
         getJieQi:function(){
           var name = '';
@@ -887,16 +858,7 @@
               break;
             }
           }
-          if(Lunar.JIE_QI_APPEND===name){
-            name = Lunar.JIE_QI_FIRST;
-          }else if(Lunar.JIE_QI_PREPEND===name){
-            name = Lunar.JIE_QI_LAST;
-          }else if(Lunar.JIE_APPEND_SOLAR_FIRST===name){
-            name = Lunar.JIE_SOLAR_FIRST;
-          }else if(Lunar.QI_APPEND_SOLAR_SECOND===name){
-            name = Lunar.QI_SOLAR_SECOND;
-          }
-          return name;
+          return this._convertJieQi(name);
         },
         getWeek:function(){
           return this._p.weekIndex;
@@ -1155,26 +1117,46 @@
         getJieQiList:function(){
           return this._p.jieQiList;
         },
-        getNextJie:function(){return this._getNearJieQi(true,LunarUtil.JIE);},
-        getPrevJie:function(){return this._getNearJieQi(false,LunarUtil.JIE);},
-        getNextQi:function(){return this._getNearJieQi(true,LunarUtil.QI);},
-        getPrevQi:function(){return this._getNearJieQi(false,LunarUtil.QI);},
+        getNextJie:function(){
+          var conditions = [];
+          for(var i=0,j=Lunar.JIE_QI_IN_USE.length/2;i<j;i++){
+            conditions.push(Lunar.JIE_QI_IN_USE[i*2]);
+          }
+          return this._getNearJieQi(true,conditions);
+        },
+        getPrevJie:function() {
+          var conditions = [];
+          for (var i = 0, j = Lunar.JIE_QI_IN_USE.length / 2; i < j; i++) {
+            conditions.push(Lunar.JIE_QI_IN_USE[i * 2]);
+          }
+          return this._getNearJieQi(false, conditions);
+        },
+        getNextQi:function() {
+          var conditions = [];
+          for (var i = 0, j = Lunar.JIE_QI_IN_USE.length / 2; i < j; i++) {
+            conditions.push(Lunar.JIE_QI_IN_USE[i * 2 + 1]);
+          }
+          return this._getNearJieQi(true, conditions);
+        },
+        getPrevQi:function() {
+          var conditions = [];
+          for (var i = 0, j = Lunar.JIE_QI_IN_USE.length / 2; i < j; i++) {
+            conditions.push(Lunar.JIE_QI_IN_USE[i * 2 + 1]);
+          }
+          return this._getNearJieQi(false, conditions);
+        },
         getNextJieQi:function(){return this._getNearJieQi(true,null);},
         getPrevJieQi:function(){return this._getNearJieQi(false,null);},
         _buildJieQi:function(name, solar){
           var jie=false,qi=false,i,j;
-          for(i=0,j=LunarUtil.JIE.length;i<j;i++){
-            if(LunarUtil.JIE[i]===name){
-              jie=true;
-              break;
-            }
-          }
-          if(!jie) {
-            for(i=0,j=LunarUtil.QI.length;i<j;i++){
-              if(LunarUtil.QI[i]===name){
+          for(i=0,j=Lunar.JIE_QI.length;i<j;i++){
+            if(Lunar.JIE_QI[i]===name){
+              if(i%2==0){
                 qi = true;
-                break;
+              }else{
+                jie = true;
               }
+              break;
             }
           }
           return {
@@ -1194,10 +1176,7 @@
           };
         },
         _getNearJieQi:function(forward, conditions){
-          var name = null;
-          var near = null;
-          var filters = {};
-          var filter = false;
+          var name = null,near = null,filters = {},filter = false;
           if(null!=conditions){
             for(var i=0,j=conditions.length;i<j;i++){
               filters[conditions[i]] = true;
@@ -1205,25 +1184,14 @@
             }
           }
           var today = this._p.solar.toYmdHms();
-          for(var jq in this._p.jieQi){
-            var solar = this._p.jieQi[jq];
-            if(Lunar.JIE_QI_APPEND===jq){
-              jq = Lunar.JIE_QI_FIRST;
-            }
-            if(Lunar.JIE_QI_PREPEND===jq){
-              jq = Lunar.JIE_QI_LAST;
-            }
-            if(Lunar.JIE_APPEND_SOLAR_FIRST===jq){
-              jq = Lunar.JIE_SOLAR_FIRST;
-            }
-            if(Lunar.QI_APPEND_SOLAR_SECOND===jq){
-              jq = Lunar.QI_SOLAR_SECOND;
-            }
+          for(var key in this._p.jieQi){
+            var jq = this._convertJieQi(key);
             if(filter){
               if(!filters[jq]){
                 continue;
               }
             }
+            var solar = this._p.jieQi[key];
             var day = solar.toYmdHms();
             if(forward){
               if(day<today){
@@ -1375,10 +1343,10 @@
         },
         getShuJiu:function(){
           var currentCalendar = ExactDate.fromYmd(this._p.solar.getYear(),this._p.solar.getMonth(),this._p.solar.getDay());
-          var start = this._p.jieQi[Lunar.JIE_QI_APPEND];
+          var start = this._p.jieQi['DONG_ZHI'];
           var startCalendar = ExactDate.fromYmd(start.getYear(),start.getMonth(),start.getDay());
           if (currentCalendar < startCalendar) {
-            start = this._p.jieQi[Lunar.JIE_QI_FIRST];
+            start = this._p.jieQi['冬至'];
             startCalendar = ExactDate.fromYmd(start.getYear(),start.getMonth(),start.getDay());
           }
           var endCalendar = ExactDate.fromYmd(start.getYear(),start.getMonth(),start.getDay());
@@ -1469,16 +1437,8 @@
       };
     };
     return {
-      JIE_QI_PREPEND: 'DA_XUE',
-      JIE_QI_APPEND: 'DONG_ZHI',
-      JIE_APPEND_SOLAR_FIRST: 'XIAO_HAN',
-      QI_APPEND_SOLAR_SECOND: 'DA_HAN',
-      JIE_QI_FIRST: '冬至',
-      JIE_QI_LAST: '大雪',
-      JIE_SOLAR_FIRST: '小寒',
-      QI_SOLAR_SECOND: '大寒',
       JIE_QI: ['冬至','小寒','大寒','立春','雨水','惊蛰','春分','清明','谷雨','立夏','小满','芒种','夏至','小暑','大暑','立秋','处暑','白露','秋分','寒露','霜降','立冬','小雪','大雪'],
-      JIE_QI_IN_USE: ['DA_XUE', '冬至', '小寒', '大寒', '立春', '雨水', '惊蛰', '春分', '清明', '谷雨', '立夏', '小满', '芒种', '夏至', '小暑', '大暑', '立秋', '处暑', '白露', '秋分', '寒露', '霜降', '立冬', '小雪', '大雪', 'DONG_ZHI', 'XIAO_HAN', 'DA_HAN'],
+      JIE_QI_IN_USE: ['DA_XUE', '冬至', '小寒', '大寒', '立春', '雨水', '惊蛰', '春分', '清明', '谷雨', '立夏', '小满', '芒种', '夏至', '小暑', '大暑', '立秋', '处暑', '白露', '秋分', '寒露', '霜降', '立冬', '小雪', '大雪', 'DONG_ZHI', 'XIAO_HAN', 'DA_HAN', 'LI_CHUN'],
       fromYmdHms:function(y,m,d,hour,minute,second){return _fromYmdHms(y,m,d,hour,minute,second);},
       fromYmd:function(y,m,d){return _fromYmdHms(y,m,d,0,0,0);},
       fromDate:function(date){return _fromDate(date);}
@@ -1906,7 +1866,7 @@
           return 0;
         },
         toString:function(){
-          return this.getYear();
+          return this.getYear()+'';
         },
         toFullString:function(){
           return this.getYear()+'年';
@@ -1916,9 +1876,9 @@
           this._p.jieQiJulianDays = [];
           // 节气(中午12点)，长度25
           var jq = [];
-          // 合朔，即每月初一(中午12点)，长度15
+          // 合朔，即每月初一(中午12点)，长度16
           var hs = [];
-          // 每月天数，长度14
+          // 每月天数，长度15
           var dayCounts = [];
           var i,j;
           var year = this._p.year - 2000;
@@ -1940,12 +1900,12 @@
             w -= 29.5306;
           }
           // 递推每月初一
-          for (i = 0; i < 15; i++) {
-            hs[i] = ShouXingUtil.calcShuo(w + 29.5306 * i);
+          for (i = 0; i < 16; i++) {
+            hs.push(ShouXingUtil.calcShuo(w + 29.5306 * i));
           }
           // 每月天数
-          for (i = 0; i < 14; i++) {
-            dayCounts[i] = Math.floor(hs[i + 1] - hs[i]);
+          for (i = 0; i < 15; i++) {
+            dayCounts.push(Math.floor(hs[i + 1] - hs[i]));
           }
 
           var leap = -1;
@@ -1959,7 +1919,7 @@
 
           var y = this._p.year - 1;
           var m = 11;
-          for (i = 0; i < 14; i++) {
+          for (i = 0, j = dayCounts.length; i < j; i++) {
             var isLeap = false;
             if (i == leap) {
               isLeap = true;
@@ -2242,7 +2202,7 @@
       DAYS_OF_MONTH:[31,28,31,30,31,30,31,31,30,31,30,31],
       XINGZUO:['白羊','金牛','双子','巨蟹','狮子','处女','天秤','天蝎','射手','摩羯','水瓶','双鱼'],
       FESTIVAL:{'1-1':'元旦节','2-14':'情人节','3-8':'妇女节','3-12':'植树节','3-15':'消费者权益日','4-1':'愚人节','5-1':'劳动节','5-4':'青年节','6-1':'儿童节','7-1':'建党节','8-1':'建军节','9-10':'教师节','10-1':'国庆节','12-24':'平安夜','12-25':'圣诞节'},
-      OTHER_FESTIVAL:{'1-8':['周恩来逝世纪念日'],'1-10':['中国人民警察节','中国公安110宣传日'],'1-21':['列宁逝世纪念日'],'1-26':['国际海关日'],'2-2':['世界湿地日'],'2-4':['世界抗癌日'],'2-7':['京汉铁路罢工纪念'],'2-10':['国际气象节'],'2-19':['邓小平逝世纪念日'],'2-21':['国际母语日'],'2-24':['第三世界青年日'],'3-1':['国际海豹日'],'3-3':['全国爱耳日'],'3-5':['周恩来诞辰纪念日','中国青年志愿者服务日'],'3-6':['世界青光眼日'],'3-12':['孙中山逝世纪念日'],'3-14':['马克思逝世纪念日'],'3-17':['国际航海日'],'3-18':['全国科技人才活动日'],'3-21':['世界森林日','世界睡眠日'],'3-22':['世界水日'],'3-23':['世界气象日'],'3-24':['世界防治结核病日'],'4-2':['国际儿童图书日'],'4-7':['世界卫生日'],'4-22':['列宁诞辰纪念日'],'4-23':['世界图书和版权日'],'4-26':['世界知识产权日'],'5-3':['世界新闻自由日'],'5-5':['马克思诞辰纪念日'],'5-8':['世界红十字日'],'5-11':['世界肥胖日'],'5-23':['世界读书日'],'5-27':['上海解放日'],'5-31':['世界无烟日'],'6-5':['世界环境日'],'6-6':['全国爱眼日'],'6-8':['世界海洋日'],'6-11':['中国人口日'],'6-14':['世界献血日'],'7-1':['香港回归纪念日'],'7-7':['中国人民抗日战争纪念日'],'7-11':['世界人口日'],'8-5':['恩格斯逝世纪念日'],'8-6':['国际电影节'],'8-12':['国际青年日'],'8-22':['邓小平诞辰纪念日'],'9-3':['中国抗日战争胜利纪念日'],'9-8':['世界扫盲日'],'9-9':['毛泽东逝世纪念日'],'9-14':['世界清洁地球日'],'9-18':['九一八事变纪念日'],'9-20':['全国爱牙日'],'9-21':['国际和平日'],'9-27':['世界旅游日'],'10-4':['世界动物日'],'10-10':['辛亥革命纪念日'],'10-13':['中国少年先锋队诞辰日'],'10-25':['抗美援朝纪念日'],'11-12':['孙中山诞辰纪念日'],'11-17':['国际大学生节'],'11-28':['恩格斯诞辰纪念日'],'12-1':['世界艾滋病日'],'12-12':['西安事变纪念日'],'12-13':['南京大屠杀纪念日'],'12-26':['毛泽东诞辰纪念日']},
+      OTHER_FESTIVAL:{'1-8':['周恩来逝世纪念日'],'1-10':['中国人民警察节','中国公安110宣传日'],'1-21':['列宁逝世纪念日'],'1-26':['国际海关日'],'2-2':['世界湿地日'],'2-4':['世界抗癌日'],'2-7':['京汉铁路罢工纪念'],'2-10':['国际气象节'],'2-19':['邓小平逝世纪念日'],'2-21':['国际母语日'],'2-24':['第三世界青年日'],'3-1':['国际海豹日'],'3-3':['全国爱耳日'],'3-5':['周恩来诞辰纪念日','中国青年志愿者服务日'],'3-6':['世界青光眼日'],'3-12':['孙中山逝世纪念日'],'3-14':['马克思逝世纪念日'],'3-17':['国际航海日'],'3-18':['全国科技人才活动日'],'3-21':['世界森林日','世界睡眠日'],'3-22':['世界水日'],'3-23':['世界气象日'],'3-24':['世界防治结核病日'],'4-2':['国际儿童图书日'],'4-7':['世界卫生日'],'4-22':['列宁诞辰纪念日'],'4-23':['世界图书和版权日'],'4-26':['世界知识产权日'],'5-3':['世界新闻自由日'],'5-5':['马克思诞辰纪念日'],'5-8':['世界红十字日'],'5-11':['世界肥胖日'],'5-27':['上海解放日'],'5-31':['世界无烟日'],'6-5':['世界环境日'],'6-6':['全国爱眼日'],'6-8':['世界海洋日'],'6-11':['中国人口日'],'6-14':['世界献血日'],'7-1':['香港回归纪念日'],'7-7':['中国人民抗日战争纪念日'],'7-11':['世界人口日'],'8-5':['恩格斯逝世纪念日'],'8-6':['国际电影节'],'8-12':['国际青年日'],'8-22':['邓小平诞辰纪念日'],'9-3':['中国抗日战争胜利纪念日'],'9-8':['世界扫盲日'],'9-9':['毛泽东逝世纪念日'],'9-14':['世界清洁地球日'],'9-18':['九一八事变纪念日'],'9-20':['全国爱牙日'],'9-21':['国际和平日'],'9-27':['世界旅游日'],'10-4':['世界动物日'],'10-10':['辛亥革命纪念日'],'10-13':['中国少年先锋队诞辰日'],'10-25':['抗美援朝纪念日'],'11-12':['孙中山诞辰纪念日'],'11-17':['国际大学生节'],'11-28':['恩格斯诞辰纪念日'],'12-1':['世界艾滋病日'],'12-12':['西安事变纪念日'],'12-13':['南京大屠杀纪念日'],'12-26':['毛泽东诞辰纪念日']},
       WEEK_FESTIVAL:{'5-2-0':'母亲节','6-3-0':'父亲节','11-4-4':'感恩节'},
       isLeapYear:function(year){return (year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0);},
       getDaysOfMonth:function(year,month){
@@ -2291,8 +2251,6 @@
       SHENGXIAO:['','鼠','牛','虎','兔','龙','蛇','马','羊','猴','鸡','狗','猪'],
       DAY:['','初一','初二','初三','初四','初五','初六','初七','初八','初九','初十','十一','十二','十三','十四','十五','十六','十七','十八','十九','二十','廿一','廿二','廿三','廿四','廿五','廿六','廿七','廿八','廿九','三十'],
       YUE_XIANG:['','朔','既朔','蛾眉新','蛾眉新','蛾眉','夕月','上弦','上弦','九夜','宵','宵','宵','渐盈凸','小望','望','既望','立待','居待','寝待','更待','渐亏凸','下弦','下弦','有明','有明','蛾眉残','蛾眉残','残','晓','晦'],
-      JIE:['小寒','立春','惊蛰','清明','立夏','芒种','小暑','立秋','白露','寒露','立冬','大雪'],
-      QI:['大寒','雨水','春分','谷雨','小满','夏至','大暑','处暑','秋分','霜降','小雪','冬至'],
       XIU:{'申1':'毕','申2':'翼','申3':'箕','申4':'奎','申5':'鬼','申6':'氐','申0':'虚','子1':'毕','子2':'翼','子3':'箕','子4':'奎','子5':'鬼','子6':'氐','子0':'虚','辰1':'毕','辰2':'翼','辰3':'箕','辰4':'奎','辰5':'鬼','辰6':'氐','辰0':'虚','巳1':'危','巳2':'觜','巳3':'轸','巳4':'斗','巳5':'娄','巳6':'柳','巳0':'房','酉1':'危','酉2':'觜','酉3':'轸','酉4':'斗','酉5':'娄','酉6':'柳','酉0':'房','丑1':'危','丑2':'觜','丑3':'轸','丑4':'斗','丑5':'娄','丑6':'柳','丑0':'房','寅1':'心','寅2':'室','寅3':'参','寅4':'角','寅5':'牛','寅6':'胃','寅0':'星','午1':'心','午2':'室','午3':'参','午4':'角','午5':'牛','午6':'胃','午0':'星','戌1':'心','戌2':'室','戌3':'参','戌4':'角','戌5':'牛','戌6':'胃','戌0':'星','亥1':'张','亥2':'尾','亥3':'壁','亥4':'井','亥5':'亢','亥6':'女','亥0':'昴','卯1':'张','卯2':'尾','卯3':'壁','卯4':'井','卯5':'亢','卯6':'女','卯0':'昴','未1':'张','未2':'尾','未3':'壁','未4':'井','未5':'亢','未6':'女','未0':'昴'},
       XIU_LUCK:{'角':'吉','亢':'凶','氐':'凶','房':'吉','心':'凶','尾':'吉','箕':'吉','斗':'吉','牛':'凶','女':'凶','虚':'凶','危':'凶','室':'吉','壁':'吉','奎':'凶','娄':'吉','胃':'吉','昴':'凶','毕':'吉','觜':'凶','参':'吉','井':'吉','鬼':'凶','柳':'凶','星':'凶','张':'吉','翼':'凶','轸':'吉'},
       XIU_SONG:{'角':'角星造作主荣昌，外进田财及女郎，嫁娶婚姻出贵子，文人及第见君王，惟有埋葬不可用，三年之后主瘟疫，起工修筑坟基地，堂前立见主人凶。','亢':'亢星造作长房当，十日之中主有殃，田地消磨官失职，接运定是虎狼伤，嫁娶婚姻用此日，儿孙新妇守空房，埋葬若还用此日，当时害祸主重伤。','氐':'氐星造作主灾凶，费尽田园仓库空，埋葬不可用此日，悬绳吊颈祸重重，若是婚姻离别散，夜招浪子入房中，行船必定遭沉没，更生聋哑子孙穷。','房':'房星造作田园进，钱财牛马遍山岗，更招外处田庄宅，荣华富贵福禄康，埋葬若然用此日，高官进职拜君王，嫁娶嫦娥至月殿，三年抱子至朝堂。','心':'心星造作大为凶，更遭刑讼狱囚中，忤逆官非宅产退，埋葬卒暴死相从，婚姻若是用此日，子死儿亡泪满胸，三年之内连遭祸，事事教君没始终。','尾':'尾星造作主天恩，富贵荣华福禄增，招财进宝兴家宅，和合婚姻贵子孙，埋葬若能依此日，男清女正子孙兴，开门放水招田宅，代代公侯远播名。','箕':'箕星造作主高强，岁岁年年大吉昌，埋葬修坟大吉利，田蚕牛马遍山岗，开门放水招田宅，箧满金银谷满仓，福荫高官加禄位，六亲丰禄乐安康。','斗':'斗星造作主招财，文武官员位鼎台，田宅家财千万进，坟堂修筑贵富来，开门放水招牛马，旺蚕男女主和谐，遇此吉宿来照护，时支福庆永无灾。','牛':'牛星造作主灾危，九横三灾不可推，家宅不安人口退，田蚕不利主人衰，嫁娶婚姻皆自损，金银财谷渐无之，若是开门并放水，牛猪羊马亦伤悲。','女':'女星造作损婆娘，兄弟相嫌似虎狼，埋葬生灾逢鬼怪，颠邪疾病主瘟惶，为事遭官财失散，泻利留连不可当，开门放水用此日，全家财散主离乡。','虚':'虚星造作主灾殃，男女孤眠不一双，内乱风声无礼节，儿孙媳妇伴人床，开门放水遭灾祸，虎咬蛇伤又卒亡，三三五五连年病，家破人亡不可当。','危':'危星不可造高楼，自遭刑吊见血光，三年孩子遭水厄，后生出外永不还，埋葬若还逢此日，周年百日取高堂，三年两载一悲伤，开门放水到官堂。','室':'室星修造进田牛，儿孙代代近王侯，家贵荣华天上至，寿如彭祖八千秋，开门放水招财帛，和合婚姻生贵儿，埋葬若能依此日，门庭兴旺福无休。','壁':'壁星造作主增财，丝蚕大熟福滔天，奴婢自来人口进，开门放水出英贤，埋葬招财官品进，家中诸事乐陶然，婚姻吉利主贵子，早播名誉著祖鞭。','奎':'奎星造作得祯祥，家内荣和大吉昌，若是埋葬阴卒死，当年定主两三伤，看看军令刑伤到，重重官事主瘟惶，开门放水遭灾祸，三年两次损儿郎。','娄':'娄星修造起门庭，财旺家和事事兴，外进钱财百日进，一家兄弟播高名，婚姻进益生贵子，玉帛金银箱满盈，放水开门皆吉利，男荣女贵寿康宁。','胃':'胃星造作事如何，家贵荣华喜气多，埋葬贵临官禄位，夫妇齐眉永保康，婚姻遇此家富贵，三灾九祸不逢他，从此门前多吉庆，儿孙代代拜金阶。','昴':'昴星造作进田牛，埋葬官灾不得休，重丧二日三人死，尽卖田园不记增，开门放水招灾祸，三岁孩儿白了头，婚姻不可逢此日，死别生离是可愁。','毕':'毕星造作主光前，买得田园有余钱，埋葬此日添官职，田蚕大熟永丰年，开门放水多吉庆，合家人口得安然，婚姻若得逢此日，生得孩儿福寿全。','觜':'觜星造作有徒刑，三年必定主伶丁，埋葬卒死多因此，取定寅年使杀人，三丧不止皆由此，一人药毒二人身，家门田地皆退败，仓库金银化作尘。','参':'参星造作旺人家，文星照耀大光华，只因造作田财旺，埋葬招疾哭黄沙，开门放水加官职，房房子孙见田加，婚姻许遁遭刑克，男女朝开幕落花。','井':'井星造作旺蚕田，金榜题名第一光，埋葬须防惊卒死，狂颠风疾入黄泉，开门放水招财帛，牛马猪羊旺莫言，贵人田塘来入宅，儿孙兴旺有余钱。','鬼':'鬼星起造卒人亡，堂前不见主人郎，埋葬此日官禄至，儿孙代代近君王，开门放水须伤死，嫁娶夫妻不久长，修土筑墙伤产女，手扶双女泪汪汪。','柳':'柳星造作主遭官，昼夜偷闭不暂安，埋葬瘟惶多疾病，田园退尽守冬寒，开门放水遭聋瞎，腰驼背曲似弓弯，更有棒刑宜谨慎，妇人随客走盘桓。','星':'星宿日好造新房，进职加官近帝王，不可埋葬并放水，凶星临位女人亡，生离死别无心恋，要自归休别嫁郎，孔子九曲殊难度，放水开门天命伤。','张':'张星日好造龙轩，年年并见进庄田，埋葬不久升官职，代代为官近帝前，开门放水招财帛，婚姻和合福绵绵，田蚕人满仓库满，百般顺意自安然。','翼':'翼星不利架高堂，三年二载见瘟惶，埋葬若还逢此日，子孙必定走他乡，婚姻此日不宜利，归家定是不相当，开门放水家须破，少女恋花贪外郎。','轸':'轸星临水造龙宫，代代为官受皇封，富贵荣华增寿禄，库满仓盈自昌隆，埋葬文昌来照助，宅舍安宁不见凶，更有为官沾帝宠，婚姻龙子入龙宫。'},
@@ -2546,7 +2504,7 @@
     };
   })();
   var HolidayUtil = (function(_NAMES){
-    var _SIZE = 18,_ZERO='0'.charCodeAt(0),_NAMES_IN_USE=_NAMES,_DATA='200112290020020101200112300020020101200201010120020101200201020120020101200201030120020101200202091020020212200202101020020212200202121120020212200202131120020212200202141120020212200202151120020212200202161120020212200202171120020212200202181120020212200204273020020501200204283020020501200205013120020501200205023120020501200205033120020501200205043120020501200205053120020501200205063120020501200205073120021001200209286020021001200209296020021001200210016120021001200210026120021001200210036120021001200210046120021001200210056120021001200210066120021001200210076120021001200301010120030101200302011120030201200302021120030201200302031120030201200302041120030201200302051120030201200302061120030201200302071120030201200302081020030201200302091020030201200304263020030501200304273020030501200305013120030501200305023120030501200305033120030501200305043120030501200305053120030501200305063120030501200305073120031001200309276020031001200309286020031001200310016120031001200310026120031001200310036120031001200310046120031001200310056120031001200310066120031001200310076120031001200401010120040101200401171020040122200401181020040122200401221120040122200401231120040122200401241120040122200401251120040122200401261120040122200401271120040122200401281120040122200405013120040501200405023120040501200405033120040501200405043120040501200405053120040501200405063120040501200405073120041001200405083020040501200405093020040501200410016120041001200410026120041001200410036120041001200410046120041001200410056120041001200410066120041001200410076120041001200410096020041001200410106020041001200501010120050101200501020120050101200501030120050101200502051020050209200502061020050209200502091120050209200502101120050209200502111120050209200502121120050209200502131120050209200502141120050209200502151120050209200504303020050501200505013120050501200505023120050501200505033120050501200505043120050501200505053120050501200505063120050501200505073120051001200505083020050501200510016120051001200510026120051001200510036120051001200510046120051001200510056120051001200510066120051001200510076120051001200510086020051001200510096020051001200512310020060101200601010120060101200601020120060101200601030120060101200601281020060129200601291120060129200601301120060129200601311120060129200602011120060129200602021120060129200602031120060129200602041120060129200602051020060129200604293020060501200604303020060501200605013120060501200605023120060501200605033120060501200605043120060501200605053120060501200605063120060501200605073120061001200609306020061001200610016120061001200610026120061001200610036120061001200610046120061001200610056120061001200610066120061001200610076120061001200610086020061001200612300020070101200612310020070101200701010120070101200701020120070101200701030120070101200702171020070218200702181120070218200702191120070218200702201120070218200702211120070218200702221120070218200702231120070218200702241120070218200702251020070218200704283020070501200704293020070501200705013120070501200705023120070501200705033120070501200705043120070501200705053120070501200705063120070501200705073120070501200709296020071001200709306020071001200710016120071001200710026120071001200710036120071001200710046120071001200710056120071001200710066120071001200710076120071001200712290020080101200712300120080101200712310120080101200801010120080101200802021020080206200802031020080206200802061120080206200802071120080206200802081120080206200802091120080206200802101120080206200802111120080206200802121120080206200804042120080404200804052120080404200804062120080404200805013120080501200805023120080501200805033120080501200805043020080501200806074120080608200806084120080608200806094120080608200809135120080914200809145120080914200809155120080914200809276020081001200809286020081001200809296120081001200809306120081001200810016120081001200810026120081001200810036120081001200810046120081001200810056120081001200901010120090101200901020120090101200901030120090101200901040020090101200901241020090125200901251120090125200901261120090125200901271120090125200901281120090125200901291120090125200901301120090125200901311120090125200902011020090125200904042120090404200904052120090404200904062120090404200905013120090501200905023120090501200905033120090501200905284120090528200905294120090528200905304120090528200905314020090528200909276020091001200910016120091001200910026120091001200910036120091001200910046120091001200910055120091003200910065120091003200910075120091003200910085120091003200910105020091003201001010120100101201001020120100101201001030120100101201002131120100213201002141120100213201002151120100213201002161120100213201002171120100213201002181120100213201002191120100213201002201020100213201002211020100213201004032120100405201004042120100405201004052120100405201005013120100501201005023120100501201005033120100501201006124020100616201006134020100616201006144120100616201006154120100616201006164120100616201009195020100922201009225120100922201009235120100922201009245120100922201009255020100922201009266020101001201010016120101001201010026120101001201010036120101001201010046120101001201010056120101001201010066120101001201010076120101001201010096020101001201101010120110101201101020120110101201101030120110101201101301020110203201102021120110203201102031120110203201102041120110203201102051120110203201102061120110203201102071120110203201102081120110203201102121020110203201104022020110405201104032120110405201104042120110405201104052120110405201104303120110501201105013120110501201105023120110501201106044120110606201106054120110606201106064120110606201109105120110912201109115120110912201109125120110912201110016120111001201110026120111001201110036120111001201110046120111001201110056120111001201110066120111001201110076120111001201110086020111001201110096020111001201112310020120101201201010120120101201201020120120101201201030120120101201201211020120123201201221120120123201201231120120123201201241120120123201201251120120123201201261120120123201201271120120123201201281120120123201201291020120123201203312020120404201204012020120404201204022120120404201204032120120404201204042120120404201204283020120501201204293120120501201204303120120501201205013120120501201205023020120501201206224120120623201206234120120623201206244120120623201209295020120930201209305120120930201210016120121001201210026120121001201210036120121001201210046120121001201210056120121001201210066120121001201210076120121001201210086020121001201301010120130101201301020120130101201301030120130101201301050020130101201301060020130101201302091120130210201302101120130210201302111120130210201302121120130210201302131120130210201302141120130210201302151120130210201302161020130210201302171020130210201304042120130404201304052120130404201304062120130404201304273020130501201304283020130501201304293120130501201304303120130501201305013120130501201306084020130612201306094020130612201306104120130612201306114120130612201306124120130612201309195120130919201309205120130919201309215120130919201309225020130919201309296020131001201310016120131001201310026120131001201310036120131001201310046120131001201310056120131001201310066120131001201310076120131001201401010120140101201401261020140131201401311120140131201402011120140131201402021120140131201402031120140131201402041120140131201402051120140131201402061120140131201402081020140131201404052120140405201404062120140405201404072120140405201405013120140501201405023120140501201405033120140501201405043020140501201405314120140602201406014120140602201406024120140602201409065120140908201409075120140908201409085120140908201409286020141001201410016120141001201410026120141001201410036120141001201410046120141004201410056120141001201410066120141001201410076120141001201410116020141001201501010120150101201501020120150101201501030120150101201501040020150101201502151020150219201502181120150219201502191120150219201502201120150219201502211120150219201502221120150219201502231120150219201502241120150219201502281020150219201504042120150405201504052120150405201504062120150405201505013120150501201505023120150501201505033120150501201506204120150620201506214120150620201506224120150620201509038120150903201509048120150903201509058120150903201509068020150903201509265120150927201509275120150927201510016120151001201510026120151001201510036120151001201510046120151004201510056120151001201510066120151001201510076120151001201510106020151001201601010120160101201601020120160101201601030120160101201602061020160208201602071120160208201602081120160208201602091120160208201602101120160208201602111120160208201602121120160208201602131120160208201602141020160208201604022120160404201604032120160404201604042120160404201604303120160501201605013120160501201605023120160501201606094120160609201606104120160609201606114120160609201606124020160609201609155120160915201609165120160915201609175120160915201609185020160915201610016120161001201610026120161001201610036120161001201610046120161004201610056120161001201610066120161001201610076120161001201610086020161001201610096020161001201612310120170101201701010120170101201701020120170101201701221020170128201701271120170128201701281120170128201701291120170128201701301120170128201701311120170128201702011120170128201702021120170128201702041020170128201704012020170404201704022120170404201704032120170404201704042120170404201704293120170501201704303120170501201705013120170501201705274020170530201705284120170530201705294120170530201705304120170530201709306020171001201710016120171001201710026120171001201710036120171001201710045120171004201710056120171001201710066120171001201710076120171001201710086120171001201712300120180101201712310120180101201801010120180101201802111020180216201802151120180216201802161120180216201802171120180216201802181120180216201802191120180216201802201120180216201802211120180216201802241020180216201804052120180405201804062120180405201804072120180405201804082020180405201804283020180501201804293120180501201804303120180501201805013120180501201806164120180618201806174120180618201806184120180618201809225120180924201809235120180924201809245120180924201809296020181001201809306020181001201810016120181001201810026120181001201810036120181001201810046120181001201810056120181001201810066120181001201810076120181001201812290020190101201812300120190101201812310120190101201901010120190101201902021020190205201902031020190205201902041120190205201902051120190205201902061120190205201902071120190205201902081120190205201902091120190205201902101120190205201904052120190405201904062120190405201904072120190405201904283020190501201905013120190501201905023120190501201905033120190501201905043120190501201905053020190501201906074120190607201906084120190607201906094120190607201909135120190913201909145120190913201909155120190913201909296020191001201910016120191001201910026120191001201910036120191001201910046120191001201910056120191001201910066120191001201910076120191001201910126020191001202001010120200101202001191020200125202001241120200125202001251120200125202001261120200125202001271120200125202001281120200125202001291120200125202001301120200125202001311120200125202002011120200125202002021120200125202004042120200404202004052120200404202004062120200404202004263020200501202005013120200501202005023120200501202005033120200501202005043120200501202005053120200501202005093020200501202006254120200625202006264120200625202006274120200625202006284020200625202009277020201001202010017120201001202010026120201001202010036120201001202010046120201001202010056120201001202010066120201001202010076120201001202010086120201001202010106020201001202101010120210101202101020120210101202101030120210101202102071020210212202102111120210212202102121120210212202102131120210212202102141120210212202102151120210212202102161120210212202102171120210212202102201020210212202104032120210404202104042120210404202104052120210404202104253020210501202105013120210501202105023120210501202105033120210501202105043120210501202105053120210501202105083020210501202106124120210614202106134120210614202106144120210614202109185020210921202109195120210921202109205120210921202109215120210921202109266020211001202110016120211001202110026120211001202110036120211001202110046120211001202110056120211001202110066120211001202110076120211001202110096020211001';
+    var _SIZE = 18,_ZERO='0'.charCodeAt(0),_NAMES_IN_USE=_NAMES,_DATA='200112290020020101200112300020020101200201010120020101200201020120020101200201030120020101200202091020020212200202101020020212200202121120020212200202131120020212200202141120020212200202151120020212200202161120020212200202171120020212200202181120020212200204273020020501200204283020020501200205013120020501200205023120020501200205033120020501200205043120020501200205053120020501200205063120020501200205073120021001200209286020021001200209296020021001200210016120021001200210026120021001200210036120021001200210046120021001200210056120021001200210066120021001200210076120021001200301010120030101200302011120030201200302021120030201200302031120030201200302041120030201200302051120030201200302061120030201200302071120030201200302081020030201200302091020030201200304263020030501200304273020030501200305013120030501200305023120030501200305033120030501200305043120030501200305053120030501200305063120030501200305073120031001200309276020031001200309286020031001200310016120031001200310026120031001200310036120031001200310046120031001200310056120031001200310066120031001200310076120031001200401010120040101200401171020040122200401181020040122200401221120040122200401231120040122200401241120040122200401251120040122200401261120040122200401271120040122200401281120040122200405013120040501200405023120040501200405033120040501200405043120040501200405053120040501200405063120040501200405073120041001200405083020040501200405093020040501200410016120041001200410026120041001200410036120041001200410046120041001200410056120041001200410066120041001200410076120041001200410096020041001200410106020041001200501010120050101200501020120050101200501030120050101200502051020050209200502061020050209200502091120050209200502101120050209200502111120050209200502121120050209200502131120050209200502141120050209200502151120050209200504303020050501200505013120050501200505023120050501200505033120050501200505043120050501200505053120050501200505063120050501200505073120051001200505083020050501200510016120051001200510026120051001200510036120051001200510046120051001200510056120051001200510066120051001200510076120051001200510086020051001200510096020051001200512310020060101200601010120060101200601020120060101200601030120060101200601281020060129200601291120060129200601301120060129200601311120060129200602011120060129200602021120060129200602031120060129200602041120060129200602051020060129200604293020060501200604303020060501200605013120060501200605023120060501200605033120060501200605043120060501200605053120060501200605063120060501200605073120061001200609306020061001200610016120061001200610026120061001200610036120061001200610046120061001200610056120061001200610066120061001200610076120061001200610086020061001200612300020070101200612310020070101200701010120070101200701020120070101200701030120070101200702171020070218200702181120070218200702191120070218200702201120070218200702211120070218200702221120070218200702231120070218200702241120070218200702251020070218200704283020070501200704293020070501200705013120070501200705023120070501200705033120070501200705043120070501200705053120070501200705063120070501200705073120070501200709296020071001200709306020071001200710016120071001200710026120071001200710036120071001200710046120071001200710056120071001200710066120071001200710076120071001200712290020080101200712300120080101200712310120080101200801010120080101200802021020080206200802031020080206200802061120080206200802071120080206200802081120080206200802091120080206200802101120080206200802111120080206200802121120080206200804042120080404200804052120080404200804062120080404200805013120080501200805023120080501200805033120080501200805043020080501200806074120080608200806084120080608200806094120080608200809135120080914200809145120080914200809155120080914200809276020081001200809286020081001200809296120081001200809306120081001200810016120081001200810026120081001200810036120081001200810046120081001200810056120081001200901010120090101200901020120090101200901030120090101200901040020090101200901241020090125200901251120090125200901261120090125200901271120090125200901281120090125200901291120090125200901301120090125200901311120090125200902011020090125200904042120090404200904052120090404200904062120090404200905013120090501200905023120090501200905033120090501200905284120090528200905294120090528200905304120090528200905314020090528200909276020091001200910016120091001200910026120091001200910036120091001200910046120091001200910055120091003200910065120091003200910075120091003200910085120091003200910105020091003201001010120100101201001020120100101201001030120100101201002131120100213201002141120100213201002151120100213201002161120100213201002171120100213201002181120100213201002191120100213201002201020100213201002211020100213201004032120100405201004042120100405201004052120100405201005013120100501201005023120100501201005033120100501201006124020100616201006134020100616201006144120100616201006154120100616201006164120100616201009195020100922201009225120100922201009235120100922201009245120100922201009255020100922201009266020101001201010016120101001201010026120101001201010036120101001201010046120101001201010056120101001201010066120101001201010076120101001201010096020101001201101010120110101201101020120110101201101030120110101201101301020110203201102021120110203201102031120110203201102041120110203201102051120110203201102061120110203201102071120110203201102081120110203201102121020110203201104022020110405201104032120110405201104042120110405201104052120110405201104303120110501201105013120110501201105023120110501201106044120110606201106054120110606201106064120110606201109105120110912201109115120110912201109125120110912201110016120111001201110026120111001201110036120111001201110046120111001201110056120111001201110066120111001201110076120111001201110086020111001201110096020111001201112310020120101201201010120120101201201020120120101201201030120120101201201211020120123201201221120120123201201231120120123201201241120120123201201251120120123201201261120120123201201271120120123201201281120120123201201291020120123201203312020120404201204012020120404201204022120120404201204032120120404201204042120120404201204283020120501201204293120120501201204303120120501201205013120120501201205023020120501201206224120120623201206234120120623201206244120120623201209295020120930201209305120120930201210016120121001201210026120121001201210036120121001201210046120121001201210056120121001201210066120121001201210076120121001201210086020121001201301010120130101201301020120130101201301030120130101201301050020130101201301060020130101201302091120130210201302101120130210201302111120130210201302121120130210201302131120130210201302141120130210201302151120130210201302161020130210201302171020130210201304042120130404201304052120130404201304062120130404201304273020130501201304283020130501201304293120130501201304303120130501201305013120130501201306084020130612201306094020130612201306104120130612201306114120130612201306124120130612201309195120130919201309205120130919201309215120130919201309225020130919201309296020131001201310016120131001201310026120131001201310036120131001201310046120131001201310056120131001201310066120131001201310076120131001201401010120140101201401261020140131201401311120140131201402011120140131201402021120140131201402031120140131201402041120140131201402051120140131201402061120140131201402081020140131201404052120140405201404062120140405201404072120140405201405013120140501201405023120140501201405033120140501201405043020140501201405314120140602201406014120140602201406024120140602201409065120140908201409075120140908201409085120140908201409286020141001201410016120141001201410026120141001201410036120141001201410046120141004201410056120141001201410066120141001201410076120141001201410116020141001201501010120150101201501020120150101201501030120150101201501040020150101201502151020150219201502181120150219201502191120150219201502201120150219201502211120150219201502221120150219201502231120150219201502241120150219201502281020150219201504042120150405201504052120150405201504062120150405201505013120150501201505023120150501201505033120150501201506204120150620201506214120150620201506224120150620201509038120150903201509048120150903201509058120150903201509068020150903201509265120150927201509275120150927201510016120151001201510026120151001201510036120151001201510046120151004201510056120151001201510066120151001201510076120151001201510106020151001201601010120160101201601020120160101201601030120160101201602061020160208201602071120160208201602081120160208201602091120160208201602101120160208201602111120160208201602121120160208201602131120160208201602141020160208201604022120160404201604032120160404201604042120160404201604303120160501201605013120160501201605023120160501201606094120160609201606104120160609201606114120160609201606124020160609201609155120160915201609165120160915201609175120160915201609185020160915201610016120161001201610026120161001201610036120161001201610046120161001201610056120161001201610066120161001201610076120161001201610086020161001201610096020161001201612310120170101201701010120170101201701020120170101201701221020170128201701271120170128201701281120170128201701291120170128201701301120170128201701311120170128201702011120170128201702021120170128201702041020170128201704012020170404201704022120170404201704032120170404201704042120170404201704293120170501201704303120170501201705013120170501201705274020170530201705284120170530201705294120170530201705304120170530201709306020171001201710016120171001201710026120171001201710036120171001201710045120171004201710056120171001201710066120171001201710076120171001201710086120171001201712300120180101201712310120180101201801010120180101201802111020180216201802151120180216201802161120180216201802171120180216201802181120180216201802191120180216201802201120180216201802211120180216201802241020180216201804052120180405201804062120180405201804072120180405201804082020180405201804283020180501201804293120180501201804303120180501201805013120180501201806164120180618201806174120180618201806184120180618201809225120180924201809235120180924201809245120180924201809296020181001201809306020181001201810016120181001201810026120181001201810036120181001201810046120181001201810056120181001201810066120181001201810076120181001201812290020190101201812300120190101201812310120190101201901010120190101201902021020190205201902031020190205201902041120190205201902051120190205201902061120190205201902071120190205201902081120190205201902091120190205201902101120190205201904052120190405201904062120190405201904072120190405201904283020190501201905013120190501201905023120190501201905033120190501201905043120190501201905053020190501201906074120190607201906084120190607201906094120190607201909135120190913201909145120190913201909155120190913201909296020191001201910016120191001201910026120191001201910036120191001201910046120191001201910056120191001201910066120191001201910076120191001201910126020191001202001010120200101202001191020200125202001241120200125202001251120200125202001261120200125202001271120200125202001281120200125202001291120200125202001301120200125202001311120200125202002011120200125202002021120200125202004042120200404202004052120200404202004062120200404202004263020200501202005013120200501202005023120200501202005033120200501202005043120200501202005053120200501202005093020200501202006254120200625202006264120200625202006274120200625202006284020200625202009277020201001202010017120201001202010026120201001202010036120201001202010046120201001202010056120201001202010066120201001202010076120201001202010086120201001202010106020201001202101010120210101202101020120210101202101030120210101202102071020210212202102111120210212202102121120210212202102131120210212202102141120210212202102151120210212202102161120210212202102171120210212202102201020210212202104032120210404202104042120210404202104052120210404202104253020210501202105013120210501202105023120210501202105033120210501202105043120210501202105053120210501202105083020210501202106124120210614202106134120210614202106144120210614202109185020210921202109195120210921202109205120210921202109215120210921202109266020211001202110016120211001202110026120211001202110036120211001202110046120211001202110056120211001202110066120211001202110076120211001202110096020211001';
     var _DATA_IN_USE = _DATA;
     var _padding = function(n){
       return (n<10?'0':'')+n;
diff --git a/package.json b/package.json
index 0bdf786..cf2ad9f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lunar-javascript",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "lunar is a calendar library for Solar and Chinese Lunar.",
   "main": "index.js",
   "scripts": {