From f8966f9e867dc72080355342aab64734f70ac4f7 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 19 Apr 2023 10:38:03 +0200
Subject: [PATCH] Fix realize in math

---
 library/src/math/fragment.rs    |   6 +++++-
 library/src/math/mod.rs         |  13 +++++++++++--
 library/src/math/stretch.rs     |   1 +
 src/doc.rs                      |  17 +++++++++++------
 tests/ref/bugs/math-realize.png | Bin 0 -> 6335 bytes
 tests/typ/bugs/math-realize.typ |  15 +++++++++++++++
 6 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 tests/ref/bugs/math-realize.png
 create mode 100644 tests/typ/bugs/math-realize.typ

diff --git a/library/src/math/fragment.rs b/library/src/math/fragment.rs
index d85bd33c8..1d13e3b79 100644
--- a/library/src/math/fragment.rs
+++ b/library/src/math/fragment.rs
@@ -148,6 +148,7 @@ pub struct GlyphFragment {
     pub font_size: Abs,
     pub class: Option<MathClass>,
     pub span: Span,
+    pub meta: Vec<Meta>,
 }
 
 impl GlyphFragment {
@@ -194,6 +195,7 @@ impl GlyphFragment {
                 _ => unicode_math_class::class(c),
             },
             span,
+            meta: MetaElem::data_in(ctx.styles()),
         }
     }
 
@@ -231,6 +233,7 @@ impl GlyphFragment {
         };
         let size = Size::new(self.width, self.ascent + self.descent);
         let mut frame = Frame::new(size);
+        frame.meta_iter(self.meta);
         frame.set_baseline(self.ascent);
         frame.push(Point::with_y(self.ascent), FrameItem::Text(item));
         frame
@@ -273,8 +276,9 @@ pub struct FrameFragment {
 }
 
 impl FrameFragment {
-    pub fn new(ctx: &MathContext, frame: Frame) -> Self {
+    pub fn new(ctx: &MathContext, mut frame: Frame) -> Self {
         let base_ascent = frame.ascent();
+        frame.meta(ctx.styles(), false);
         Self {
             frame,
             font_size: ctx.size,
diff --git a/library/src/math/mod.rs b/library/src/math/mod.rs
index 97e5548ee..9c8a9cdf3 100644
--- a/library/src/math/mod.rs
+++ b/library/src/math/mod.rs
@@ -344,9 +344,18 @@ impl LayoutMath for EquationElem {
 
 impl LayoutMath for Content {
     fn layout_math(&self, ctx: &mut MathContext) -> SourceResult<()> {
+        // Directly layout the body of nested equations instead of handling it
+        // like a normal equation so that things like this work:
+        // ```
+        // #let my = $pi$
+        // $ my r^2 $
+        // ```
+        if let Some(elem) = self.to::<EquationElem>() {
+            return elem.layout_math(ctx);
+        }
+
         if let Some(realized) = ctx.realize(self)? {
-            realized.layout_math(ctx)?;
-            return Ok(());
+            return realized.layout_math(ctx);
         }
 
         if let Some(children) = self.to_sequence() {
diff --git a/library/src/math/stretch.rs b/library/src/math/stretch.rs
index 226f3f4e7..bb454022b 100644
--- a/library/src/math/stretch.rs
+++ b/library/src/math/stretch.rs
@@ -162,6 +162,7 @@ fn assemble(
     let mut frame = Frame::new(size);
     let mut offset = Abs::zero();
     frame.set_baseline(baseline);
+    frame.meta_iter(base.meta);
 
     for (fragment, advance) in selected {
         let pos = if horizontal {
diff --git a/src/doc.rs b/src/doc.rs
index 4f0428fb7..b7b1eacdb 100644
--- a/src/doc.rs
+++ b/src/doc.rs
@@ -273,13 +273,18 @@ impl Frame {
     /// Attach the metadata from this style chain to the frame.
     pub fn meta(&mut self, styles: StyleChain, force: bool) {
         if force || !self.is_empty() {
-            for meta in MetaElem::data_in(styles) {
-                if matches!(meta, Meta::Hide) {
-                    self.clear();
-                    break;
-                }
-                self.prepend(Point::zero(), FrameItem::Meta(meta, self.size));
+            self.meta_iter(MetaElem::data_in(styles));
+        }
+    }
+
+    /// Attach metadata from an iterator.
+    pub fn meta_iter(&mut self, iter: impl IntoIterator<Item = Meta>) {
+        for meta in iter {
+            if matches!(meta, Meta::Hide) {
+                self.clear();
+                break;
             }
+            self.prepend(Point::zero(), FrameItem::Meta(meta, self.size));
         }
     }
 
diff --git a/tests/ref/bugs/math-realize.png b/tests/ref/bugs/math-realize.png
new file mode 100644
index 0000000000000000000000000000000000000000..d68fb923f836366133790dfb73d47de1cfefb46d
GIT binary patch
literal 6335
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

literal 0
HcmV?d00001

diff --git a/tests/typ/bugs/math-realize.typ b/tests/typ/bugs/math-realize.typ
new file mode 100644
index 000000000..c2772ab5b
--- /dev/null
+++ b/tests/typ/bugs/math-realize.typ
@@ -0,0 +1,15 @@
+// Test that content in math can be realized without breaking
+// nested equations.
+
+---
+#let my = $pi$
+#let f1 = box(baseline: 10pt, [f])
+#let f2 = style(sty => f1)
+#show math.vec: [nope]
+
+$ pi a $
+$ my a $
+$ 1 + sqrt(x/2) + sqrt(#hide($x/2$)) $
+$ a x #link("url", $+ b$) $
+$ f f1 f2 $
+$ vec(1,2) * 2 $