Merge pull request #52 from typst/basicc-cols

Introduce equal-width columns

1 files changed, 16 insertions, 8 deletions

diff --git a/src/library/flow.rs b/src/library/flow.rs
index cfa761b6..6bfa3ddd 100644
--- a/src/library/flow.rs
+++ b/src/library/flow.rs
@@ -36,24 +36,28 @@ pub enum FlowChild {
     Spacing(SpacingNode),
     /// An arbitrary node.
     Node(PackedNode),
+    /// Skip the rest of the region and move to the next.
+    Skip,
 }
 
 impl FlowChild {
     /// A reference to the child's styles.
-    pub fn styles(&self) -> &Styles {
+    pub fn styles(&self) -> Option<&Styles> {
         match self {
-            Self::Break(styles) => styles,
-            Self::Spacing(node) => &node.styles,
-            Self::Node(node) => &node.styles,
+            Self::Break(styles) => Some(styles),
+            Self::Spacing(node) => Some(&node.styles),
+            Self::Node(node) => Some(&node.styles),
+            Self::Skip => None,
         }
     }
 
     /// A mutable reference to the child's styles.
-    pub fn styles_mut(&mut self) -> &mut Styles {
+    pub fn styles_mut(&mut self) -> Option<&mut Styles> {
         match self {
-            Self::Break(styles) => styles,
-            Self::Spacing(node) => &mut node.styles,
-            Self::Node(node) => &mut node.styles,
+            Self::Break(styles) => Some(styles),
+            Self::Spacing(node) => Some(&mut node.styles),
+            Self::Node(node) => Some(&mut node.styles),
+            Self::Skip => None,
         }
     }
 }
@@ -69,6 +73,7 @@ impl Debug for FlowChild {
             }
             Self::Spacing(node) => node.fmt(f),
             Self::Node(node) => node.fmt(f),
+            Self::Skip => f.pad("Skip"),
         }
     }
 }
@@ -138,6 +143,9 @@ impl<'a> FlowLayouter<'a> {
                     let amount = chain.get(ParNode::SPACING).resolve(em);
                     self.layout_absolute(amount.into());
                 }
+                FlowChild::Skip => {
+                    self.finish_region();
+                }
                 FlowChild::Spacing(node) => match node.kind {
                     SpacingKind::Linear(v) => self.layout_absolute(v),
                     SpacingKind::Fractional(v) => {