From c3acb491e38d333acff6897479f7dd9c86fba307 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Fri, 12 Mar 2021 14:16:59 +0100
Subject: =?UTF-8?q?Refactor=20execution=20context=20=F0=9F=8F=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- The execution context is a lot more structured: Instead of a magic stack of arbitrary objects there are static objects for pages, stacks and paragraphs
- Page softness/keeping mechanic is now a lot simpler than before
---
 src/exec/mod.rs | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'src/exec/mod.rs')

diff --git a/src/exec/mod.rs b/src/exec/mod.rs
index 58b5cdc0..45abca02 100644
--- a/src/exec/mod.rs
+++ b/src/exec/mod.rs
@@ -31,12 +31,19 @@ pub fn exec(
     state: State,
 ) -> Pass<layout::Tree> {
     let mut ctx = ExecContext::new(env, state);
-    ctx.start_page_group(Softness::Hard);
     tree.exec_with_map(&mut ctx, &map);
-    ctx.end_page_group(|s| s == Softness::Hard);
     ctx.finish()
 }
 
+/// Defines how an item interacts with surrounding items.
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum Softness {
+    /// A soft item can be skipped in some circumstances.
+    Soft,
+    /// A hard item is always retained.
+    Hard,
+}
+
 /// Execute a node.
 ///
 /// This manipulates active styling and document state and produces layout
@@ -68,8 +75,8 @@ impl ExecWithMap for Node {
         match self {
             Node::Text(text) => ctx.push_text(text),
             Node::Space => ctx.push_space(),
-            Node::Linebreak => ctx.apply_linebreak(),
-            Node::Parbreak => ctx.apply_parbreak(),
+            Node::Linebreak => ctx.push_linebreak(),
+            Node::Parbreak => ctx.push_parbreak(),
             Node::Strong => ctx.state.font.strong ^= true,
             Node::Emph => ctx.state.font.emph ^= true,
             Node::Heading(heading) => heading.exec_with_map(ctx, map),
@@ -87,7 +94,7 @@ impl ExecWithMap for NodeHeading {
         ctx.state.font.strong = true;
 
         self.contents.exec_with_map(ctx, map);
-        ctx.apply_parbreak();
+        ctx.push_parbreak();
 
         ctx.state = prev;
     }
@@ -96,7 +103,7 @@ impl ExecWithMap for NodeHeading {
 impl Exec for NodeRaw {
     fn exec(&self, ctx: &mut ExecContext) {
         let prev = Rc::clone(&ctx.state.font.families);
-        ctx.apply_monospace();
+        ctx.set_monospace();
 
         let em = ctx.state.font.font_size();
         let line_spacing = ctx.state.par.line_spacing.resolve(em);
@@ -116,7 +123,7 @@ impl Exec for NodeRaw {
         }
 
         if self.block {
-            ctx.apply_parbreak();
+            ctx.push_parbreak();
         }
 
         // This is wrapped in a fixed node to make sure the stack fits to its
@@ -133,7 +140,7 @@ impl Exec for NodeRaw {
         });
 
         if self.block {
-            ctx.apply_parbreak();
+            ctx.push_parbreak();
         }
 
         ctx.state.font.families = prev;
@@ -153,7 +160,7 @@ impl Exec for Value {
                 // For values which can't be shown "naturally", we print
                 // the representation in monospace.
                 let prev = Rc::clone(&ctx.state.font.families);
-                ctx.apply_monospace();
+                ctx.set_monospace();
                 ctx.push_text(&pretty(other));
                 ctx.state.font.families = prev;
             }
-- 
cgit v1.2.3