From 6ba138b4fa4a9ed48a79fd2f65202c97b8d66e6f Mon Sep 17 00:00:00 2001
From: 1900 <me@1900.live>
Date: Tue, 30 Jan 2024 17:58:09 +0000
Subject: [PATCH] feat: support selfhost umami (#764)
---
quartz/plugins/transformers/ofm.ts | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/quartz/plugins/transformers/ofm.ts b/quartz/plugins/transformers/ofm.ts
index 7c9b33b..fc98bb2 100644
--- a/quartz/plugins/transformers/ofm.ts
+++ b/quartz/plugins/transformers/ofm.ts
@@ -138,6 +138,9 @@
const blockReferenceRegex = new RegExp(/\^([-_A-Za-z0-9]+)$/, "g")
const ytLinkRegex = /^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
const videoExtensionRegex = new RegExp(/\.(mp4|webm|ogg|avi|mov|flv|wmv|mkv|mpg|mpeg|3gp|m4v)$/)
+const wikilinkImageEmbedRegex = new RegExp(
+ /^(?<alt>(?!^\d*x?\d*$).*?)?(\|?\s*?(?<width>\d+)(x(?<height>\d+))?)?$/,
+)
export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin<Partial<Options> | undefined> = (
userOpts,
@@ -222,18 +225,10 @@
const ext: string = path.extname(fp).toLowerCase()
const url = slugifyFilePath(fp as FilePath)
if ([".png", ".jpg", ".jpeg", ".gif", ".bmp", ".svg", ".webp"].includes(ext)) {
- // either |alt|dims or |dims
- let [alt, dims] = (alias ?? "").split("|")
-
- // |dims case, treat first alt slot as dims
- if (dims === undefined) {
- dims = alt
- alt = ""
- }
-
- let [width, height] = dims.split("x", 2)
- width ||= "auto"
- height ||= "auto"
+ const match = wikilinkImageEmbedRegex.exec(alias ?? "")
+ const alt = match?.groups?.alt ?? ""
+ const width = match?.groups?.width ?? "auto"
+ const height = match?.groups?.height ?? "auto"
return {
type: "image",
url,
@@ -441,7 +436,7 @@
value: `<div
class="callout-title"
>
- <div class="callout-icon">${callouts[calloutType] ?? callouts.note}</div>
+ <div class="callout-icon">${callouts[calloutType] ?? callouts.note}</div>
<div class="callout-title-inner">${title}</div>
${collapse ? toggleIcon : ""}
</div>`,
--
Gitblit v1.10.0