From 39f5d33b090383a0a257c74ec02c0b887d5f19ab Mon Sep 17 00:00:00 2001
From: Maxime Cannoodt <Maxime.Cannoodt@UGent.be>
Date: Sat, 25 Jun 2022 10:25:30 +0200
Subject: [PATCH] inline tokenizer

---
 server/prisma/dev.db                          | Bin 139264 -> 143360 bytes
 webapp/src/lib/components/CalloutIcon.svelte  |   2 --
 .../lib/components/MarkdownRenderer.svelte    |   4 ++-
 webapp/src/lib/marked/extensions.ts           |  30 +++++++++++++++++-
 .../lib/marked/renderers/MathInline.svelte    |   5 +++
 5 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 webapp/src/lib/marked/renderers/MathInline.svelte

diff --git a/server/prisma/dev.db b/server/prisma/dev.db
index 204dccd96e5ca92c668d3b9a273e6f52f75526bd..0cc4d75c228c6b205a14a8e1cabff6a2f6d42e3b 100644
GIT binary patch
delta 1488
zcmZ{kyRX}H6vyvvRa&^cEr<~zAxa;ThuFX0&-Ty5rAnOmkvMUlj*|i5_cO5*$4=}e
zy%faI1yq)f6^MzY>d+Mlu`(dBB4!qb{sW|<P$9v3zQZ}6qt7|_zQ1zsw<}+~a|s<C
z9o_iyy}QTg$;aO$SKhw<_)s{y@$hQ;!G-IOpPYYp;pwmIAFf_H6yLx3@Z0@I7jK?C
zdU*L>>$Q_#PM)1SdivIz;>rBoi+7K$7;WMz+qfiv9EUaqwE`u%S;cq$PNRGY8Ir{K
zMT&#OLRA*t{wGb=y9G(I^oum!IN07r@Yen351u`LaD4jJwbR207f+6lt`R4{pBx|h
zK7V6>?%uh4_tGb)=coVM{rLRRA3uIQ0YYYrTBK7P6OMDP)7j8U%ad0Uy9{(m(`ymv
z){#>UPz(DmNRzTFF|nko?N(n%d*f!yDudMmVILQDVZA2v8n*UAUX=t9s61oz0>>}5
zUVBv@_-h-M2n(?bGit|gGhH_!he^(YG(O<D49yu9jTpzUOp1Y+HGt(H3M1Nt4l*Hz
zmg^XRWmt!$Ocrv`{`AA!2hz{a{vv(3$^E}qc|iSnXTCxuHj|pjQjw|YTd#`pK|W)=
zU97h@X=VhO9lNN_BpX7ARZ27#x{v0w?to|1NK%?LmR3xYWQme!b<~y;dnT+8iCmjE
zvrfHXw%5A5Uk0hqn|dDzvqsHsG#3_}El`M+(qXHiEek@Kv?{+{O)E*#Mj~FU<0(Z)
zyGFel<#UbEy^wD#$17Nd<{CKjewjyx5mVjvCMl^Z821as)TipSwwrAeCa~N6EisO5
zZ1>pube}4I1$?R*yA_{{u&K#qqtC;r;0t0poQEnW$a5}*<swc9wli4>bXb>VS>WiJ
z)G~_@6H&HmZ#~vurPB%LR$<sn8i}FWtkx^JRl1s&zQ7jpG^T+fDnU2eGPdOi+SVn~
z{cN2{CN1Zzq;}go)Y+Q$z!6qMyjp?j#G|&#6fQ@*CT!4w$nXhYifgyNb4gs%h^q~p
zaMS5~Q3zXsm;<kJq|wOF*HS%*qXoc`UdTloP00@5X%EiMAY)?Iqzuc#qzx>4Z_uU<
z9f}430bo)bOC#GbNWd|MLplJE6b+GMVhnB8vMhLic<W%%XU<ED{_Eln68+Q(UrAI;
zv$2|uyZVTkXob_*%2k<~Nt%kGx_1JRGdx1EJMH1HgljYyvaGWuJ>Oo<0@vDf=zK~I
zGHS5t3tfF)8jYUcW_f{?CVj}~L{e+0X%At*RiYLvBi>3UQQWl0l_zlCDASqDpN;#u
zfkIDd&KK+5a%<;4y<zlPbG+ZV$THSJBNS?I8I%IW7c4UjRcT8uD3ZtGR*_teuy8MN
zIeFM?3NSBwS!NIUYB2Bdq(`EPmb#He_8ZFutk31~RMp~?wiS;#*zCb(l+37t=ni&c
zO*V4R9v20Y`Bjiiv;Ayf%~*y;q@M;+pkYx%9wm>`2>?!SJafBib?cNC)5EIPY^J`l
z1G{<B3g%80)H;abT?LQ=dB#yJrV-{S7g`pFA!R|Ewm6q04Hs|#95UK4nZtK*P1?0M
RfRKxj^*T*smb4Kt{sfeV-kJaa

delta 75
zcmV-R0JQ&r;0S=g2#^~EF#rGnB9S0J0Wq;)q;Cik52gSB001JB3~(f|fvy6x-g3hX
hlMs0Ylcs-O10oCalLvrBvk?%d3xo5ExAThu4U~5_8R-B3

diff --git a/webapp/src/lib/components/CalloutIcon.svelte b/webapp/src/lib/components/CalloutIcon.svelte
index 840e822..dbb4da8 100644
--- a/webapp/src/lib/components/CalloutIcon.svelte
+++ b/webapp/src/lib/components/CalloutIcon.svelte
@@ -13,8 +13,6 @@
 	import BugIcon from 'svelte-icons/md/MdBugReport.svelte';
 	import QuoteIcon from 'svelte-icons/md/MdFormatQuote.svelte';
 	export let icon: string;
-
-	console.log(icon);
 </script>
 
 {#if icon == 'note'}
diff --git a/webapp/src/lib/components/MarkdownRenderer.svelte b/webapp/src/lib/components/MarkdownRenderer.svelte
index dd5e6c1..56fb39e 100644
--- a/webapp/src/lib/components/MarkdownRenderer.svelte
+++ b/webapp/src/lib/components/MarkdownRenderer.svelte
@@ -10,6 +10,7 @@
 	import Highlight from '$lib/marked/renderers/Highlight.svelte';
 	import InternalEmbed from '$lib/marked/renderers/InternalEmbed.svelte';
 	import Blockquote from '$lib/marked/renderers/Blockquote.svelte';
+	import MathInline from '$lib/marked/renderers/MathInline.svelte';
 
 	export let plaintext: string;
 
@@ -34,7 +35,8 @@ prose-blockquote:first:before:content-['']"
 			'internal-embed': InternalEmbed,
 			tag: Tag,
 			highlight: Highlight,
-			blockquote: Blockquote
+			blockquote: Blockquote,
+			'math-inline': MathInline
 		}}
 		source={plaintext}
 		{options}
diff --git a/webapp/src/lib/marked/extensions.ts b/webapp/src/lib/marked/extensions.ts
index 55620a9..aea20f6 100644
--- a/webapp/src/lib/marked/extensions.ts
+++ b/webapp/src/lib/marked/extensions.ts
@@ -59,6 +59,7 @@ const HighlightExtension = {
 	name: 'highlight',
 	level: 'inline',
 	start(src: string) {
+		// console.log(src);
 		return src.match(/==/)?.index;
 	},
 	tokenizer(src: string) {
@@ -74,6 +75,33 @@ const HighlightExtension = {
 	}
 };
 
-export default [InternalLinkExtension, InternalEmbedExtension, TagExtension, HighlightExtension];
+const MathInline = {
+	name: 'math-inline',
+	level: 'inline',
+	start(src: string) {
+		return src.indexOf('$');
+	},
+
+	tokenizer(src: string) {
+		const match = src.match(/^(\${1})((?:\\.|.)*)\1/);
+		console.log(src, match);
+		if (match) {
+			return {
+				type: 'math-inline',
+				raw: match[0],
+				text: match[2].trim()
+			};
+		}
+		return false;
+	}
+};
+
+export default [
+	InternalLinkExtension,
+	InternalEmbedExtension,
+	TagExtension,
+	HighlightExtension,
+	MathInline
+];
 
 // ^\#([\w\/]+)\W*
diff --git a/webapp/src/lib/marked/renderers/MathInline.svelte b/webapp/src/lib/marked/renderers/MathInline.svelte
new file mode 100644
index 0000000..52dd2e6
--- /dev/null
+++ b/webapp/src/lib/marked/renderers/MathInline.svelte
@@ -0,0 +1,5 @@
+<script lang="ts">
+	export let text: string;
+</script>
+
+<span>{text}</span>