refactor(typst): generalize template

14 files changed, 33 insertions, 29 deletions

diff --git a/src/data/_base.typ b/src/data/_base.typ
deleted file mode 100644
index fa5b362..0000000
--- a/src/data/_base.typ
+++ /dev/null
@@ -1,14 +0,0 @@
-#let display(body) = context {
-  show math.equation: set text(font: "New Computer Modern Math")
-  show math.text: set text(font: "New Computer Modern")
-
-  let margin = 4pt
-  let m = measure(body)
-  set page(
-    fill: none,
-    margin: margin,
-    width: m.width + margin*2, 
-    height: m.height + margin*2,
-  )
-  body
-}
diff --git a/src/data/_template.typ b/src/data/_template.typ
new file mode 120000
index 0000000..7b99414
--- /dev/null
+++ b/src/data/_template.typ
@@ -0,0 +1 @@
+../eval/template.typ
\ No newline at end of file
diff --git a/src/data/_template_block.typ b/src/data/_template_block.typ
new file mode 120000
index 0000000..612a278
--- /dev/null
+++ b/src/data/_template_block.typ
@@ -0,0 +1 @@
+../eval/template_block.typ
\ No newline at end of file
diff --git a/src/data/_template_content.typ b/src/data/_template_content.typ
new file mode 120000
index 0000000..3e91e8c
--- /dev/null
+++ b/src/data/_template_content.typ
@@ -0,0 +1 @@
+../eval/template_content.typ
\ No newline at end of file
diff --git a/src/data/block_1.typ b/src/data/block_1.typ
new file mode 100644
index 0000000..7b55cff
--- /dev/null
+++ b/src/data/block_1.typ
@@ -0,0 +1,6 @@
+#import "_template.typ": *
+#import "_template_block.typ": *
+
+#show: display.with(param)
+
+$ x $
diff --git a/src/data/block_2.typ b/src/data/block_2.typ
new file mode 100644
index 0000000..b80d056
--- /dev/null
+++ b/src/data/block_2.typ
@@ -0,0 +1,6 @@
+#import "_template.typ": *
+#import "_template_block.typ": *
+
+#show: display.with(param)
+
+$ x^2 $
diff --git a/src/data/block_3.typ b/src/data/block_3.typ
new file mode 100644
index 0000000..4c85a2b
--- /dev/null
+++ b/src/data/block_3.typ
@@ -0,0 +1,6 @@
+#import "_template.typ": *
+#import "_template_block.typ": *
+
+#show: display.with(param)
+
+$ forall x in RR, quad f(x) = x^2 $
diff --git a/src/data/content_1.typ b/src/data/content_1.typ
new file mode 100644
index 0000000..edfec83
--- /dev/null
+++ b/src/data/content_1.typ
@@ -0,0 +1,6 @@
+#import "_template.typ": *
+#import "_template_content.typ": *
+
+#show: display.with(param)
+
+$x$
diff --git a/src/data/content_2.typ b/src/data/content_2.typ
new file mode 100644
index 0000000..01d3a56
--- /dev/null
+++ b/src/data/content_2.typ
@@ -0,0 +1,6 @@
+#import "_template.typ": *
+#import "_template_content.typ": *
+
+#show: display.with(param)
+
+$x^2$
diff --git a/src/data/test_block_1.typ b/src/data/test_block_1.typ
deleted file mode 100644
index 582ab60..0000000
--- a/src/data/test_block_1.typ
+++ /dev/null
@@ -1,3 +0,0 @@
-#import "_base.typ": *
-
-#display[$ x $]
diff --git a/src/data/test_block_2.typ b/src/data/test_block_2.typ
deleted file mode 100644
index cce19c2..0000000
--- a/src/data/test_block_2.typ
+++ /dev/null
@@ -1,3 +0,0 @@
-#import "_base.typ": *
-
-#display[$ x^2 $]
diff --git a/src/data/test_block_3.typ b/src/data/test_block_3.typ
deleted file mode 100644
index 04dae08..0000000
--- a/src/data/test_block_3.typ
+++ /dev/null
@@ -1,3 +0,0 @@
-#import "_base.typ": *
-
-#display[$ forall x in RR, quad f(x) = x^2 $]
diff --git a/src/data/test_content_1.typ b/src/data/test_content_1.typ
deleted file mode 100644
index 171e00b..0000000
--- a/src/data/test_content_1.typ
+++ /dev/null
@@ -1,3 +0,0 @@
-#import "_base.typ": *
-
-#display[$x$]
diff --git a/src/data/test_content_2.typ b/src/data/test_content_2.typ
deleted file mode 100644
index a126a0c..0000000
--- a/src/data/test_content_2.typ
+++ /dev/null
@@ -1,3 +0,0 @@
-#import "_base.typ": *
-
-#display[$x^2$]