From fbfcb2eb22cc4a95e4b85bba025961b86dcfa2c2 Mon Sep 17 00:00:00 2001
From: Han-Miru Kim <hanmiru.kim@gmail.com>
Date: Thu, 21 Nov 2024 23:54:54 +0100
Subject: [PATCH 1/3] fix inlineMathTemplate

---
 projects/rehype-typst/lib/index.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/projects/rehype-typst/lib/index.js b/projects/rehype-typst/lib/index.js
index bae6358e..b81c8a4d 100644
--- a/projects/rehype-typst/lib/index.js
+++ b/projects/rehype-typst/lib/index.js
@@ -162,9 +162,10 @@ async function renderToSVGString_($typst, code, displayMode) {
 
 #let s = state("t", (:))
 
-#let pin(t) = locate(loc => {
-  style(styles => s.update(it => it.insert(t, measure(line(length: loc.position().y + 0.25em), styles).width) + it))
-})
+#let pin(t) = context {
+  let width = measure(line(length: here().position().y + 0.25em)).width
+  s.update(it => it.insert(t, width) + it)
+}
 
 #show math.equation: it => {
   box(it, inset: (top: 0.5em, bottom: 0.5em))
@@ -172,9 +173,9 @@ async function renderToSVGString_($typst, code, displayMode) {
 
 $pin("l1")${code}$
 
-#locate(loc => [
-  #metadata(s.final(loc).at("l1")) <label>
-])
+#context [
+  #metadata(s.final().at("l1")) <label>
+]
 `;
   const displayMathTemplate = `
 #set page(height: auto, width: auto, margin: 0pt)

From cea3add01d6742a52671868160d3c840f445047b Mon Sep 17 00:00:00 2001
From: Han-Miru Kim <hanmiru.kim@gmail.com>
Date: Fri, 22 Nov 2024 00:03:43 +0100
Subject: [PATCH 2/3] line up baseline for inline-math

---
 projects/rehype-typst/lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/rehype-typst/lib/index.js b/projects/rehype-typst/lib/index.js
index b81c8a4d..f91955d4 100644
--- a/projects/rehype-typst/lib/index.js
+++ b/projects/rehype-typst/lib/index.js
@@ -113,7 +113,7 @@ export default function rehypeTypst(options) {
         const defaultEm = 11;
         const height = parseFloat(root.children[0].properties['dataHeight']);
         const width = parseFloat(root.children[0].properties['dataWidth']);
-        const shift = height - result.baselinePosition;
+        const shift = height - result.baselinePosition + 2.8; /* line up baselines */
         const shiftEm = shift / defaultEm;
         root.children[0].properties.style = `vertical-align: -${shiftEm}em;`;
         root.children[0].properties.height = `${height / defaultEm}em`;

From 450a4f1d390bc3c4a7678d02894a8118d46aef69 Mon Sep 17 00:00:00 2001
From: mgt <mgt@oi-wiki.org>
Date: Wed, 11 Dec 2024 00:10:10 +0800
Subject: [PATCH 3/3] fix template

---
 projects/rehype-typst/equation.typ | 26 ++++++++++++++------------
 projects/rehype-typst/lib/index.js |  4 ++--
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/projects/rehype-typst/equation.typ b/projects/rehype-typst/equation.typ
index 0ae2baa7..68efcda5 100644
--- a/projects/rehype-typst/equation.typ
+++ b/projects/rehype-typst/equation.typ
@@ -2,22 +2,24 @@
 
 #let s = state("t", (:))
 
-#let pin(t) = locate(loc => {
-  style(styles => s.update(it => it.insert(t, measure(line(length: loc.position().y + 0.25em), styles).width) + it))
-})
+#let pin(t) = context {
+  let width = measure(line(length: here().position().y)).width
+  s.update(it => it.insert(t, width) + it)
+}
 
 #show math.equation: it => {
   box(it, inset: (top: 0.5em, bottom: 0.5em))
 }
 
-$pin("l1")1+e/sqrt(sqrt(a/c)/(e + c +a/b))$
+$pin("l1")1+(e vec(a,b,c)) / sqrt(sqrt(a/c)/(e + c +a/b)/e)$ 123
+
+#context [
+  #metadata(s.final().at("l1")) <label>
+]
 
-#locate(loc => [
-  #metadata(s.final(loc).at("l1")) <label>
-])
+// #context s.get()
 
-// #s.display()
-// #locate(loc => {
-//   let s = s.final(loc)
-//   place(left+top, dx: 0pt, dy: s.l1, line(length: 100pt, stroke: red + 0.1pt))
-// })
+#context {
+  let s = s.final()
+  place(left + top, dx: 0pt, dy: s.l1, line(length: 100pt, stroke: red + 0.1pt))
+}
diff --git a/projects/rehype-typst/lib/index.js b/projects/rehype-typst/lib/index.js
index f91955d4..bfb4aaa4 100644
--- a/projects/rehype-typst/lib/index.js
+++ b/projects/rehype-typst/lib/index.js
@@ -113,7 +113,7 @@ export default function rehypeTypst(options) {
         const defaultEm = 11;
         const height = parseFloat(root.children[0].properties['dataHeight']);
         const width = parseFloat(root.children[0].properties['dataWidth']);
-        const shift = height - result.baselinePosition + 2.8; /* line up baselines */
+        const shift = height - result.baselinePosition;
         const shiftEm = shift / defaultEm;
         root.children[0].properties.style = `vertical-align: -${shiftEm}em;`;
         root.children[0].properties.height = `${height / defaultEm}em`;
@@ -163,7 +163,7 @@ async function renderToSVGString_($typst, code, displayMode) {
 #let s = state("t", (:))
 
 #let pin(t) = context {
-  let width = measure(line(length: here().position().y + 0.25em)).width
+  let width = measure(line(length: here().position().y)).width
   s.update(it => it.insert(t, width) + it)
 }