From 3c42efcfe8b3496406c50790e9e936568567bbb7 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Thu, 23 Jan 2025 17:53:57 +0100
Subject: [PATCH] Figure body forces paragraph

---
 crates/typst-library/src/model/figure.rs |  33 ++++++++++++++---------
 tests/ref/figure-par.png                 | Bin 0 -> 1701 bytes
 tests/suite/model/figure.typ             |  11 ++++++++
 3 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 tests/ref/figure-par.png

diff --git a/crates/typst-library/src/model/figure.rs b/crates/typst-library/src/model/figure.rs
index ce7460c9b..78a79a8e2 100644
--- a/crates/typst-library/src/model/figure.rs
+++ b/crates/typst-library/src/model/figure.rs
@@ -19,7 +19,9 @@ use crate::layout::{
     AlignElem, Alignment, BlockBody, BlockElem, Em, HAlignment, Length, OuterVAlignment,
     PlaceElem, PlacementScope, VAlignment, VElem,
 };
-use crate::model::{Numbering, NumberingPattern, Outlinable, Refable, Supplement};
+use crate::model::{
+    Numbering, NumberingPattern, Outlinable, ParbreakElem, Refable, Supplement,
+};
 use crate::text::{Lang, Region, TextElem};
 use crate::visualize::ImageElem;
 
@@ -328,6 +330,7 @@ impl Synthesize for Packed<FigureElem> {
 impl Show for Packed<FigureElem> {
     #[typst_macros::time(name = "figure", span = self.span())]
     fn show(&self, _: &mut Engine, styles: StyleChain) -> SourceResult<Content> {
+        let span = self.span();
         let target = TargetElem::target_in(styles);
         let mut realized = self.body.clone();
 
@@ -341,24 +344,27 @@ impl Show for Packed<FigureElem> {
             seq.push(first);
             if !target.is_html() {
                 let v = VElem::new(self.gap(styles).into()).with_weak(true);
-                seq.push(v.pack().spanned(self.span()))
+                seq.push(v.pack().spanned(span))
             }
             seq.push(second);
             realized = Content::sequence(seq)
         }
 
+        // Ensure that the body is considered a paragraph.
+        realized += ParbreakElem::shared().clone().spanned(span);
+
         if target.is_html() {
             return Ok(HtmlElem::new(tag::figure)
                 .with_body(Some(realized))
                 .pack()
-                .spanned(self.span()));
+                .spanned(span));
         }
 
         // Wrap the contents in a block.
         realized = BlockElem::new()
             .with_body(Some(BlockBody::Content(realized)))
             .pack()
-            .spanned(self.span());
+            .spanned(span);
 
         // Wrap in a float.
         if let Some(align) = self.placement(styles) {
@@ -367,10 +373,10 @@ impl Show for Packed<FigureElem> {
                 .with_scope(self.scope(styles))
                 .with_float(true)
                 .pack()
-                .spanned(self.span());
+                .spanned(span);
         } else if self.scope(styles) == PlacementScope::Parent {
             bail!(
-                self.span(),
+                span,
                 "parent-scoped placement is only available for floating figures";
                 hint: "you can enable floating placement with `figure(placement: auto, ..)`"
             );
@@ -604,14 +610,17 @@ impl Show for Packed<FigureCaption> {
             realized = supplement + numbers + self.get_separator(styles) + realized;
         }
 
-        if TargetElem::target_in(styles).is_html() {
-            return Ok(HtmlElem::new(tag::figcaption)
+        Ok(if TargetElem::target_in(styles).is_html() {
+            HtmlElem::new(tag::figcaption)
                 .with_body(Some(realized))
                 .pack()
-                .spanned(self.span()));
-        }
-
-        Ok(realized)
+                .spanned(self.span())
+        } else {
+            BlockElem::new()
+                .with_body(Some(BlockBody::Content(realized)))
+                .pack()
+                .spanned(self.span())
+        })
     }
 }
 
diff --git a/tests/ref/figure-par.png b/tests/ref/figure-par.png
new file mode 100644
index 0000000000000000000000000000000000000000..d70bbcb12970dcf6e0b3f228544b2bbdd99cb3fb
GIT binary patch
literal 1701
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

literal 0
HcmV?d00001

diff --git a/tests/suite/model/figure.typ b/tests/suite/model/figure.typ
index 58ba2b2a4..37fb4ecda 100644
--- a/tests/suite/model/figure.typ
+++ b/tests/suite/model/figure.typ
@@ -180,6 +180,17 @@ We can clearly see that @fig-cylinder and
   caption: [Underlined],
 )
 
+--- figure-par ---
+// Ensure that a figure body is considered a paragraph.
+#show par: highlight
+
+#figure[Text]
+
+#figure(
+  [Text],
+  caption: [A caption]
+)
+
 --- figure-and-caption-show ---
 // Test creating custom figure and custom caption