updated base quartz

Makefile

@@ -4,12 +4,14 @@ help: ## Show all Makefile targets
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 update: ## Update Quartz to the latest version on Github
+	go install github.com/jackyzha0/hugo-obsidian@latest
 	@git remote show upstream || (echo "remote 'upstream' not present, setting 'upstream'" && git remote add upstream https://github.com/jackyzha0/quartz.git)
 	git fetch upstream
 	git log --oneline --decorate --graph ..upstream/hugo
 	git checkout -p upstream/hugo -- layouts .github Makefile assets/js assets/styles/base.scss assets/styles/darkmode.scss config.toml data
 
 update-force: ## Forcefully pull all changes and don't ask to patch
+	go install github.com/jackyzha0/hugo-obsidian@latest
 	@git remote show upstream || (echo "remote 'upstream' not present, setting 'upstream'" && git remote add upstream https://github.com/jackyzha0/quartz.git)
 	git fetch upstream
 	git checkout upstream/hugo -- layouts .github Makefile assets/js assets/styles/base.scss assets/styles/darkmode.scss config.toml data

assets/js/graph.js

@@ -1,37 +1,60 @@
-async function drawGraph(url, baseUrl, pathColors, depth, enableDrag, enableLegend, enableZoom) {
+async function drawGraph(
+  baseUrl,
+  pathColors,
+  depth,
+  enableDrag,
+  enableLegend,
+  enableZoom
+) {
+  const container = document.getElementById('graph-container')
   const { index, links, content } = await fetchData
-  const curPage = url.replace(baseUrl, "")
 
-  const parseIdsFromLinks = (links) => [...(new Set(links.flatMap(link => ([link.source, link.target]))))]
+  // Use .pathname to remove hashes / searchParams / text fragments
+  const cleanUrl = window.location.origin + window.location.pathname
+
+  const curPage = cleanUrl.replace(/\/$/g, "").replace(baseUrl, "")
+
+  const parseIdsFromLinks = (links) => [
+    ...new Set(links.flatMap((link) => [link.source, link.target])),
+  ]
+
+  // Links is mutated by d3. We want to use links later on, so we make a copy and pass that one to d3
+  // Note: shallow cloning does not work because it copies over references from the original array
+  const copyLinks = JSON.parse(JSON.stringify(links))
 
   const neighbours = new Set()
-  const wl = [curPage || "/", "__SENTINEL"]
+  const wl = [curPage || '/', '__SENTINEL']
   if (depth >= 0) {
     while (depth >= 0 && wl.length > 0) {
       // compute neighbours
       const cur = wl.shift()
-      if (cur === "__SENTINEL") {
+      if (cur === '__SENTINEL') {
         depth--
-        wl.push("__SENTINEL")
+        wl.push('__SENTINEL')
       } else {
         neighbours.add(cur)
         const outgoing = index.links[cur] || []
         const incoming = index.backlinks[cur] || []
-        wl.push(...outgoing.map(l => l.target), ...incoming.map(l => l.source))
+        wl.push(
+          ...outgoing.map((l) => l.target),
+          ...incoming.map((l) => l.source)
+        )
       }
     }
   } else {
-    parseIdsFromLinks(links).forEach(id => neighbours.add(id))
+    parseIdsFromLinks(copyLinks).forEach((id) => neighbours.add(id))
   }
 
   const data = {
-    nodes: [...neighbours].map(id => ({ id })),
+    nodes: [...neighbours].map((id) => ({ id })),
-    links: links.filter(l => neighbours.has(l.source) && neighbours.has(l.target)),
+    links: copyLinks.filter(
+      (l) => neighbours.has(l.source) && neighbours.has(l.target)
+    ),
   }
 
   const color = (d) => {
-    if (d.id === curPage || (d.id === "/" && curPage === "")) {
+    if (d.id === curPage || (d.id === '/' && curPage === '')) {
-      return "var(--g-node-active)"
+      return 'var(--g-node-active)'
     }
 
     for (const pathColor of pathColors) {
@@ -42,179 +65,219 @@ async function drawGraph(url, baseUrl, pathColors, depth, enableDrag, enableLege
       }
     }
 
-    return "var(--g-node)"
+    return 'var(--g-node)'
   }
 
-  const drag = simulation => {
+  const drag = (simulation) => {
     function dragstarted(event, d) {
-      if (!event.active) simulation.alphaTarget(1).restart();
+      if (!event.active) simulation.alphaTarget(1).restart()
-      d.fx = d.x;
+      d.fx = d.x
-      d.fy = d.y;
+      d.fy = d.y
     }
 
     function dragged(event, d) {
-      d.fx = event.x;
+      d.fx = event.x
-      d.fy = event.y;
+      d.fy = event.y
     }
 
     function dragended(event, d) {
-      if (!event.active) simulation.alphaTarget(0);
+      if (!event.active) simulation.alphaTarget(0)
-      d.fx = null;
+      d.fx = null
-      d.fy = null;
+      d.fy = null
     }
 
     const noop = () => { }
-    return d3.drag()
+    return d3
-      .on("start", enableDrag ? dragstarted : noop)
+      .drag()
-      .on("drag", enableDrag ? dragged : noop)
+      .on('start', enableDrag ? dragstarted : noop)
-      .on("end", enableDrag ? dragended : noop);
+      .on('drag', enableDrag ? dragged : noop)
+      .on('end', enableDrag ? dragended : noop)
   }
 
-  const height = 250
+  const height = Math.max(container.offsetHeight, 250)
-  const width = document.getElementById("graph-container").offsetWidth
+  const width = container.offsetWidth
 
-  const simulation = d3.forceSimulation(data.nodes)
+  const simulation = d3
-    .force("charge", d3.forceManyBody().strength(-30))
+    .forceSimulation(data.nodes)
-    .force("link", d3.forceLink(data.links).id(d => d.id))
+    .force('charge', d3.forceManyBody().strength(-30))
-    .force("center", d3.forceCenter());
+    .force(
+      'link',
+      d3
+        .forceLink(data.links)
+        .id((d) => d.id)
+        .distance(40)
+    )
+    .force('center', d3.forceCenter())
 
-  const svg = d3.select('#graph-container')
+  const svg = d3
+    .select('#graph-container')
     .append('svg')
     .attr('width', width)
     .attr('height', height)
-    .attr("viewBox", [-width / 2, -height / 2, width, height]);
+    .attr('viewBox', [-width / 2, -height / 2, width, height])
 
   if (enableLegend) {
     const legend = [
-      { "Current": "var(--g-node-active)" },
+      { Current: 'var(--g-node-active)' },
-      { "Note": "var(--g-node)" },
+      { Note: 'var(--g-node)' },
-      ...pathColors
+      ...pathColors,
     ]
     legend.forEach((legendEntry, i) => {
       const key = Object.keys(legendEntry)[0]
       const colour = legendEntry[key]
-      svg.append("circle").attr("cx", -width / 2 + 20).attr("cy", height / 2 - 30 * (i + 1)).attr("r", 6).style("fill", colour)
+      svg
-      svg.append("text").attr("x", -width / 2 + 40).attr("y", height / 2 - 30 * (i + 1)).text(key).style("font-size", "15px").attr("alignment-baseline", "middle")
+        .append('circle')
+        .attr('cx', -width / 2 + 20)
+        .attr('cy', height / 2 - 30 * (i + 1))
+        .attr('r', 6)
+        .style('fill', colour)
+      svg
+        .append('text')
+        .attr('x', -width / 2 + 40)
+        .attr('y', height / 2 - 30 * (i + 1))
+        .text(key)
+        .style('font-size', '15px')
+        .attr('alignment-baseline', 'middle')
     })
   }
 
   // draw links between nodes
-  const link = svg.append("g")
+  const link = svg
-    .selectAll("line")
+    .append('g')
+    .selectAll('line')
     .data(data.links)
-    .join("line")
+    .join('line')
-    .attr("class", "link")
+    .attr('class', 'link')
-    .attr("stroke", "var(--g-link)")
+    .attr('stroke', 'var(--g-link)')
-    .attr("stroke-width", 2)
+    .attr('stroke-width', 2)
-    .attr("data-source", d => d.source.id)
+    .attr('data-source', (d) => d.source.id)
-    .attr("data-target", d => d.target.id)
+    .attr('data-target', (d) => d.target.id)
 
   // svg groups
-  const graphNode = svg.append("g")
+  const graphNode = svg
-    .selectAll("g")
+    .append('g')
+    .selectAll('g')
     .data(data.nodes)
-    .enter().append("g")
+    .enter()
+    .append('g')
+
+  // calculate radius
+  const nodeRadius = (d) => {
+    const numOut = index.links[d.id]?.length || 0
+    const numIn = index.backlinks[d.id]?.length || 0
+    return 3 + (numOut + numIn) / 4
+  }
 
   // draw individual nodes
-  const node = graphNode.append("circle")
+  const node = graphNode
-    .attr("class", "node")
+    .append('circle')
-    .attr("id", (d) => d.id)
+    .attr('class', 'node')
-    .attr("r", (d) => {
+    .attr('id', (d) => d.id)
-      const numOut = index.links[d.id]?.length || 0
+    .attr('r', nodeRadius)
-      const numIn = index.backlinks[d.id]?.length || 0
+    .attr('fill', color)
-      return 3 + (numOut + numIn) / 4
+    .style('cursor', 'pointer')
+    .on('click', (_, d) => {
+      // SPA navigation
+      window.navigate(
+        new URL(`${baseUrl}${decodeURI(d.id).replace(/\s+/g, '-')}/`),
+        '.singlePage'
+      )
     })
-    .attr("fill", color)
+    .on('mouseover', function(_, d) {
-    .style("cursor", "pointer")
+      d3.selectAll('.node')
-    .on("click", (_, d) => {
-      window.location.href = baseUrl + '/' + decodeURI(d.id).replace(/\s+/g, '-')
-    })
-    .on("mouseover", function(_, d) {
-      d3.selectAll(".node")
         .transition()
         .duration(100)
-        .attr("fill", "var(--g-node-inactive)")
+        .attr('fill', 'var(--g-node-inactive)')
 
-      const neighbours = parseIdsFromLinks([...(index.links[d.id] || []), ...(index.backlinks[d.id] || [])])
+      const neighbours = parseIdsFromLinks([
-      const neighbourNodes = d3.selectAll(".node").filter(d => neighbours.includes(d.id))
+        ...(index.links[d.id] || []),
+        ...(index.backlinks[d.id] || []),
+      ])
+      const neighbourNodes = d3
+        .selectAll('.node')
+        .filter((d) => neighbours.includes(d.id))
       const currentId = d.id
-      const linkNodes = d3.selectAll(".link").filter(d => d.source.id === currentId || d.target.id === currentId)
+      const linkNodes = d3
+        .selectAll('.link')
+        .filter((d) => d.source.id === currentId || d.target.id === currentId)
 
       // highlight neighbour nodes
-      neighbourNodes
+      neighbourNodes.transition().duration(200).attr('fill', color)
-        .transition()
-        .duration(200)
-        .attr("fill", color)
 
       // highlight links
       linkNodes
         .transition()
         .duration(200)
-        .attr("stroke", "var(--g-link-active)")
+        .attr('stroke', 'var(--g-link-active)')
 
       // show text for self
       d3.select(this.parentNode)
-        .select("text")
         .raise()
+        .select('text')
         .transition()
         .duration(200)
-        .style("opacity", 1)
+        .style('opacity', 1)
-    }).on("mouseleave", function(_, d) {
+    })
-      d3.selectAll(".node")
+    .on('mouseleave', function(_, d) {
-        .transition()
+      d3.selectAll('.node').transition().duration(200).attr('fill', color)
-        .duration(200)
-        .attr("fill", color)
 
       const currentId = d.id
-      const linkNodes = d3.selectAll(".link").filter(d => d.source.id === currentId || d.target.id === currentId)
+      const linkNodes = d3
+        .selectAll('.link')
+        .filter((d) => d.source.id === currentId || d.target.id === currentId)
 
-      linkNodes
+      linkNodes.transition().duration(200).attr('stroke', 'var(--g-link)')
-        .transition()
-        .duration(200)
-        .attr("stroke", "var(--g-link)")
 
       d3.select(this.parentNode)
-        .select("text")
+        .select('text')
         .transition()
         .duration(200)
-        .style("opacity", 0)
+        .style('opacity', 0)
     })
-    .call(drag(simulation));
+    .call(drag(simulation))
 
   // draw labels
-  const labels = graphNode.append("text")
+  const labels = graphNode
-    .attr("dx", 12)
+    .append('text')
-    .attr("dy", ".35em")
+    .attr('dx', 0)
-    .text((d) => content[d.id]?.title || d.id.replace("-", " "))
+    .attr('dy', (d) => nodeRadius(d) + 8 + 'px')
-    .style("opacity", 0)
+    .attr('text-anchor', 'middle')
-    .style("pointer-events", "none")
+    .text((d) => content[d.id]?.title || d.id.replace('-', ' '))
-    .call(drag(simulation));
+    .style('opacity', 0)
+    .style('pointer-events', 'none')
+    .style('font-size', '0.4em')
+    .raise()
+    .call(drag(simulation))
 
   // set panning
 
   if (enableZoom) {
-    svg.call(d3.zoom()
+    svg.call(
-      .extent([[0, 0], [width, height]])
+      d3
-      .scaleExtent([0.25, 4])
+        .zoom()
-      .on("zoom", ({ transform }) => {
+        .extent([
-        link.attr("transform", transform);
+          [0, 0],
-        node.attr("transform", transform);
+          [width, height],
-        labels.attr("transform", transform);
+        ])
-      }));
+        .scaleExtent([0.25, 4])
+        .on('zoom', ({ transform }) => {
+          link.attr('transform', transform)
+          node.attr('transform', transform)
+          const scale = transform.k
+          const scaledOpacity = Math.max((scale - 1) / 3.75, 0)
+          labels.attr('transform', transform).style('opacity', scaledOpacity)
+        })
+    )
   }
 
   // progress the simulation
-  simulation.on("tick", () => {
+  simulation.on('tick', () => {
     link
-      .attr("x1", d => d.source.x)
+      .attr('x1', (d) => d.source.x)
-      .attr("y1", d => d.source.y)
+      .attr('y1', (d) => d.source.y)
-      .attr("x2", d => d.target.x)
+      .attr('x2', (d) => d.target.x)
-      .attr("y2", d => d.target.y)
+      .attr('y2', (d) => d.target.y)
-    node
+    node.attr('cx', (d) => d.x).attr('cy', (d) => d.y)
-      .attr("cx", d => d.x)
+    labels.attr('x', (d) => d.x).attr('y', (d) => d.y)
-      .attr("cy", d => d.y)
+  })
-    labels
-      .attr("x", d => d.x)
-      .attr("y", d => d.y)
-  });
 }

assets/js/popover.js

@@ -1,35 +1,58 @@
 function htmlToElement(html) {
-  const template = document.createElement('template')
+  const template = document.createElement("template")
   html = html.trim()
   template.innerHTML = html
   return template.content.firstChild
 }
 
-function initPopover(baseURL) {
+function initPopover(baseURL, useContextualBacklinks, renderLatex) {
   const basePath = baseURL.replace(window.location.origin, "")
-  document.addEventListener("DOMContentLoaded", () => {
+  fetchData.then(({ content }) => {
-    fetchData.then(({ content }) => {
+    const links = [...document.getElementsByClassName("internal-link")]
-      const links = [...document.getElementsByClassName("internal-link")]
+    links
-      links
+      .filter(li => li.dataset.src || (li.dataset.idx && useContextualBacklinks))
-        .filter(li => li.dataset.src)
+      .forEach(li => {
-        .forEach(li => {
+        var el
-          const linkDest = content[li.dataset.src.replace(basePath, "")]
+        if (li.dataset.ctx) {
+          const linkDest = content[li.dataset.src]
+          const popoverElement = `<div class="popover">
+    <h3>${linkDest.title}</h3>
+    <p>${highlight(removeMarkdown(linkDest.content), li.dataset.ctx)}...</p>
+    <p class="meta">${new Date(linkDest.lastmodified).toLocaleDateString()}</p>
+</div>`
+          el = htmlToElement(popoverElement)
+        } else {
+          const linkDest = content[li.dataset.src.replace(/\/$/g, "").replace(basePath, "")]
           if (linkDest) {
             const popoverElement = `<div class="popover">
     <h3>${linkDest.title}</h3>
     <p>${removeMarkdown(linkDest.content).split(" ", 20).join(" ")}...</p>
     <p class="meta">${new Date(linkDest.lastmodified).toLocaleDateString()}</p>
 </div>`
-            const el = htmlToElement(popoverElement)
+            el = htmlToElement(popoverElement)
-            li.appendChild(el)
+          }
-            li.addEventListener("mouseover", () => {
+        }
-              el.classList.add("visible")
+
-            })
+        if (el) {
-            li.addEventListener("mouseout", () => {
+          li.appendChild(el)
-              el.classList.remove("visible")
+          if (renderLatex) {
+            renderMathInElement(el, {
+              delimiters: [
+                { left: '$$', right: '$$', display: false },
+                { left: '$', right: '$', display: false },
+                { left: '\\(', right: '\\)', display: false },
+                { left: '\\[', right: '\\]', display: false }
+              ],
+              throwOnError: false
             })
           }
-        })
+          li.addEventListener("mouseover", () => {
-    })
+            el.classList.add("visible")
+          })
+          li.addEventListener("mouseout", () => {
+            el.classList.remove("visible")
+          })
+        }
+      })
   })
 }

assets/js/router.js

@@ -0,0 +1,12 @@
+import { router, navigate } from "https://unpkg.com/million@1.8.9-0/dist/router.mjs"
+
+export const attachSPARouting = (draw) => {
+  // SPA navigation for access later
+  window.navigate = navigate
+  // We only mutate document.title and content within .singlePage element
+  router(".singlePage")
+  // We need on initial load, then subsequent redirs
+  // requestAnimationFrame() delays graph draw until SPA routing is finished
+  window.addEventListener("million:navigate", () => requestAnimationFrame(draw))
+  window.addEventListener("DOMContentLoaded", () => requestAnimationFrame(draw))
+}

assets/js/search.js

@@ -9,70 +9,127 @@ const removeMarkdown = (
     preserveLinks: false,
   }
 ) => {
-  let output = markdown || "";
+  let output = markdown || ''
-  output = output.replace(/^(-\s*?|\*\s*?|_\s*?){3,}\s*$/gm, "");
+  output = output.replace(/^(-\s*?|\*\s*?|_\s*?){3,}\s*$/gm, '')
 
   try {
     if (options.stripListLeaders) {
       if (options.listUnicodeChar)
         output = output.replace(
           /^([\s\t]*)([\*\-\+]|\d+\.)\s+/gm,
-          options.listUnicodeChar + " $1"
+          options.listUnicodeChar + ' $1'
-        );
+        )
-      else output = output.replace(/^([\s\t]*)([\*\-\+]|\d+\.)\s+/gm, "$1");
+      else output = output.replace(/^([\s\t]*)([\*\-\+]|\d+\.)\s+/gm, '$1')
     }
     if (options.gfm) {
       output = output
-        .replace(/\n={2,}/g, "\n")
+        .replace(/\n={2,}/g, '\n')
-        .replace(/~{3}.*\n/g, "")
+        .replace(/~{3}.*\n/g, '')
-        .replace(/~~/g, "")
+        .replace(/~~/g, '')
-        .replace(/`{3}.*\n/g, "");
+        .replace(/`{3}.*\n/g, '')
     }
     if (options.preserveLinks) {
-      output = output.replace(/\[(.*?)\][\[\(](.*?)[\]\)]/g, "$1 ($2)")
+      output = output.replace(/\[(.*?)\][\[\(](.*?)[\]\)]/g, '$1 ($2)')
     }
     output = output
-      .replace(/<[^>]*>/g, "")
+      .replace(/<[^>]*>/g, '')
-      .replace(/^[=\-]{2,}\s*$/g, "")
+      .replace(/^[=\-]{2,}\s*$/g, '')
-      .replace(/\[\^.+?\](\: .*?$)?/g, "")
+      .replace(/\[\^.+?\](\: .*?$)?/g, '')
-      .replace(/\s{0,2}\[.*?\]: .*?$/g, "")
+      .replace(/(#{1,6})\s+(.+)\1?/g, '<b>$2</b>')
-      .replace(/\!\[(.*?)\][\[\(].*?[\]\)]/g, options.useImgAltText ? "$1" : "")
+      .replace(/\s{0,2}\[.*?\]: .*?$/g, '')
-      .replace(/\[(.*?)\][\[\(].*?[\]\)]/g, "$1")
+      .replace(/\!\[(.*?)\][\[\(].*?[\]\)]/g, options.useImgAltText ? '$1' : '')
-      .replace(/^\s{0,3}>\s?/g, "")
+      .replace(/\[(.*?)\][\[\(].*?[\]\)]/g, '<a>$1</a>')
-      .replace(/(^|\n)\s{0,3}>\s?/g, "\n\n")
+      .replace(/!?\[\[\S[^\[\]\|]*(?:\|([^\[\]]*))?\S\]\]/g, '<a>$1</a>')
-      .replace(/^\s{1,2}\[(.*?)\]: (\S+)( ".*?")?\s*$/g, "")
+      .replace(/^\s{0,3}>\s?/g, '')
-      .replace(
+      .replace(/(^|\n)\s{0,3}>\s?/g, '\n\n')
-        /^(\n)?\s{0,}#{1,6}\s+| {0,}(\n)?\s{0,}#{0,} {0,}(\n)?\s{0,}$/gm,
+      .replace(/^\s{1,2}\[(.*?)\]: (\S+)( ".*?")?\s*$/g, '')
-        "$1$2$3"
+      .replace(/([\*_]{1,3})(\S.*?\S{0,1})\1/g, '$2')
-      )
+      .replace(/([\*_]{1,3})(\S.*?\S{0,1})\1/g, '$2')
-      .replace(/([\*_]{1,3})(\S.*?\S{0,1})\1/g, "$2")
+      .replace(/(`{3,})(.*?)\1/gm, '$2')
-      .replace(/([\*_]{1,3})(\S.*?\S{0,1})\1/g, "$2")
+      .replace(/`(.+?)`/g, '$1')
-      .replace(/(`{3,})(.*?)\1/gm, "$2")
+      .replace(/\n{2,}/g, '\n\n')
-      .replace(/`(.+?)`/g, "$1")
-      .replace(/\n{2,}/g, "\n\n");
   } catch (e) {
-    console.error(e);
+    console.error(e)
-    return markdown;
+    return markdown
   }
-  return output;
+  return output
-};
+}
 // -----
 
+const highlight = (content, term) => {
+  const highlightWindow = 20
+
+  // try to find direct match first
+  const directMatchIdx = content.indexOf(term)
+  if (directMatchIdx !== -1) {
+    const h = highlightWindow / 2
+    const before = content.substring(0, directMatchIdx).split(" ").slice(-h)
+    const after = content.substring(directMatchIdx + term.length, content.length - 1).split(" ").slice(0, h)
+    return (before.length == h ? `...${before.join(" ")}` : before.join(" ")) + `<span class="search-highlight">${term}</span>` + after.join(" ")
+  }
+
+  const tokenizedTerm = term.split(/\s+/).filter((t) => t !== '')
+  const splitText = content.split(/\s+/).filter((t) => t !== '')
+  const includesCheck = (token) =>
+    tokenizedTerm.some((term) =>
+      token.toLowerCase().startsWith(term.toLowerCase())
+    )
+
+  const occurrencesIndices = splitText.map(includesCheck)
+
+  // calculate best index
+  let bestSum = 0
+  let bestIndex = 0
+  for (
+    let i = 0;
+    i < Math.max(occurrencesIndices.length - highlightWindow, 0);
+    i++
+  ) {
+    const window = occurrencesIndices.slice(i, i + highlightWindow)
+    const windowSum = window.reduce((total, cur) => total + cur, 0)
+    if (windowSum >= bestSum) {
+      bestSum = windowSum
+      bestIndex = i
+    }
+  }
+
+  const startIndex = Math.max(bestIndex - highlightWindow, 0)
+  const endIndex = Math.min(
+    startIndex + 2 * highlightWindow,
+    splitText.length
+  )
+  const mappedText = splitText
+    .slice(startIndex, endIndex)
+    .map((token) => {
+      if (includesCheck(token)) {
+        return `<span class="search-highlight">${token}</span>`
+      }
+      return token
+    })
+    .join(' ')
+    .replaceAll('</span> <span class="search-highlight">', ' ')
+  return `${startIndex === 0 ? '' : '...'}${mappedText}${endIndex === splitText.length ? '' : '...'
+    }`
+};
+
 (async function() {
-  const encoder = str => str.toLowerCase().split(/([^a-z]|[^\x00-\x7F])+/)
+  const encoder = (str) => str.toLowerCase().split(/([^a-z]|[^\x00-\x7F])+/)
   const contentIndex = new FlexSearch.Document({
     cache: true,
-    charset: "latin:extra",
+    charset: 'latin:extra',
     optimize: true,
-    index: [{
+    index: [
-      field: "content",
+      {
-      tokenize: "reverse",
+        field: 'content',
-      encode: encoder,
+        tokenize: 'reverse',
-    }, {
+        encode: encoder,
-      field: "title",
+      },
-      tokenize: "forward",
+      {
-      encode: encoder,
+        field: 'title',
-    }]
+        tokenize: 'forward',
+        encode: encoder,
+      },
+    ],
   })
 
   const { content } = await fetchData
@@ -84,42 +141,6 @@ const removeMarkdown = (
     })
   }
 
-  const highlight = (content, term) => {
-    const highlightWindow = 20
-    const tokenizedTerm = term.split(/\s+/).filter(t => t !== "")
-    const splitText = content.split(/\s+/).filter(t => t !== "")
-    const includesCheck = (token) => tokenizedTerm.some(term => token.toLowerCase().startsWith(term.toLowerCase()))
-
-    const occurrencesIndices = splitText
-      .map(includesCheck)
-
-    // calculate best index
-    let bestSum = 0
-    let bestIndex = 0
-    for (let i = 0; i < Math.max(occurrencesIndices.length - highlightWindow, 0); i++) {
-      const window = occurrencesIndices.slice(i, i + highlightWindow)
-      const windowSum = window.reduce((total, cur) => total + cur, 0)
-      if (windowSum >= bestSum) {
-        bestSum = windowSum
-        bestIndex = i
-      }
-    }
-
-    const startIndex = Math.max(bestIndex - highlightWindow, 0)
-    const endIndex = Math.min(startIndex + 2 * highlightWindow, splitText.length)
-    const mappedText = splitText
-      .slice(startIndex, endIndex)
-      .map(token => {
-        if (includesCheck(token)) {
-          return `<span class="search-highlight">${token}</span>`
-        }
-        return token
-      })
-      .join(" ")
-      .replaceAll('</span> <span class="search-highlight">', " ")
-    return `${startIndex === 0 ? "" : "..."}${mappedText}${endIndex === splitText.length ? "" : "..."}`
-  }
-
   const resultToHTML = ({ url, title, content, term }) => {
     const text = removeMarkdown(content)
     const resultTitle = highlight(title, term)
@@ -131,22 +152,29 @@ const removeMarkdown = (
   }
 
   const redir = (id, term) => {
-    window.location.href = BASE_URL + `${id}#:~:text=${encodeURIComponent(term)}`
+    // SPA navigation
+    window.navigate(
+      new URL(
+        `${BASE_URL.replace(/\/$/g, "")}${id}#:~:text=${encodeURIComponent(term)}/`
+      ),
+      '.singlePage'
+    )
+    closeSearch()
   }
 
-  const formatForDisplay = id => ({
+  const formatForDisplay = (id) => ({
     id,
     url: id,
     title: content[id].title,
-    content: content[id].content
+    content: content[id].content,
   })
 
   const source = document.getElementById('search-bar')
-  const results = document.getElementById("results-container")
+  const results = document.getElementById('results-container')
   let term
-  source.addEventListener("keyup", (e) => {
+  source.addEventListener('keyup', (e) => {
-    if (e.key === "Enter") {
+    if (e.key === 'Enter') {
-      const anchor = document.getElementsByClassName("result-card")[0]
+      const anchor = document.getElementsByClassName('result-card')[0]
       redir(anchor.id, term)
     }
   })
@@ -154,16 +182,16 @@ const removeMarkdown = (
     term = e.target.value
     const searchResults = contentIndex.search(term, [
       {
-        field: "content",
+        field: 'content',
         limit: 10,
       },
       {
-        field: "title",
+        field: 'title',
         limit: 5,
-      }
+      },
     ])
-    const getByField = field => {
+    const getByField = (field) => {
-      const results = searchResults.filter(x => x.field === field)
+      const results = searchResults.filter((x) => x.field === field)
       if (results.length === 0) {
         return []
       } else {
@@ -181,48 +209,52 @@ const removeMarkdown = (
                 </button>`
     } else {
       results.innerHTML = finalResults
-        .map(result => resultToHTML({
+        .map((result) =>
-          ...result,
+          resultToHTML({
-          term,
+            ...result,
-        }))
+            term,
-        .join("\n")
+          })
-      const anchors = document.getElementsByClassName("result-card");
+        )
-      [...anchors].forEach(anchor => {
+        .join('\n')
+      const anchors = [...document.getElementsByClassName('result-card')]
+      anchors.forEach((anchor) => {
         anchor.onclick = () => redir(anchor.id, term)
       })
     }
   })
 
-
+  const searchContainer = document.getElementById('search-container')
-  const searchContainer = document.getElementById("search-container")
 
   function openSearch() {
-    if (searchContainer.style.display === "none" || searchContainer.style.display === "") {
+    if (
-      source.value = ""
+      searchContainer.style.display === 'none' ||
-      results.innerHTML = ""
+      searchContainer.style.display === ''
-      searchContainer.style.display = "block"
+    ) {
+      source.value = ''
+      results.innerHTML = ''
+      searchContainer.style.display = 'block'
       source.focus()
     } else {
-      searchContainer.style.display = "none"
+      searchContainer.style.display = 'none'
     }
   }
 
   function closeSearch() {
-    searchContainer.style.display = "none"
+    searchContainer.style.display = 'none'
   }
 
   document.addEventListener('keydown', (event) => {
-    if (event.key === "k" && (event.ctrlKey || event.metaKey)) {
+    if (event.key === 'k' && (event.ctrlKey || event.metaKey)) {
       event.preventDefault()
       openSearch()
     }
-    if (event.key === "Escape") {
+    if (event.key === 'Escape') {
       event.preventDefault()
       closeSearch()
     }
   })
 
-  const searchButton = document.getElementById("search-icon")
+  const searchButton = document.getElementById('search-icon')
   searchButton.addEventListener('click', (evt) => {
     openSearch()
   })
@@ -232,8 +264,7 @@ const removeMarkdown = (
   searchContainer.addEventListener('click', (evt) => {
     closeSearch()
   })
-  document.getElementById("search-space").addEventListener('click', (evt) => {
+  document.getElementById('search-space').addEventListener('click', (evt) => {
     evt.stopPropagation()
   })
 })()
-

assets/styles/base.scss

@@ -12,6 +12,19 @@ h1, h2, h3, h4, h5, h6, ol, ul, thead {
   font-weight: revert;
   margin: revert;
   padding: revert;
+
+  &:hover > .hanchor {
+    opacity: 1;
+  }
+}
+
+.hanchor {
+  font-family: Inter;
+  margin-left: -1em;
+  opacity: 0.3;
+  transition: opacity 0.3s ease;
+  color: var(--secondary);
+
 }
 
 p, ul, text {
@@ -329,6 +342,13 @@ hr {
   & #graph-container {
     border: var(--outlinegray) 1px solid;
     border-radius: 5px;
+    box-sizing: border-box;
+    min-height: 250px;
+
+    & > svg {
+      margin-bottom: -5px;
+
+    }
   }
 }
 
@@ -421,7 +441,7 @@ header {
     }
 
     & > #results-container {
-      & > .result-card {
+      & .result-card {
         padding: 1em;
         cursor: pointer;
         transition: background 0.2s ease;
@@ -458,17 +478,17 @@ header {
         & > h3, & > p {
           margin: 0;
         }
-
-        & .search-highlight {
-          background-color: #afbfc966;
-          padding: 0.05em 0.2em;
-          border-radius: 3px;
-        }
       }
     }
   }
 }
 
+.search-highlight {
+  background-color: #afbfc966;
+  padding: 0.05em 0.2em;
+  border-radius: 3px;
+}
+
 .section-ul {
   list-style: none;
   padding-left: 0;
@@ -526,7 +546,7 @@ header {
   box-shadow: 6px 6px 36px 0px rgba(0,0,0,0.25);
 
   @media all and (max-width: 600px) {
-    display: none;
+    display: none !important;
   }
 
   &.visible {
@@ -549,7 +569,7 @@ header {
     font-size: 0.8rem;
   }
 
-  & > p {
+  & > p, & > a {
     margin: 0;
     font-weight: 400;
     user-select: none;

layouts/_default/_markup/render-link.html

@@ -7,7 +7,7 @@
 {{$spacedurl := replace $trimmed "%20" " " }}
 {{$fixedUrl := (cond (hasPrefix $spacedurl "/") $spacedurl (print "/" $spacedurl)) | urlize}}
 {{$nonexistent := eq (.Page.GetPage $spacedurl).RelPermalink ""}}
-{{$rooted := default $spacedurl (strings.TrimRight "/" (.Page.GetPage $spacedurl).RelPermalink) }}
+{{$rooted := default $spacedurl ((.Page.GetPage $spacedurl).RelPermalink) }}
 <a
   {{if not $nonexistent}}href="{{$rooted}}"{{end}}
   rel="noopener" class="internal-link{{if $nonexistent}} broken{{end}}"

layouts/_default/section.html

@@ -19,7 +19,6 @@
     </article>
     {{partial "contact.html" .}}
 </div>
-{{partial "popover.html" .}}
 </body>
 
 </html>

layouts/_default/single.html

@@ -26,7 +26,6 @@
       {{partial "textprocessing.html" . }}
     </article>
     {{partial "footer.html" .}}
-    {{partial "popover.html" .}}
 </div>
 </body>
 

layouts/_default/taxonomy.html

@@ -28,7 +28,6 @@
     </article>
     {{partial "contact.html" .}}
 </div>
-{{partial "popover.html" .}}
 </body>
 
 </html>

layouts/_default/term.html

@@ -19,7 +19,6 @@
     </article>
     {{partial "contact.html" .}}
 </div>
-{{partial "popover.html" .}}
 </body>
 
 </html>

layouts/index.html

@@ -17,8 +17,6 @@
         {{partial "textprocessing.html" . }}
     </article>
     {{partial "footer.html" .}}
-    {{partial "popover.html" .}}
 </div>
 </body>
 </html>
-

layouts/partials/backlinks.html

@@ -7,12 +7,18 @@
     {{$inbound := index $linkIndex.index.backlinks $curPage}}
     {{$contentTable := getJSON "/assets/indices/contentIndex.json"}}
     {{if $inbound}}
-    {{$cleanedInbound := apply (apply $inbound "index" "." "source") "replace" "." " " "-"}}
+    {{$backlinks := dict "SENTINEL" "SENTINEL"}}
-    {{- range $cleanedInbound | uniq -}}
+    {{range $k, $v := $inbound}}
-      {{$l := printf "%s%s" $host .}}
+      {{$cleanedInbound := replace $v.source " " "-"}}
-      {{with (index $contentTable .)}}
+      {{$ctx := $v.text}}
+      {{$backlinks = merge $backlinks (dict $cleanedInbound $ctx)}}
+    {{end}}
+    {{- range $lnk, $ctx := $backlinks -}}
+      {{$l := printf "%s%s/" $host $lnk}}
+      {{$l = cond (eq $l "//") "/" $l}}
+      {{with (index $contentTable $lnk)}}
       <li>
-          <a href="{{$l}}">{{index (index . "title")}}</a>
+        <a href="{{$l}}" data-ctx="{{$ctx}}" data-src="{{$lnk}}" class="internal-link">{{index (index . "title")}}</a>
       </li>
       {{end}}
     {{- end -}}

layouts/partials/graph.html

@@ -1,25 +1,18 @@
-<script src="https://cdn.jsdelivr.net/npm/d3@6.7.0/dist/d3.min.js" integrity="sha256-+7jaYCp29O1JusNWHaYtgUn6EhuP0VaFuswhNV06MyI=" crossorigin="anonymous"></script>
+<script
+  src="https://cdn.jsdelivr.net/npm/d3@6.7.0/dist/d3.min.js"
+  integrity="sha256-+7jaYCp29O1JusNWHaYtgUn6EhuP0VaFuswhNV06MyI="
+  crossorigin="anonymous"
+></script>
 <h3>Interactive Graph</h3>
 <div id="graph-container"></div>
 <style>
-    :root {
+  :root {
-        --g-node: var(--secondary);
+    --g-node: var(--secondary);
-        --g-node-active: var(--primary);
+    --g-node-active: var(--primary);
-        --g-node-inactive: var(--visited);
+    --g-node-inactive: var(--visited);
-        --g-link: var(--outlinegray);
+    --g-link: var(--outlinegray);
-        --g-link-active: #5a7282;
+    --g-link-active: #5a7282;
-    }
+  }
 </style>
 {{ $js := resources.Get "js/graph.js" | resources.Fingerprint "md5" }}
 <script src="{{ $js.Permalink }}"></script>
-<script>
-  drawGraph(
-    {{strings.TrimRight "/" .Page.Permalink}},
-    {{strings.TrimRight "/" .Site.BaseURL}},
-    {{$.Site.Data.graphConfig.paths}},
-    {{$.Site.Data.graphConfig.depth}},
-    {{$.Site.Data.graphConfig.enableDrag}},
-    {{$.Site.Data.graphConfig.enableLegend}},
-    {{$.Site.Data.graphConfig.enableZoom}}
-  )
-</script>

layouts/partials/head.html

@@ -1,46 +1,110 @@
 <head>
-    <!-- Meta tags -->
+  <!-- Meta tags -->
-    <meta charset="UTF-8">
+  <meta charset="UTF-8" />
-    <meta name="description" content="{{if .IsHome}}{{$.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}">
+  <meta
-    <title>{{ if .Title }}{{ .Title }}{{ else }}{{ $.Site.Data.config.page_title }}{{ end }}</title>
+    name="description"
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    content="{{if .IsHome}}{{$.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}"
-  <link rel="shortcut icon" type="image/png" href="{{$.Site.BaseURL}}/icon.png" />
+  />
+  <title>
+    {{ if .Title }}{{ .Title }}{{ else }}{{ $.Site.Data.config.page_title }}{{
+    end }}
+  </title>
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <link
+    rel="shortcut icon"
+    type="image/png"
+    href="{{$.Site.BaseURL}}/icon.png"
+  />
 
-    <!-- CSS Stylesheets and Fonts -->
+  <!-- CSS Stylesheets and Fonts -->
-    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&family=Source+Sans+Pro:wght@400;600;700&family=Fira+Code:wght@400;700&display=swap" rel="stylesheet">
+  <link
-    {{$sass := resources.Match "styles/[!_]*.scss" }}
+    href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&family=Source+Sans+Pro:wght@400;600;700&family=Fira+Code:wght@400;700&display=swap"
-    {{$css := slice }}
+    rel="stylesheet"
-    {{range $sass}}
+  />
-    {{$scss := . | resources.ToCSS (dict "outputStyle" "compressed") }}
+  {{$sass := resources.Match "styles/[!_]*.scss" }}
-    {{$css = $css | append $scss}}
+  {{$css := slice }}
-    {{end}}
+  {{range $sass}}
-    {{$finalCss := $css | resources.Concat "styles.css" | resources.Fingerprint "md5" | resources.Minify  }}
+  {{$scss := . | resources.ToCSS (dict "outputStyle" "compressed") }}
-    <link href="{{$finalCss.Permalink}}" rel="stylesheet">
+  {{$css = $css | append $scss}}
+  {{end}}
+  {{$finalCss := $css | resources.Concat "styles.css" | resources.Fingerprint "md5" | resources.Minify  }}
+  <link href="{{$finalCss.Permalink}}" rel="stylesheet" />
 
-    {{ $darkMode := resources.Get "js/darkmode.js" |  resources.Fingerprint "md5" | resources.Minify }}
+  {{ $darkMode := resources.Get "js/darkmode.js" | resources.Fingerprint "md5" |
-    <script src="{{$darkMode.Permalink}}"></script>
+  resources.Minify }}
-    {{partial "katex.html" .}}
+  <script src="{{$darkMode.Permalink}}"></script>
+  {{partial "katex.html" .}}
 
-    <!--  Preload page vars  -->
+  {{ $popover := resources.Get "js/popover.js" | resources.Fingerprint "md5" |
-    {{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint "md5" | resources.Minify |  }}
+  resources.Minify }}
-    {{$contentIndex := resources.Get "indices/contentIndex.json" | resources.Fingerprint "md5" | resources.Minify }}
+  <script src="{{$popover.Permalink}}"></script>
-    <script>
+
-      const BASE_URL = {{.Site.BaseURL}}
+  <!--  Preload page vars  -->
-      const fetchData = Promise.all([
+  {{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint
-            fetch("{{ $linkIndex.Permalink }}")
+  "md5" | resources.Minify | }} {{$contentIndex := resources.Get
-              .then(data => data.json())
+  "indices/contentIndex.json" | resources.Fingerprint "md5" | resources.Minify
-              .then(data => ({
+  }}
-                index: data.index,
+  <script>
-                links: data.links,
+    const BASE_URL = {{.Site.BaseURL}}
-              })),
+    const fetchData = Promise.all([
-            fetch("{{ $contentIndex.Permalink }}")
+          fetch("{{ $linkIndex.Permalink }}")
-              .then(data => data.json()),
+            .then(data => data.json())
-          ])
+            .then(data => ({
-          .then(([{index, links}, content]) => ({
+              index: data.index,
-            index,
+              links: data.links,
-            links,
+            })),
-            content,
+          fetch("{{ $contentIndex.Permalink }}")
-          }))
+            .then(data => data.json()),
-    </script>
+        ])
+        .then(([{index, links}, content]) => ({
+          index,
+          links,
+          content,
+        }))
+  </script>
+  {{if $.Site.Data.config.enableSPA}}
+  {{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" |
+  resources.Minify }}
+  <script type="module">
+    import { attachSPARouting } from '{{$router.Permalink}}';
+    // NOTE: everything within this callback will be executed for every page navigation. This is a good place to put JavaScript that loads or modifies data on the page.
+    const draw = () => {
+      const container = document.getElementById("graph-container")
+      // retry if the graph is not ready
+      if (!container) return requestAnimationFrame(draw)
+      // clear the graph in case there is anything within it
+      container.textContent = ""
+
+      drawGraph(
+        {{strings.TrimRight "/" .Site.BaseURL}},
+        {{$.Site.Data.graphConfig.paths}},
+        {{$.Site.Data.graphConfig.depth}},
+        {{$.Site.Data.graphConfig.enableDrag}},
+        {{$.Site.Data.graphConfig.enableLegend}},
+        {{$.Site.Data.graphConfig.enableZoom}}
+      );
+
+      {{if $.Site.Data.config.enableLinkPreview}}
+      initPopover(
+        {{strings.TrimRight "/" .Site.BaseURL }},
+        {{$.Site.Data.config.enableContextualBacklinks}},
+        {{$.Site.Data.config.enableLatex}}
+      )
+      {{end}}
+      {{if $.Site.Data.config.enableLatex}}
+      renderMathInElement(document.body, {
+        delimiters: [
+          {left: '$$', right: '$$', display: true},
+          {left: '$', right: '$', display: false},
+        ],
+        throwOnError : false
+      });
+      {{end}}
+    };
+    attachSPARouting(draw);
+  </script>
+  {{else}}
+  <script>window.navigate = (url) => window.location.href = url</script>
+  {{end}}
 </head>
 {{ template "_internal/google_analytics.html" . }}

layouts/partials/katex.html

@@ -2,15 +2,4 @@
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/katex.min.css" integrity="sha384-R4558gYOUz8mP9YWpZJjofhk+zx0AS11p36HnD2ZKj/6JR5z27gSSULCNHIRReVs" crossorigin="anonymous">
 <script defer src="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/katex.min.js" integrity="sha384-z1fJDqw8ZApjGO3/unPWUPsIymfsJmyrDVWC8Tv/a1HeOtGmkwNd/7xUS0Xcnvsx" crossorigin="anonymous"></script>
 <script defer src="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/contrib/auto-render.min.js" integrity="sha384-+XBljXPPiv+OzfbB3cVmLHf4hdUFHlWNZN5spNQ7rmHTXpd7WvJum6fIACpNNfIR" crossorigin="anonymous"></script>
-<script>
-  document.addEventListener("DOMContentLoaded", function() {
-    renderMathInElement(document.body, {
-      delimiters: [
-        {left: '$$', right: '$$', display: true},
-        {left: '$', right: '$', display: false},
-      ],
-      throwOnError : false
-    });
-  });
-</script>
 {{end}}

layouts/partials/popover.html

@@ -1,7 +0,0 @@
-{{if $.Site.Data.config.enableLinkPreview}}
-{{ $js := resources.Get "js/popover.js" |  resources.Fingerprint "md5" | resources.Minify }}
-<script src="{{ $js.Permalink }}"></script>
-<script>
-  initPopover({{strings.TrimRight "/" .Site.BaseURL }})
-</script>
-{{end}}

layouts/partials/textprocessing.html

@@ -53,4 +53,8 @@
     {{end}}
   {{end}}
 {{end}}
+
+{{/* Add copyable anchors */}}
+{{ $content = $content | replaceRE "(<h[1-9] id=\"([^\"]+)\">)(.+)(</h[1-9]>)" `<a href="#${2}">${1}<span class="hanchor" ariaLabel="Anchor"># </span>${3}${4}</a>` }}
+
 {{ $content | safeHTML }}