Set Rules Episode VII: The Set Awakens

1 files changed, 45 insertions, 47 deletions

diff --git a/src/library/page.rs b/src/library/page.rs
index 4a4fab03..0b0cc2d9 100644
--- a/src/library/page.rs
+++ b/src/library/page.rs
@@ -6,53 +6,6 @@ use std::str::FromStr;
 use super::prelude::*;
 use super::PadNode;
 
-/// `page`: Configure pages.
-pub fn page(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
-    castable! {
-        Paper,
-        Expected: "string",
-        Value::Str(string) => Paper::from_str(&string).map_err(|e| e.to_string())?,
-    }
-
-    let body: Option<Node> = args.find();
-
-    let mut map = Styles::new();
-    let styles = match body {
-        Some(_) => &mut map,
-        None => &mut ctx.styles,
-    };
-
-    if let Some(paper) = args.named::<Paper>("paper")?.or_else(|| args.find()) {
-        styles.set(PageNode::CLASS, paper.class());
-        styles.set(PageNode::WIDTH, Smart::Custom(paper.width()));
-        styles.set(PageNode::HEIGHT, Smart::Custom(paper.height()));
-    }
-
-    if let Some(width) = args.named("width")? {
-        styles.set(PageNode::CLASS, PaperClass::Custom);
-        styles.set(PageNode::WIDTH, width);
-    }
-
-    if let Some(height) = args.named("height")? {
-        styles.set(PageNode::CLASS, PaperClass::Custom);
-        styles.set(PageNode::HEIGHT, height);
-    }
-
-    let margins = args.named("margins")?;
-
-    set!(styles, PageNode::FLIPPED => args.named("flipped")?);
-    set!(styles, PageNode::LEFT => args.named("left")?.or(margins));
-    set!(styles, PageNode::TOP => args.named("top")?.or(margins));
-    set!(styles, PageNode::RIGHT => args.named("right")?.or(margins));
-    set!(styles, PageNode::BOTTOM => args.named("bottom")?.or(margins));
-    set!(styles, PageNode::FILL => args.named("fill")?);
-
-    Ok(match body {
-        Some(body) => Value::block(body.into_block().styled(map)),
-        None => Value::None,
-    })
-}
-
 /// `pagebreak`: Start a new page.
 pub fn pagebreak(_: &mut EvalContext, _: &mut Args) -> TypResult<Value> {
     Ok(Value::Node(Node::Pagebreak))
@@ -90,6 +43,45 @@ properties! {
     FILL: Option<Paint> = None,
 }
 
+impl Construct for PageNode {
+    fn construct(_: &mut EvalContext, args: &mut Args) -> TypResult<Node> {
+        // TODO(set): Make sure it's really a page so that it doesn't merge
+        // with adjacent pages.
+        Ok(Node::Page(args.expect::<Node>("body")?.into_block()))
+    }
+}
+
+impl Set for PageNode {
+    fn set(styles: &mut Styles, args: &mut Args) -> TypResult<()> {
+        if let Some(paper) = args.named::<Paper>("paper")?.or_else(|| args.find()) {
+            styles.set(PageNode::CLASS, paper.class());
+            styles.set(PageNode::WIDTH, Smart::Custom(paper.width()));
+            styles.set(PageNode::HEIGHT, Smart::Custom(paper.height()));
+        }
+
+        if let Some(width) = args.named("width")? {
+            styles.set(PageNode::CLASS, PaperClass::Custom);
+            styles.set(PageNode::WIDTH, width);
+        }
+
+        if let Some(height) = args.named("height")? {
+            styles.set(PageNode::CLASS, PaperClass::Custom);
+            styles.set(PageNode::HEIGHT, height);
+        }
+
+        let margins = args.named("margins")?;
+
+        set!(styles, PageNode::FLIPPED => args.named("flipped")?);
+        set!(styles, PageNode::LEFT => args.named("left")?.or(margins));
+        set!(styles, PageNode::TOP => args.named("top")?.or(margins));
+        set!(styles, PageNode::RIGHT => args.named("right")?.or(margins));
+        set!(styles, PageNode::BOTTOM => args.named("bottom")?.or(margins));
+        set!(styles, PageNode::FILL => args.named("fill")?);
+
+        Ok(())
+    }
+}
+
 impl PageNode {
     /// Layout the page run into a sequence of frames, one per page.
     pub fn layout(&self, ctx: &mut LayoutContext) -> Vec<Rc<Frame>> {
@@ -182,6 +174,12 @@ impl Default for Paper {
     }
 }
 
+castable! {
+    Paper,
+    Expected: "string",
+    Value::Str(string) => Paper::from_str(&string).map_err(|e| e.to_string())?,
+}
+
 /// Defines default margins for a class of related papers.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub enum PaperClass {