Merge pull request #51 from typst/set-rules

Set rules

1 files changed, 17 insertions, 15 deletions

diff --git a/src/library/shape.rs b/src/library/shape.rs
index 61c0d6e3..a9c9b333 100644
--- a/src/library/shape.rs
+++ b/src/library/shape.rs
@@ -1,6 +1,7 @@
 use std::f64::consts::SQRT_2;
 
 use super::prelude::*;
+use super::LinkNode;
 
 /// `rect`: A rectangle with optional content.
 pub fn rect(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
@@ -76,20 +77,15 @@ fn shape_impl(
     }
 
     // The shape's contents.
-    let body = args.find::<Template>();
-
-    Ok(Value::Template(Template::from_inline(move |style| {
-        ShapeNode {
-            kind,
-            fill,
-            stroke,
-            child: body
-                .as_ref()
-                .map(|body| body.pack(style).padded(Sides::splat(padding))),
-        }
-        .pack()
-        .sized(Spec::new(width, height))
-    })))
+    let child = args
+        .find()
+        .map(|body: Node| body.into_block().padded(Sides::splat(padding)));
+
+    Ok(Value::inline(
+        ShapeNode { kind, fill, stroke, child }
+            .pack()
+            .sized(Spec::new(width, height)),
+    ))
 }
 
 /// Places its child into a sizable and fillable shape.
@@ -154,9 +150,10 @@ impl Layout for ShapeNode {
             frames = vec![Frame::new(size).constrain(Constraints::tight(regions))];
         }
 
+        let frame = Rc::make_mut(&mut frames[0].item);
+
         // Add fill and/or stroke.
         if self.fill.is_some() || self.stroke.is_some() {
-            let frame = Rc::make_mut(&mut frames[0].item);
             let geometry = match self.kind {
                 ShapeKind::Square | ShapeKind::Rect => Geometry::Rect(frame.size),
                 ShapeKind::Circle | ShapeKind::Ellipse => Geometry::Ellipse(frame.size),
@@ -171,6 +168,11 @@ impl Layout for ShapeNode {
             frame.prepend(Point::zero(), Element::Shape(shape));
         }
 
+        // Apply link if it exists.
+        if let Some(url) = ctx.styles.get_ref(LinkNode::URL) {
+            frame.link(url);
+        }
+
         frames
     }
 }