Main context struct

2 files changed, 8 insertions, 6 deletions

diff --git a/src/exec/context.rs b/src/exec/context.rs
index 04c0169d..925fd7de 100644
--- a/src/exec/context.rs
+++ b/src/exec/context.rs
@@ -10,6 +10,7 @@ use crate::layout::{
     LayoutNode, LayoutTree, PadNode, PageRun, ParChild, ParNode, StackChild, StackNode,
 };
 use crate::syntax::{Span, SyntaxTree};
+use crate::Context;
 
 /// The context for execution.
 pub struct ExecContext {
@@ -28,13 +29,13 @@ pub struct ExecContext {
 
 impl ExecContext {
     /// Create a new execution context with a base state.
-    pub fn new(state: State) -> Self {
+    pub fn new(ctx: &mut Context) -> Self {
         Self {
+            state: ctx.state.clone(),
             diags: DiagSet::new(),
             tree: LayoutTree { runs: vec![] },
-            page: Some(PageBuilder::new(&state, true)),
-            stack: StackBuilder::new(&state),
-            state,
+            page: Some(PageBuilder::new(&ctx.state, true)),
+            stack: StackBuilder::new(&ctx.state),
         }
     }
 
diff --git a/src/exec/mod.rs b/src/exec/mod.rs
index 752bdba5..d61e0793 100644
--- a/src/exec/mod.rs
+++ b/src/exec/mod.rs
@@ -16,10 +16,11 @@ use crate::geom::{Dir, Gen};
 use crate::layout::{LayoutTree, StackChild, StackNode};
 use crate::pretty::pretty;
 use crate::syntax::*;
+use crate::Context;
 
 /// Execute a template to produce a layout tree.
-pub fn exec(template: &Template, state: State) -> Pass<LayoutTree> {
-    let mut ctx = ExecContext::new(state);
+pub fn exec(ctx: &mut Context, template: &Template) -> Pass<LayoutTree> {
+    let mut ctx = ExecContext::new(ctx);
     template.exec(&mut ctx);
     ctx.finish()
 }