Merge pull request #19 from typst/shape-runs 🔀

Text work

1 files changed, 29 insertions, 16 deletions

diff --git a/src/layout/stack.rs b/src/layout/stack.rs
index 79fde72d..b69936ba 100644
--- a/src/layout/stack.rs
+++ b/src/layout/stack.rs
@@ -28,7 +28,13 @@ impl Layout for StackNode {
             match *child {
                 StackChild::Spacing(amount) => layouter.push_spacing(amount),
                 StackChild::Any(ref node, aligns) => {
-                    for frame in node.layout(ctx, &layouter.areas) {
+                    let mut frames = node.layout(ctx, &layouter.areas).into_iter();
+                    if let Some(frame) = frames.next() {
+                        layouter.push_frame(frame, aligns);
+                    }
+
+                    for frame in frames {
+                        layouter.finish_area();
                         layouter.push_frame(frame, aligns);
                     }
                 }
@@ -116,32 +122,39 @@ impl StackLayouter {
                 size = Size::new(width, width / aspect);
             }
 
-            size.switch(self.main)
+            size
         };
 
-        let mut output = Frame::new(full_size.switch(self.main).to_size());
+        let mut output = Frame::new(full_size, full_size.height);
+        let mut first = true;
 
+        let full_size = full_size.switch(self.main);
         for (before, frame, aligns) in std::mem::take(&mut self.frames) {
             let child_size = frame.size.switch(self.main);
 
             // Align along the main axis.
-            let main = aligns.main.resolve(if self.dirs.main.is_positive() {
-                let after_with_self = self.size.main - before;
-                before .. full_size.main - after_with_self
-            } else {
-                let before_with_self = before + child_size.main;
-                let after = self.size.main - (before + child_size.main);
-                full_size.main - before_with_self .. after
-            });
+            let main = aligns.main.resolve(
+                self.dirs.main,
+                if self.dirs.main.is_positive() {
+                    before .. before + full_size.main - self.size.main
+                } else {
+                    self.size.main - (before + child_size.main)
+                        .. full_size.main - (before + child_size.main)
+                },
+            );
 
             // Align along the cross axis.
-            let cross = aligns.cross.resolve(if self.dirs.cross.is_positive() {
-                Length::ZERO .. full_size.cross - child_size.cross
-            } else {
-                full_size.cross - child_size.cross .. Length::ZERO
-            });
+            let cross = aligns.cross.resolve(
+                self.dirs.cross,
+                Length::ZERO .. full_size.cross - child_size.cross,
+            );
 
             let pos = Gen::new(main, cross).switch(self.main).to_point();
+            if first {
+                output.baseline = pos.y + frame.baseline;
+                first = false;
+            }
+
             output.push_frame(pos, frame);
         }