diff --git a/src/components/article/CollectionSummary.astro b/src/components/article/CollectionSummary.astro
index e94852d..9466dbb 100644
--- a/src/components/article/CollectionSummary.astro
+++ b/src/components/article/CollectionSummary.astro
@@ -23,8 +23,8 @@ const allCategories: Array = Array.from(
new Set(
allPosts.map((entry) => {
return entry.data.category;
- })
- )
+ }),
+ ),
);
const categoriedPostList: Array = allCategories.map((key) => {
@@ -34,7 +34,7 @@ const categoriedPostList: Array = allCategories.map((key) => {
// article sort function by article title
function sortPostByTitlePinyin(
postA: CollectionEntry,
- postB: CollectionEntry
+ postB: CollectionEntry,
): number {
let postATitle = pinyinpro.convert(pinyinpro.pinyin(postA.data.title), {
format: "symbolToNum",
@@ -63,15 +63,15 @@ const categoriedPostList: Array = allCategories.map((key) => {
object[key].filter((post) => /^[^a-zA-Z]/.test(post.data.title));
// sort two Array by article title
postWithAlphabetStartedTitle.sort((postA, postB) =>
- sortPostByTitlePinyin(postA, postB)
+ sortPostByTitlePinyin(postA, postB),
);
postWithChineseStartedTitle.sort((postA, postB) =>
- sortPostByTitlePinyin(postA, postB)
+ sortPostByTitlePinyin(postA, postB),
);
// articles that have title start with Chinese prior to
// those which have titles start with the alphabet
object[key] = postWithChineseStartedTitle.concat(
- postWithAlphabetStartedTitle
+ postWithAlphabetStartedTitle,
);
}
return object;
@@ -83,7 +83,7 @@ const categoriedPostListSortedByArticleAmount: Array =
const aKey: string = Object.keys(a)[0];
const bKey: string = Object.keys(b)[0];
return b[bKey].length - a[aKey].length;
- }
+ },
);
---
diff --git a/src/components/article/article_body/ArticleBody.astro b/src/components/article/article_body/ArticleBody.astro
index 9901f0c..54d13a0 100644
--- a/src/components/article/article_body/ArticleBody.astro
+++ b/src/components/article/article_body/ArticleBody.astro
@@ -2,25 +2,67 @@
// get rendered ArticleBodyContent HTML
const html = await Astro.slots.render("default");
-// If some lines are not started with ASCII character,
-// join them to their previous line.
-// This is important.
-// Because I add one newline character to wrap Chinese.
+// rule:
+// 1. If a line belongs to the area where the line break should be kept,
+// do not process this line.
+// 2. If a line ends with [a-zA-Z], add a space to the end of this line.
+// 3. If a line ends without [a-zA-Z] and its next line starts with [a-zA-Z],
+// add a heading space to the next line.
+// 4. If a line does not start in ASCII chars, join it to its previous line.
+// 5. If a line starts with or or , add a heading space to
+// this line.
+// 6. If a line ends with or or , add a tailing space to
+// this line.
+// This is important in using one newline character to wrap Chinese.
const arr = html.split("\n");
let articleHTMLFinal = arr[0];
-// Whether the current line belongs to the area where
-// the line break should be kept.
let remainIntactArea = false;
+// The first line of the HTML string is a table-of-content head recognized by
+// remark-toc so it can be ignored.
for (let i = 1; i < arr.length; i++) {
+ // rule 1
+ // Check if the current line belongs to some block area.
if (arr[i].match(/^(||)/) !== null) {
+ arr[i] = " " + arr[i];
+ }
+ // rule 6
+ if (arr[i].match(/(<\/em>|<\/strong>|<\/a>)$/) !== null) {
+ arr[i] = arr[i] + " ";
+ }
+ // -------- combine lines
+ // rule 4
+ if (
+ // (
+ // If the first character is not ascii character,
+ // OR
+ // the final character of previous line is not ascii character.
+ // ) AND
// Current line should not belong to area that remains intact.
(arr[i].charAt(0).match(/[ -~]/) === null ||
arr[i - 1].charAt(arr[i - 1].length - 1).match(/[ -~]/) === null) &&
diff --git a/src/components/tool/ToolNav.astro b/src/components/tool/ToolNav.astro
index 3e0e01a..d0d2fc2 100644
--- a/src/components/tool/ToolNav.astro
+++ b/src/components/tool/ToolNav.astro
@@ -1,4 +1,5 @@
---
+
---