From a9fdff244aef859449a76e5f762ee7c343a8ddcc Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Fri, 10 Mar 2023 20:47:23 +0100
Subject: Expose content representation more

---
 library/src/layout/flow.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'library/src/layout/flow.rs')

diff --git a/library/src/layout/flow.rs b/library/src/layout/flow.rs
index 7a063bce..2671b983 100644
--- a/library/src/layout/flow.rs
+++ b/library/src/layout/flow.rs
@@ -32,7 +32,7 @@ impl Layout for FlowNode {
             let outer = styles;
             let mut styles = outer;
             if let Some(node) = child.to::<StyledNode>() {
-                map = node.map();
+                map = node.styles();
                 styles = outer.chain(&map);
                 child = node.body();
             }
@@ -48,15 +48,15 @@ impl Layout for FlowNode {
                 || child.is::<ImageNode>()
             {
                 layouter.layout_single(vt, &child, styles)?;
-            } else if child.has::<dyn Layout>() {
+            } else if child.can::<dyn Layout>() {
                 layouter.layout_multiple(vt, &child, styles)?;
             } else if child.is::<ColbreakNode>() {
                 if !layouter.regions.backlog.is_empty() || layouter.regions.last.is_some()
                 {
                     layouter.finish_region();
                 }
-            } else if let Some(span) = child.span() {
-                bail!(span, "unexpected flow child");
+            } else {
+                bail!(child.span(), "unexpected flow child");
             }
         }
 
@@ -207,7 +207,7 @@ impl<'a> FlowLayouter<'a> {
         let aligns = if let Some(align) = block.to::<AlignNode>() {
             align.alignment(styles)
         } else if let Some(styled) = block.to::<StyledNode>() {
-            AlignNode::alignment_in(styles.chain(&styled.map()))
+            AlignNode::alignment_in(styles.chain(&styled.styles()))
         } else {
             AlignNode::alignment_in(styles)
         }
-- 
cgit v1.2.3