From d57f73cf706bad55cabd99f54f6c7a85946def09 Mon Sep 17 00:00:00 2001
From: 6tail <6tail@6tail.cn>
Date: Fri, 18 Sep 2020 19:53:08 +0800
Subject: [PATCH] =?UTF-8?q?v1.0.20=20=E8=8A=82=E6=B0=94=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=86=9C=E5=8E=86=E4=B8=8A=E5=B9=B4=E6=9C=AB=E7=9A=84?=
 =?UTF-8?q?=E5=A4=A7=E9=9B=AA=EF=BC=9B=E4=BF=AE=E5=A4=8D=E5=B9=B4=E5=88=9D?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8A=E4=B8=80=E8=8A=82=E4=BB=A4=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9Enull=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lunar.js     | 31 +++++++++++++++++++++++--------
 package.json |  2 +-
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/lunar.js b/lunar.js
index a12959e..3ade010 100644
--- a/lunar.js
+++ b/lunar.js
@@ -494,6 +494,10 @@
         w -= 365.2422;
       }
       var q,key;
+      q = _calcJieQi(w - 15.2184);
+      key = Lunar.JIE_QI_PREPEND;
+      o['jieQiList'].push(key);
+      o['jieQi'][key] = Solar.fromJulianDay(_qiAccurate2(q) + Solar.J2000);
       var size = JIE_QI.length;
       for (var i=0;i<size;i++) {
         q = _calcJieQi(w + 15.2184 * i);
@@ -502,7 +506,7 @@
         o['jieQi'][key] = Solar.fromJulianDay(_qiAccurate2(q) + Solar.J2000);
       }
       q = _calcJieQi(w + 15.2184 * size);
-      key = 'DONG_ZHI';
+      key = Lunar.JIE_QI_APPEND;
       o['jieQiList'].push(key);
       o['jieQi'][key] = Solar.fromJulianDay(_qiAccurate2(q) + Solar.J2000);
     };
@@ -1001,13 +1005,18 @@
           return LunarUtil.SEASON[Math.abs(this._p.month)];
         },
         getJie:function(){
+          var d;
           for(var i=0,j=LunarUtil.JIE.length;i<j;i++){
             var jie = LunarUtil.JIE[i];
-            var d = this._p.jieQi[jie];
+            d = this._p.jieQi[jie];
             if(d.getYear()===this._p.solar.getYear()&&d.getMonth()===this._p.solar.getMonth()&&d.getDay()===this._p.solar.getDay()){
               return jie;
             }
           }
+          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;
+          }
           return '';
         },
         getQi:function(){
@@ -1019,9 +1028,9 @@
               return qi;
             }
           }
-          d = this._p.jieQi['DONG_ZHI'];
+          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 '冬至';
+            return Lunar.JIE_QI_FIRST;
           }
           return '';
         },
@@ -1296,15 +1305,18 @@
           }
           var today = this._p.solar.toYmdHms();
           for(var jq in this._p.jieQi){
-            if('DONG_ZHI'===jq){
-              jq = '冬至';
+            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(filter){
               if(!filters[jq]){
                 continue;
               }
             }
-            var solar = this._p.jieQi[jq];
             var day = solar.toYmdHms();
             if(forward){
               if(day<today){
@@ -1382,6 +1394,10 @@
       };
     };
     return {
+      JIE_QI_PREPEND: 'DA_XUE',
+      JIE_QI_APPEND: 'DONG_ZHI',
+      JIE_QI_FIRST: '冬至',
+      JIE_QI_LAST: '大雪',
       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);}
@@ -2736,7 +2752,6 @@
                 return LunarUtil.JIA_ZI[offset];
               },
               getLiuNian: function(){
-                console.log(this._p);
                 var n = 10;
                 if (this._p.index < 1) {
                   n = this._p.endYear-this._p.startYear+1;
diff --git a/package.json b/package.json
index e1a5ff0..37926b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lunar-javascript",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "lunar is a calendar library for Solar and Chinese Lunar.",
   "main": "index.js",
   "scripts": {