From 23746ee18901e08852306f35639298ad234d3481 Mon Sep 17 00:00:00 2001
From: +merlan #flirora <uruwi@protonmail.com>
Date: Thu, 30 May 2024 11:40:01 -0400
Subject: [PATCH] Add flush element (#4141)

---
 crates/typst/src/layout/flow.rs  |  20 ++++++++++--
 crates/typst/src/layout/mod.rs   |   1 +
 crates/typst/src/layout/place.rs |  51 +++++++++++++++++++++++++++++--
 crates/typst/src/realize/mod.rs  |   5 +--
 tests/ref/place-figure-flush.png | Bin 0 -> 5197 bytes
 tests/ref/place-float-flush.png  | Bin 0 -> 2644 bytes
 tests/suite/layout/place.typ     |  27 ++++++++++++++++
 7 files changed, 96 insertions(+), 8 deletions(-)
 create mode 100644 tests/ref/place-figure-flush.png
 create mode 100644 tests/ref/place-float-flush.png

diff --git a/crates/typst/src/layout/flow.rs b/crates/typst/src/layout/flow.rs
index 2f985f285..84a395cc3 100644
--- a/crates/typst/src/layout/flow.rs
+++ b/crates/typst/src/layout/flow.rs
@@ -13,9 +13,9 @@ use crate::foundations::{
 };
 use crate::introspection::TagElem;
 use crate::layout::{
-    Abs, AlignElem, Axes, BlockElem, ColbreakElem, ColumnsElem, FixedAlignment, Fr,
-    Fragment, Frame, FrameItem, LayoutMultiple, LayoutSingle, PlaceElem, Point, Regions,
-    Rel, Size, Spacing, VElem,
+    Abs, AlignElem, Axes, BlockElem, ColbreakElem, ColumnsElem, FixedAlignment,
+    FlushElem, Fr, Fragment, Frame, FrameItem, LayoutMultiple, LayoutSingle, PlaceElem,
+    Point, Regions, Rel, Size, Spacing, VElem,
 };
 use crate::model::{FootnoteElem, FootnoteEntry, ParElem};
 use crate::utils::Numeric;
@@ -73,6 +73,8 @@ impl LayoutMultiple for Packed<FlowElem> {
 
             if let Some(elem) = child.to_packed::<TagElem>() {
                 layouter.layout_tag(elem);
+            } else if child.is::<FlushElem>() {
+                layouter.flush(engine)?;
             } else if let Some(elem) = child.to_packed::<VElem>() {
                 layouter.layout_spacing(engine, elem, styles)?;
             } else if let Some(placed) = child.to_packed::<PlaceElem>() {
@@ -683,6 +685,18 @@ impl<'a> FlowLayouter<'a> {
         Ok(())
     }
 
+    /// Lays out all floating elements before continuing with other content.
+    fn flush(&mut self, engine: &mut Engine) -> SourceResult<()> {
+        for item in std::mem::take(&mut self.pending_floats) {
+            self.layout_item(engine, item)?;
+        }
+        while !self.pending_floats.is_empty() {
+            self.finish_region(engine, false)?;
+        }
+
+        Ok(())
+    }
+
     /// Finish layouting and return the resulting fragment.
     fn finish(mut self, engine: &mut Engine) -> SourceResult<Fragment> {
         if self.expand.y {
diff --git a/crates/typst/src/layout/mod.rs b/crates/typst/src/layout/mod.rs
index 0fd8e6b10..444d51621 100644
--- a/crates/typst/src/layout/mod.rs
+++ b/crates/typst/src/layout/mod.rs
@@ -107,6 +107,7 @@ pub fn define(global: &mut Scope) {
     global.define_elem::<ColumnsElem>();
     global.define_elem::<ColbreakElem>();
     global.define_elem::<PlaceElem>();
+    global.define_elem::<FlushElem>();
     global.define_elem::<AlignElem>();
     global.define_elem::<PadElem>();
     global.define_elem::<RepeatElem>();
diff --git a/crates/typst/src/layout/place.rs b/crates/typst/src/layout/place.rs
index 7d41b0376..f81af2b80 100644
--- a/crates/typst/src/layout/place.rs
+++ b/crates/typst/src/layout/place.rs
@@ -1,6 +1,6 @@
 use crate::diag::{bail, At, Hint, SourceResult};
 use crate::engine::Engine;
-use crate::foundations::{elem, Content, Packed, Smart, StyleChain};
+use crate::foundations::{elem, scope, Content, Packed, Smart, StyleChain, Unlabellable};
 use crate::layout::{
     Alignment, Axes, Em, Fragment, LayoutMultiple, Length, Regions, Rel, Size, VAlignment,
 };
@@ -26,7 +26,7 @@ use crate::realize::{Behave, Behaviour};
 ///   ),
 /// )
 /// ```
-#[elem(Behave)]
+#[elem(scope, Behave)]
 pub struct PlaceElem {
     /// Relative to which position in the parent container to place the content.
     ///
@@ -43,7 +43,9 @@ pub struct PlaceElem {
     /// Whether the placed element has floating layout.
     ///
     /// Floating elements are positioned at the top or bottom of the page,
-    /// displacing in-flow content.
+    /// displacing in-flow content. They are always placed in the in-flow
+    /// order relative to each other, as well as before any content following
+    /// a later [`flush`] element.
     ///
     /// ```example
     /// #set page(height: 150pt)
@@ -95,6 +97,12 @@ pub struct PlaceElem {
     pub body: Content,
 }
 
+#[scope]
+impl PlaceElem {
+    #[elem]
+    type FlushElem;
+}
+
 impl Packed<PlaceElem> {
     #[typst_macros::time(name = "place", span = self.span())]
     pub fn layout(
@@ -136,3 +144,40 @@ impl Behave for Packed<PlaceElem> {
         Behaviour::Ignorant
     }
 }
+
+/// Asks the layout algorithm to place pending floating elements before
+/// continuing with the content.
+///
+/// This is useful for preventing floating figures from spilling
+/// into the next section.
+///
+/// ```example
+/// #set page(height: 165pt, width: 150pt)
+///
+/// Some introductory text: #lorem(15)
+///
+/// #figure(
+///   rect(
+///     width: 100%,
+///     height: 64pt,
+///     [I float with a caption!],
+///   ),
+///   placement: auto,
+///   caption: [A self-describing figure],
+/// )
+///
+/// #place.flush()
+///
+/// Some conclusive text that must occur
+/// after the figure.
+/// ```
+#[elem(Behave, Unlabellable)]
+pub struct FlushElem {}
+
+impl Behave for Packed<FlushElem> {
+    fn behaviour(&self) -> Behaviour {
+        Behaviour::Invisible
+    }
+}
+
+impl Unlabellable for Packed<FlushElem> {}
diff --git a/crates/typst/src/realize/mod.rs b/crates/typst/src/realize/mod.rs
index 4679a61cb..600df1bb7 100644
--- a/crates/typst/src/realize/mod.rs
+++ b/crates/typst/src/realize/mod.rs
@@ -23,8 +23,8 @@ use crate::foundations::{
 };
 use crate::introspection::TagElem;
 use crate::layout::{
-    AlignElem, BlockElem, BoxElem, ColbreakElem, FlowElem, HElem, LayoutMultiple,
-    LayoutSingle, PageElem, PagebreakElem, Parity, PlaceElem, VElem,
+    AlignElem, BlockElem, BoxElem, ColbreakElem, FlowElem, FlushElem, HElem,
+    LayoutMultiple, LayoutSingle, PageElem, PagebreakElem, Parity, PlaceElem, VElem,
 };
 use crate::math::{EquationElem, LayoutMath};
 use crate::model::{
@@ -381,6 +381,7 @@ impl<'a> FlowBuilder<'a> {
             || content.is::<ColbreakElem>()
             || content.is::<TagElem>()
             || content.is::<PlaceElem>()
+            || content.is::<FlushElem>()
         {
             self.0.push(content, styles);
             return true;
diff --git a/tests/ref/place-figure-flush.png b/tests/ref/place-figure-flush.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e6e03105438a5bd7f4afc840a6fe1b96174778b
GIT binary patch
literal 5197
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

literal 0
HcmV?d00001

diff --git a/tests/ref/place-float-flush.png b/tests/ref/place-float-flush.png
new file mode 100644
index 0000000000000000000000000000000000000000..67c01c2cd9b5512de3ed793e19ca42d9815270e3
GIT binary patch
literal 2644
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
KOH~&=68;5=yX-Xp

literal 0
HcmV?d00001

diff --git a/tests/suite/layout/place.typ b/tests/suite/layout/place.typ
index b8765e937..0922800db 100644
--- a/tests/suite/layout/place.typ
+++ b/tests/suite/layout/place.typ
@@ -121,6 +121,33 @@ Second
   image("/assets/images/diagram.svg", width: 80%),
 )
 
+--- place-float-flush ---
+#set page(height: 150pt, width: 150pt)
+
+#let floater = place(auto, float: true, rect(width: 100%, height: 90pt, text(size: 24pt)[I float!]))
+
+Some introductory text.
+
+#floater #floater #floater #floater
+
+Some additional text.
+
+#place.flush()
+
+Some conclusive text. // Should appear after all the floating figures
+
+--- place-figure-flush ---
+
+#set page(height: 165pt, width: 150pt)
+
+Some introductory text: #lorem(15)
+
+#figure(placement: auto, caption: [A self-describing figure], rect(width: 100%, height: 64pt, [I float with a caption!]))
+
+#place.flush()
+
+Some conclusive text that must occur after the figure.
+
 --- place-bottom-in-box ---
 #box(
   fill: aqua,