Merge branch 'master' of https://github.com/chinese-poetry/chinese-poetry

README.md

@@ -85,6 +85,8 @@ chinese-poetry
 - [Clover27](https://github.com/Clover27) **/** [ancient-Chinese-poem-generator](https://github.com/Clover27/ancient-Chinese-poem-generator)  *Ancient-Chinese-Poem-Generator*
 - [chinese-poetry](https://github.com/chinese-poetry) **/** [poetry-calendar](http://shici.store/poetry-calendar/)  *诗词周历*
 - [chenyuntc](https://github.com/chenyuntc) **/** [pytorch-book](https://github.com/chenyuntc/pytorch-book/blob/master/chapter9-神经网络写诗(CharRNN)/) *简体唐诗生成(char-RNN), 可生成藏头诗,自定义诗歌意境,前缀等*
+- [okcy1016](https://github.com/okcy1016) **/** [poetry-desktop](https://github.com/okcy1016/poetry-desktop/) *诗词桌面*
+
 ### 公众号
 
 - **PoemSearcher**

json/authors.song.json

@@ -2677,7 +2677,7 @@
   }, 
   {
     "desc": "許元祐，生平不詳。《淳祐臨安志》卷二九錄其《風水洞》詩，在張先、范仲淹後，或亦爲仁宗時人。現暫列於此，俟考。", 
-    "name": "許元祐aa《淳祐臨安志》作裕bb"
+    "name": "許元祐（《淳祐臨安志》作裕）"
   }, 
   {
     "desc": "陳執中（九九○～一○五九），字昭譽，洪州南昌（今屬江西）人。真宗時以父蔭爲秘書省正字。累遷衛尉寺丞，知梧州。後歷知江寧府、揚州、永興軍。仁宗寶元元年（一○三八）同知樞密院事（《宋宰輔編年錄》卷四）。慶曆元年（一○四一）出知青州，改永興軍。四年，召拜參知政事。五年，同平章事兼樞密使。皇祐元年（一○四九）出知陳州。五年，再入相。至和二年（一○五五）充鎮海軍節度使判亳州（同上書卷五）。逾年辭節，以司徒致仕。嘉祐四年卒，年七十（《樂全集》卷三七《陳公神道碑銘》）。謚恭。《宋史》卷地八五有傳。今錄詩三首。", 
@@ -31949,7 +31949,7 @@
   }, 
   {
     "desc": "無傳。", 
-    "name": "俞桂aa一本作梅bb山"
+    "name": "俞桂（一本作梅）山"
   }, 
   {
     "desc": "無傳。", 
@@ -32269,7 +32269,7 @@
   }, 
   {
     "desc": "無傳。", 
-    "name": "曹仙家aa《羅浮山志會編》卷一六作姑bb"
+    "name": "曹仙家（《羅浮山志會編》卷一六作姑）"
   }, 
   {
     "desc": "無傳。", 

json/poet.song.10000.json

@@ -4984,7 +4984,7 @@
       "平仄仄平仄，平平平仄平。", 
       "○○仄仄仄，平仄仄平平。"
     ], 
-    "title": "余卧病畿邑御史王君假守潭楚道出于舍下特見存訪且尋先子之舊欽承風儀因爲詩抒感云bb"
+    "title": "余卧病畿邑御史王君假守潭楚道出于舍下特見存訪且尋先子之舊欽承風儀因爲詩抒感云"
   }, 
   {
     "author": "宋庠", 

json/poet.song.155000.json

@@ -12270,7 +12270,7 @@
       "平仄平平平，平平○仄平。", 
       "平平平，仄仄仄，平仄仄仄平，平仄仄仄仄。"
     ], 
-    "title": "荷柳松竹贈答bb 僕贈荷"
+    "title": "荷柳松竹贈答 僕贈荷"
   }, 
   {
     "author": "王質", 
@@ -12284,7 +12284,7 @@
       "平○仄仄仄，平仄平平平。", 
       "平仄仄，仄仄仄，仄仄仄平○，平仄平○仄。"
     ], 
-    "title": "荷柳松竹贈答bb 荷遜柳"
+    "title": "荷柳松竹贈答 荷遜柳"
   }, 
   {
     "author": "王質", 
@@ -12298,7 +12298,7 @@
       "仄仄平平平，○平仄平仄。", 
       "仄仄平，平平仄，○仄平平平，○仄○平仄。"
     ], 
-    "title": "荷柳松竹贈答bb 柳遜竹"
+    "title": "荷柳松竹贈答 柳遜竹"
   }, 
   {
     "author": "王質", 
@@ -12312,7 +12312,7 @@
       "仄仄仄平仄，仄仄平仄平。", 
       "平○○，仄平仄，仄仄仄仄平，仄仄平平仄。"
     ], 
-    "title": "荷柳松竹贈答bb 竹遜松"
+    "title": "荷柳松竹贈答 竹遜松"
   }, 
   {
     "author": "王質", 
@@ -12326,7 +12326,7 @@
       "仄仄平平平，平仄平仄平。", 
       "仄平仄，仄仄平，仄仄仄仄仄，仄仄平○平。"
     ], 
-    "title": "荷柳松竹贈答bb 松答僕"
+    "title": "荷柳松竹贈答 松答僕"
   }, 
   {
     "author": "王質", 

json/poet.song.164000.json

@@ -13073,7 +13073,7 @@
       "仄仄平仄仄，平平仄仄○。", 
       "平平仄平仄，仄仄仄平○。"
     ], 
-    "title": "令逸作歲寒知松柏題詩因作bb"
+    "title": "令逸作歲寒知松柏題詩因作"
   }, 
   {
     "author": "趙蕃", 

json/poet.song.229000.json

@@ -7415,7 +7415,7 @@
       "漢武帝時執此物者侍中孔安國也，唐明皇時楊妃職之，漢唐之所以成敗歟？",
       "然而寵任中書宦官，又自漢始。", 
       "此話甚長，小子識之。", 
-      "bb。"
+      ""
     ], 
     "strains": [
       "○平仄仄○平仄，仄仄平平仄仄平。", 

json/poet.song.252000.json

@@ -5602,7 +5602,7 @@
     "title": "瑞炭"
   }, 
   {
-    "author": "俞桂aa一本作梅bb山", 
+    "author": "俞桂（一本作梅）山", 
     "paragraphs": [
       "向晚鸞箋擘砑紅，相煩歸燕簡東風。", 
       "酬春未得偷閒力，遲放海棠花幾叢。"
@@ -7399,7 +7399,7 @@
     "title": "題梅山"
   }, 
   {
-    "author": "曹仙家aa《羅浮山志會編》卷一六作姑bb", 
+    "author": "曹仙家（《羅浮山志會編》卷一六作姑）", 
     "paragraphs": [
       "漢代梅君此鍊丹，古壇翠駮蘚花斑。", 
       "目窮鳥道青天遠，榻轉松陰白日閑。", 
@@ -7415,7 +7415,7 @@
     "title": "題梅壇"
   }, 
   {
-    "author": "曹仙家aa《羅浮山志會編》卷一六作姑bb", 
+    "author": "曹仙家（《羅浮山志會編》卷一六作姑）", 
     "paragraphs": [
       "羅浮道士真仙子，躍出樊籠求不死。", 
       "冰壺皎潔水鑑清，洞然表裏無塵滓。", 

json/poet.song.9000.json

@@ -1859,7 +1859,7 @@
     "title": "和范公希文懷慶朔堂"
   }, 
   {
-    "author": "許元祐aa《淳祐臨安志》作裕bb", 
+    "author": "許元祐（《淳祐臨安志》作裕）", 
     "paragraphs": [
       "野寺依山立，松橋避石斜。", 
       "壞梁飛但是蟻，枯木掛青蛇。",