5 files changed, 38 insertions, 31 deletions
diff --git a/src/data/_base.typ b/src/data/_base.typ
new file mode 100644
index 0000000..fa5b362
--- /dev/null
+++ b/src/data/_base.typ
@@ -0,0 +1,14 @@
+#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/test_content_1.typ b/src/data/test_content_1.typ
index 3adf59a..e2f21a5 100644
--- a/src/data/test_content_1.typ
+++ b/src/data/test_content_1.typ
@@ -1,12 +1,5 @@
-#set page(
-  fill: none, 
-  margin: 2pt,
-);
+#import "_base.typ": *
 
-#let display(body) = context {
-  let m = measure(body)
-  set page(width: m.width + page.margin.length*2, height: m.height + page.margin.length*2)
-  body
-}
+#show: display.with() 
 
-#display()[$x$]
+$text("Adwaita Mono") x$
diff --git a/src/data/test_content_2.typ b/src/data/test_content_2.typ
index db02163..47666a8 100644
--- a/src/data/test_content_2.typ
+++ b/src/data/test_content_2.typ
@@ -1,12 +1,5 @@
-#set page(
-  fill: none, 
-  margin: 2pt,
-);
+#import "_base.typ": *
 
-#let display(body) = context {
-  let m = measure(body)
-  set page(width: m.width + page.margin.length*2, height: m.height + page.margin.length*2)
-  body
-}
+#show: display.with() 
 
-#display()[$x^2$]
+$x^2$
diff --git a/src/eval/template_math_block.typ b/src/eval/template_math_block.typ
index 3d5891a..ecadae1 100644
--- a/src/eval/template_math_block.typ
+++ b/src/eval/template_math_block.typ
@@ -1,11 +1,15 @@
-#set page(
-  fill: none, 
-  margin: 2pt,
-);
+#show math.equation: set text(font: "New Computer Modern Math")
+#show math.text: set text(font: "New Computer Modern")
 
 #let display(body) = context {
+  let margin = 2pt
   let m = measure(body)
-  set page(width: m.width + page.margin.length*2, height: m.height + page.margin.length*2)
+  set page(
+    fill: none,
+    margin: margin,
+    width: m.width + margin*2, 
+    height: m.height + margin*2,
+  )
   body
 }
 
diff --git a/src/eval/template_math_content.typ b/src/eval/template_math_content.typ
index 03732af..cd31ef6 100644
--- a/src/eval/template_math_content.typ
+++ b/src/eval/template_math_content.typ
@@ -1,11 +1,14 @@
-#set page(
-  fill: none, 
-  margin: 2pt,
-);
-
 #let display(body) = context {
+  show math.equation: set text(font: "New Computer Modern Math")
+
+  let margin = 2pt
   let m = measure(body)
-  set page(width: m.width + page.margin.length*2, height: m.height + page.margin.length*2)
+  set page(
+    fill: none,
+    margin: margin,
+    width: m.width + margin*2, 
+    height: m.height + margin*2,
+  )
   body
 }