Merge branch 'master2' into replaceStructureWord

# Conflicts:
#	json/poet.tang.43000.json
This commit is contained in:
wtffly
2019-03-15 11:10:00 +08:00
30 changed files with 764 additions and 453 deletions

View File

@@ -1631,10 +1631,12 @@
{
"author": "東方虯",
"paragraphs": [
"漢道初全盛,朝廷足武臣。"
"漢道初全盛,朝廷足武臣。",
"何須薄命妾,辛苦事和親。"
],
"strains": [
"仄仄平平仄,平平仄仄平。"
"仄仄平平仄,平平仄仄平。",
"平平仄仄仄,平仄仄平平。"
],
"title": "相和歌辭 王昭君三首 一"
},
@@ -3652,10 +3654,12 @@
{
"author": "令狐楚",
"paragraphs": [
"荒雞隔水啼,汗馬逐風嘶。"
"荒雞隔水啼,汗馬逐風嘶。",
"終日隨征斾,何時罷鼓鼙。"
],
"strains": [
"平平仄仄平,仄仄仄平平。"
"平平仄仄平,仄仄仄平平。",
"平仄平平仄,平平仄仄平。"
],
"title": "相和歌辭 從軍行五首 一"
},
@@ -10211,10 +10215,12 @@
{
"author": "張祜",
"paragraphs": [
"萬里邊城遠,千山行路難。"
"萬里邊城遠,千山行路難。",
"舉頭唯見日,何處是長安。"
],
"strains": [
"仄仄平平仄,平平仄仄平。"
"仄仄平平仄,平平仄仄平。",
"仄平平仄仄,平仄仄平平。"
],
"title": "琴曲歌辭 昭君怨 一"
},
@@ -13221,10 +13227,12 @@
{
"author": "僧貫休",
"paragraphs": [
"錦衣鮮華手擎鶻,閑行氣貌多輕忽。"
"錦衣鮮華手擎鶻,閑行氣貌多輕忽。",
"稼穡艱難總不知,五帝三王是何物。"
],
"strains": [
"仄○○平仄平仄,平○仄仄平○仄。"
"仄○○平仄平仄,平○仄仄平○仄。",
"仄?平平仄仄平,仄仄平平仄平仄。"
],
"title": "雜曲歌辭 少年行三首 一"
},