From 531baaccb3f927938b85b10c9a00e49ce3cfcadd Mon Sep 17 00:00:00 2001
From: fisher <tiebayu@126.com>
Date: Fri, 28 Feb 2020 20:44:35 +0800
Subject: [PATCH 1/2] fixed classical novel type

---
 app/src/main/assets/txtTocRule.json | 126 +++++++++++++++-------------
 1 file changed, 66 insertions(+), 60 deletions(-)

diff --git a/app/src/main/assets/txtTocRule.json b/app/src/main/assets/txtTocRule.json
index 4e93e04d7..1304059d0 100644
--- a/app/src/main/assets/txtTocRule.json
+++ b/app/src/main/assets/txtTocRule.json
@@ -1,62 +1,68 @@
 [
-  {
-      "enable": true,
-      "name": "数字 分隔符 标题名称",
-      "rule": "^[ \\t]{0,4}\\d{1,5}[\\,\\.， 、\\-].{1,30}$",
-      "serialNumber": 0
-  },
-  {
-      "enable": true,
-      "name": "目录",
-      "rule": "^[ \\t]{0,4}(?:(?:内容|文章)?简介|前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
-      "serialNumber": 1
-  },
-  {
-      "enable": false,
-      "name": "目录(不匹配行前空白)",
-      "rule": "^(?<=\\s)(?:(?:内容|文章)?简介|前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
-      "serialNumber": 2
-  },
-  {
-      "enable": false,
-      "name": "目录(去简介)",
-      "rule": "^(?<=\\s)(?:前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
-      "serialNumber": 3
-  },
-  {
-      "enable": false,
-      "name": "目录(古典小说备用)",
-      "rule": "^[ \\t]{0,4}(?:前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|场(?![和合比电是])|篇(?!张))).{0,30}$",
-      "serialNumber": 4
-  },
-  {
-      "enable": true,
-      "name": "Chapter/Section/Part 序号 标题",
-      "rule": "^[ \\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art)\\s{0,4}\\d{1,4}.{0,30}$",
-      "serialNumber": 5
-  },
-  {
-      "enable": true,
-      "name": "正文 标题/序号",
-      "rule": "^[ \\t]{0,4}正文\\s{1,4}.{0,20}$",
-      "serialNumber": 6
-  },
-  {
-      "enable": true,
-      "name": "特殊符号 序号 标题",
-      "rule": "^[ \\t]{0,4}[〈〖〔【][第卷][\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,10}[章节][\\.:： \f\t].{0,30}$",
-      "serialNumber": 7
-  },
-  {
-      "enable": true,
-      "name": "特殊符号 标题",
-      "rule": "^[ \\t]{0,4}[〈〖〔【☆★].{1,30}[】〕〗〉]?\\s{0,4}$",
-      "serialNumber": 8
-  },
-  {
-      "enable":false,
-      "name": "特殊符号 标题(不匹配空白字符)",
-      "rule": "(?<=\\s)[〈〖〔【☆★].{1,30}[】〕〗〉]?\\s{0,4}$",
-      "serialNumber": 9
-  }
+    {
+        "enable": true,
+        "name": "目录",
+        "rule": "^[ \\t]{0,4}(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
+        "serialNumber": 0
+    },
+    {
+        "enable": false,
+        "name": "目录(不匹配行前空白)",
+        "rule": "^(?<=\\s)(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
+        "serialNumber": 1
+    },
+    {
+        "enable": false,
+        "name": "目录(去简介)",
+        "rule": "^(?<=\\s)(?:前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
+        "serialNumber": 2
+    },
+    {
+        "enable": false,
+        "name": "目录(古典、轻小说备用)",
+        "rule": "^[ \\t]{0,4}(?:前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|回(?![合来事去])|场(?![和合比电是])|篇(?!张))).{0,30}$",
+        "serialNumber": 3
+    },
+    {
+        "enable": true,
+        "name": "数字 分隔符 标题名称",
+        "rule": "^[ \\t]{0,4}\\d{1,5}[\\,\\.， 、\\-].{1,30}$",
+        "serialNumber": 4
+    },
+    {
+        "enable": true,
+        "name": "正文 标题/序号",
+        "rule": "^[ \\t]{0,4}正文\\s{1,4}.{0,20}$",
+        "serialNumber": 5
+    },
+    {
+        "enable": true,
+        "name": "Chapter/Section/Part 序号 标题",
+        "rule": "^[ \\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art)\\s{0,4}\\d{1,4}.{0,30}$",
+        "serialNumber": 6
+    },
+    {
+        "enable": true,
+        "name": "特殊符号 序号 标题",
+        "rule": "^[ \\t]{0,4}[〈〖〔【][第卷][\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,10}[章节][\\.:： \f\t].{0,30}$",
+        "serialNumber": 7
+    },
+    {
+        "enable": true,
+        "name": "特殊符号 标题",
+        "rule": "^[ \\t]{0,4}[\\[〈「『〖〔《（【\\(☆★].{1,30}[\\)】）》〕〗』」〉\\]]?\\s{0,4}$",
+        "serialNumber": 8
+    },
+    {
+        "enable":false,
+        "name": "特殊符号 标题(不匹配空白字符)",
+        "rule": "^(?<=\\s)[\\[〈「『〖〔《（【\\(☆★].{1,30}[\\)】）》〕〗』」〉\\]]?\\s{0,4}$",
+        "serialNumber": 9
+    },
+    {
+        "enable":false,
+        "name": "顶格标题",
+        "rule": "^\\S.{1,20}$",
+        "serialNumber": 10
+    }
 ]

From 39bac049d6d7297bfcc51be9478db312c4f8b3c6 Mon Sep 17 00:00:00 2001
From: fisher <tiebayu@126.com>
Date: Fri, 28 Feb 2020 21:03:47 +0800
Subject: [PATCH 2/2] fixed error text

---
 app/src/main/res/values/arrays.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index ff1fc875c..bdcdf57eb 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -155,6 +155,6 @@
     <string-array name="system_typefaces">
         <item>系统默认字体</item>
         <item>系统衬线字体</item>
-        <item>系统等宽等宽</item>
+        <item>系统等宽字体</item>
     </string-array>
 </resources>
\ No newline at end of file