From 26d838a8905dcb36678debd417a358bed022db09 Mon Sep 17 00:00:00 2001
From: saberzero1 <ewjbangma@hotmail.com>
Date: Sat, 30 Jul 2022 08:07:35 +0200
Subject: [PATCH] Updated Regex

---
 assets/js/popover.js                 | 5 ++---
 assets/js/search.js                  | 3 ++-
 layouts/partials/textprocessing.html | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/js/popover.js b/assets/js/popover.js
index 94edc3df3..6fec7e5e0 100644
--- a/assets/js/popover.js
+++ b/assets/js/popover.js
@@ -7,7 +7,6 @@ function htmlToElement(html) {
 
 function initPopover(baseURL, useContextualBacklinks, renderLatex) {
   const basePath = baseURL.replace(window.location.origin, "")
-  const regex = /\[!.+\]-? /;
   fetchData.then(({ content }) => {
     const links = [...document.getElementsByClassName("internal-link")]
     links
@@ -18,7 +17,7 @@ function initPopover(baseURL, useContextualBacklinks, renderLatex) {
           const linkDest = content[li.dataset.src]
           const popoverElement = `<div class="popover">
     <h3>${linkDest.title}</h3>
-    <p>${highlight(removeMarkdown(linkDest.content), li.dataset.ctx).replace(regex, "")}...</p>
+    <p>${highlight(removeMarkdown(linkDest.content), li.dataset.ctx)}...</p>
     <p class="meta">${new Date(linkDest.lastmodified).toLocaleDateString()}</p>
 </div>`
           el = htmlToElement(popoverElement)
@@ -27,7 +26,7 @@ function initPopover(baseURL, useContextualBacklinks, renderLatex) {
           if (linkDest) {
             const popoverElement = `<div class="popover">
     <h3>${linkDest.title}</h3>
-    <p>${removeMarkdown(linkDest.content).split(" ", 20).join(" ").replace(regex, "")}...</p>
+    <p>${removeMarkdown(linkDest.content).split(" ", 20).join(" ")}...</p>
     <p class="meta">${new Date(linkDest.lastmodified).toLocaleDateString()}</p>
 </div>`
             el = htmlToElement(popoverElement)
diff --git a/assets/js/search.js b/assets/js/search.js
index bca57b3b1..289b78e33 100644
--- a/assets/js/search.js
+++ b/assets/js/search.js
@@ -45,6 +45,7 @@ const removeMarkdown = (
       .replace(/(`{3,})(.*?)\1/gm, "$2")
       .replace(/`(.+?)`/g, "$1")
       .replace(/\n{2,}/g, "\n\n")
+      .replace(/\[![a-zA-Z]+\]-? /g, "")
   } catch (e) {
     console.error(e)
     return markdown
@@ -138,7 +139,7 @@ const highlight = (content, term) => {
   }
 
   const resultToHTML = ({ url, title, content, term }) => {
-    const regex = /\[!.+\]-? /;
+    const regex = /\[![a-zA-z]\]-? /;
     const text = removeMarkdown(content)
     const resultTitle = highlight(title, term)
     const resultText = highlight(text, term)
diff --git a/layouts/partials/textprocessing.html b/layouts/partials/textprocessing.html
index aea3cec29..e1a522586 100644
--- a/layouts/partials/textprocessing.html
+++ b/layouts/partials/textprocessing.html
@@ -67,7 +67,7 @@
   {{ $finder = index $blockquoteclasses1 $counter }}
   {{ if (in $finder "[!") }}
     {{ $inner := index $blockquoteclasses $counter1 }}
-    {{ $inner = $inner | replaceRE `\[!(.+)\]` `${1}` }}
+    {{ $inner = $inner | replaceRE `\[!([a-zA-Z]+)\]` `${1}` }}
     {{ $inner = printf "blockquote class=%s-callout" $inner}}
     {{ $content = replace $content . $inner 1}}
     {{ $counter1 = add $counter1 1 }}
@@ -77,7 +77,7 @@
   {{ end }}
   {{ $counter = add $counter 1 }}
 {{end}}
-{{ $content = $content | replaceRE `\[!.+\]-?` "" }}
+{{ $content = $content | replaceRE `\[![a-zA-Z]+\]-?` "" }}
 {{ $content = $content | replaceRE "blockquote class=callout" "blockquote" }}
 
 {{ $content | safeHTML }}