Go back to wrapping inline nodes

12 files changed, 14 insertions, 16 deletions

diff --git a/src/eval/template.rs b/src/eval/template.rs
index d447161a..9c57bbf3 100644
--- a/src/eval/template.rs
+++ b/src/eval/template.rs
@@ -151,7 +151,7 @@ impl Template {
 
     /// Pack the template into a layout node.
     pub fn pack(&self, style: &Style) -> PackedNode {
-        if let [TemplateNode::Block(f) | TemplateNode::Inline(f)] = self.0.as_slice() {
+        if let [TemplateNode::Block(f)] = self.0.as_slice() {
             f(style)
         } else {
             let mut builder = Builder::new(style, false);
diff --git a/src/library/pad.rs b/src/library/pad.rs
index 4bd7fd64..05cc30b7 100644
--- a/src/library/pad.rs
+++ b/src/library/pad.rs
@@ -15,7 +15,7 @@ pub fn pad(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
         bottom.or(all).unwrap_or_default(),
     );
 
-    Ok(Value::Template(Template::from_inline(move |style| {
+    Ok(Value::Template(Template::from_block(move |style| {
         body.pack(style).padded(padding)
     })))
 }
diff --git a/src/library/sized.rs b/src/library/sized.rs
index daf2b407..dfdc721d 100644
--- a/src/library/sized.rs
+++ b/src/library/sized.rs
@@ -10,13 +10,11 @@ pub fn box_(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
     })))
 }
 
-/// `block`: Size content and place it into the flow.
+/// `block`: Place content into the flow.
 pub fn block(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
-    let width = args.named("width")?;
-    let height = args.named("height")?;
     let body: Template = args.find().unwrap_or_default();
     Ok(Value::Template(Template::from_block(move |style| {
-        body.pack(style).sized(Spec::new(width, height))
+        body.pack(style)
     })))
 }
 
diff --git a/tests/ref/elements/circle.png b/tests/ref/elements/circle.png
index 4ef3ad5e..e5a38e28 100644
--- a/tests/ref/elements/circle.png
+++ b/tests/ref/elements/circle.png
diff --git a/tests/ref/elements/rect.png b/tests/ref/elements/rect.png
index a434b81d..b6ab89aa 100644
--- a/tests/ref/elements/rect.png
+++ b/tests/ref/elements/rect.png
diff --git a/tests/ref/layout/grid-1.png b/tests/ref/layout/grid-1.png
index df8ab644..1996e25a 100644
--- a/tests/ref/layout/grid-1.png
+++ b/tests/ref/layout/grid-1.png
diff --git a/tests/ref/layout/grid-3.png b/tests/ref/layout/grid-3.png
index 6023170c..505ed0ed 100644
--- a/tests/ref/layout/grid-3.png
+++ b/tests/ref/layout/grid-3.png
diff --git a/tests/typ/elements/ellipse.typ b/tests/typ/elements/ellipse.typ
index 47f6d0e1..39c73a6f 100644
--- a/tests/typ/elements/ellipse.typ
+++ b/tests/typ/elements/ellipse.typ
@@ -7,8 +7,8 @@
 ---
 Rect in ellipse in fixed rect. \
 #rect(width: 3cm, height: 2cm, fill: rgb("2a631a"),
-  ellipse(fill: forest,
-    rect(fill: conifer,
+  ellipse(fill: forest, width: 100%, height: 100%,
+    rect(fill: conifer, width: 100%, height: 100%,
       align(center + horizon)[
         Stuff inside an ellipse!
       ]
diff --git a/tests/typ/elements/image.typ b/tests/typ/elements/image.typ
index 9d192b40..0fce4295 100644
--- a/tests/typ/elements/image.typ
+++ b/tests/typ/elements/image.typ
@@ -27,12 +27,12 @@
 // Test all three fit modes.
 #page(height: 50pt, margins: 0pt)
 #grid(
-  columns: 3,
+  columns: (1fr, 1fr, 1fr),
   rows: 100%,
   gutter: 3pt,
-  image("../../res/tiger.jpg", fit: "contain"),
-  image("../../res/tiger.jpg", fit: "cover"),
-  image("../../res/tiger.jpg", fit: "stretch"),
+  image("../../res/tiger.jpg", width: 100%, height: 100%, fit: "contain"),
+  image("../../res/tiger.jpg", width: 100%, height: 100%, fit: "cover"),
+  image("../../res/tiger.jpg", width: 100%, height: 100%, fit: "stretch"),
 )
 
 ---
diff --git a/tests/typ/layout/align.typ b/tests/typ/layout/align.typ
index 4a50d3dc..13b88ac1 100644
--- a/tests/typ/layout/align.typ
+++ b/tests/typ/layout/align.typ
@@ -10,7 +10,7 @@
 #align(center + horizon, rect(fill: eastern, height: 10pt))
 #align(bottom, stack(
   align(center, rect(fill: conifer, height: 10pt)),
-  rect(fill: forest, height: 10pt),
+  rect(fill: forest, height: 10pt, width: 100%),
 ))
 
 ---
diff --git a/tests/typ/layout/pad.typ b/tests/typ/layout/pad.typ
index 2a91d1ca..1fa0f79d 100644
--- a/tests/typ/layout/pad.typ
+++ b/tests/typ/layout/pad.typ
@@ -11,7 +11,7 @@
   )
 )
 
-Hi #pad(left: 10pt)[A] there
+Hi #box(pad(left: 10pt)[A]) there
 
 ---
 // Pad can grow.
diff --git a/tests/typ/layout/placed.typ b/tests/typ/layout/placed.typ
index da56ae2d..334ff80d 100644
--- a/tests/typ/layout/placed.typ
+++ b/tests/typ/layout/placed.typ
@@ -9,10 +9,10 @@ Unfortunately, \
 the line breaks still had to be inserted manually.
 
 #stack(
-  rect(fill: eastern, height: 10pt),
+  rect(fill: eastern, height: 10pt, width: 100%),
   place(right, dy: 1.5pt)[ABC],
   rect(fill: conifer, height: 10pt, width: 80%),
-  rect(fill: forest, height: 10pt),
+  rect(fill: forest, height: 10pt, width: 100%),
 )
 
 #block[