1 files changed, 16 insertions, 12 deletions

diff --git a/src/library/mod.rs b/src/library/mod.rs
index 9b6da6a9..1e2ee224 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -27,7 +27,9 @@ mod prelude {
     pub use std::rc::Rc;
 
     pub use crate::diag::{At, TypResult};
-    pub use crate::eval::{Args, EvalContext, Node, Property, Smart, Styles, Value};
+    pub use crate::eval::{
+        Args, Construct, EvalContext, Node, Property, Set, Smart, Styles, Value,
+    };
     pub use crate::frame::*;
     pub use crate::geom::*;
     pub use crate::layout::*;
@@ -60,22 +62,24 @@ use crate::geom::*;
 pub fn new() -> Scope {
     let mut std = Scope::new();
 
-    // Text.
-    std.def_func("font", font);
-    std.def_func("par", par);
-    std.def_func("parbreak", parbreak);
+    // Classes.
+    std.def_class::<PageNode>("page");
+    std.def_class::<ParNode>("par");
+    std.def_class::<TextNode>("text");
+
+    // Text functions.
     std.def_func("strike", strike);
     std.def_func("underline", underline);
     std.def_func("overline", overline);
     std.def_func("link", link);
 
-    // Layout.
-    std.def_func("page", page);
-    std.def_func("pagebreak", pagebreak);
+    // Layout functions.
     std.def_func("h", h);
     std.def_func("v", v);
     std.def_func("box", box_);
     std.def_func("block", block);
+    std.def_func("pagebreak", pagebreak);
+    std.def_func("parbreak", parbreak);
     std.def_func("stack", stack);
     std.def_func("grid", grid);
     std.def_func("pad", pad);
@@ -85,14 +89,14 @@ pub fn new() -> Scope {
     std.def_func("scale", scale);
     std.def_func("rotate", rotate);
 
-    // Elements.
+    // Element functions.
     std.def_func("image", image);
     std.def_func("rect", rect);
     std.def_func("square", square);
     std.def_func("ellipse", ellipse);
     std.def_func("circle", circle);
 
-    // Utility.
+    // Utility functions.
     std.def_func("assert", assert);
     std.def_func("type", type_);
     std.def_func("repr", repr);
@@ -110,14 +114,14 @@ pub fn new() -> Scope {
     std.def_func("len", len);
     std.def_func("sorted", sorted);
 
-    // Colors.
+    // Predefined colors.
     std.def_const("white", RgbaColor::WHITE);
     std.def_const("black", RgbaColor::BLACK);
     std.def_const("eastern", RgbaColor::new(0x23, 0x9D, 0xAD, 0xFF));
     std.def_const("conifer", RgbaColor::new(0x9f, 0xEB, 0x52, 0xFF));
     std.def_const("forest", RgbaColor::new(0x43, 0xA1, 0x27, 0xFF));
 
-    // Arbitrary constants.
+    // Other constants.
     std.def_const("ltr", Dir::LTR);
     std.def_const("rtl", Dir::RTL);
     std.def_const("ttb", Dir::TTB);