From 8b63ff882ae28b1a1774293673a7531463d6a5e5 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 23 Aug 2023 05:14:16 +0000
Subject: [PATCH] fix: tag support for non-latin alphabets (fixes #398)
---
quartz/plugins/transformers/ofm.ts | 8 ++++----
quartz/plugins/transformers/frontmatter.ts | 2 +-
quartz/components/TagList.tsx | 3 ++-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/quartz/components/TagList.tsx b/quartz/components/TagList.tsx
index 639f68c..a4dfac7 100644
--- a/quartz/components/TagList.tsx
+++ b/quartz/components/TagList.tsx
@@ -44,7 +44,8 @@
a.tag-link {
border-radius: 8px;
background-color: var(--highlight);
- padding: 0.2rem 0.5rem;
+ padding: 0.2rem 0.4rem;
+ margin: 0 0.1rem;
}
`
diff --git a/quartz/plugins/transformers/frontmatter.ts b/quartz/plugins/transformers/frontmatter.ts
index 5b067f6..3f55b9c 100644
--- a/quartz/plugins/transformers/frontmatter.ts
+++ b/quartz/plugins/transformers/frontmatter.ts
@@ -41,7 +41,7 @@
}
// slug them all!!
- data.tags = data.tags?.map((tag: string) => slugTag(tag)) ?? []
+ data.tags = [...new Set(data.tags?.map((tag: string) => slugTag(tag)))] ?? []
// fill in frontmatter
file.data.frontmatter = {
diff --git a/quartz/plugins/transformers/ofm.ts b/quartz/plugins/transformers/ofm.ts
index b66ba85..bed6f62 100644
--- a/quartz/plugins/transformers/ofm.ts
+++ b/quartz/plugins/transformers/ofm.ts
@@ -116,7 +116,7 @@
const calloutLineRegex = new RegExp(/^> *\[\!\w+\][+-]?.*$/, "gm")
// (?:^| ) -> non-capturing group, tag should start be separated by a space or be the start of the line
// #(\w+) -> tag itself is # followed by a string of alpha-numeric characters
-const tagRegex = new RegExp(/(?:^| )#([\w-_\/]+)/, "g")
+const tagRegex = new RegExp(/(?:^| )#(\p{L}+)/, "gu")
export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin<Partial<Options> | undefined> = (
userOpts,
@@ -382,8 +382,8 @@
plugins.push(() => {
return (tree: Root, file) => {
const base = pathToRoot(file.data.slug!)
- findAndReplace(tree, tagRegex, (value: string, tag: string) => {
- if (file.data.frontmatter) {
+ findAndReplace(tree, tagRegex, (_value: string, tag: string) => {
+ if (file.data.frontmatter && !file.data.frontmatter.tags.includes(tag)) {
file.data.frontmatter.tags.push(tag)
}
@@ -398,7 +398,7 @@
children: [
{
type: "text",
- value,
+ value: `#${tag}`,
},
],
}
--
Gitblit v1.10.0