Let Repr for Relative<T> print both abs + ratio (#3721)

2025-05-15 01:25:28 +08:00 · 2024-03-23 07:51:43 -04:00 · 2024-03-23 07:51:43 -04:00 · d1568a5583
commit d1568a5583
parent 0dba0e2658
6 changed files with 5 additions and 5 deletions
--- a/crates/typst/src/layout/rel.rs
+++ b/crates/typst/src/layout/rel.rs
@ -100,11 +100,7 @@ impl<T: Numeric + Debug> Debug for Rel<T> {

 impl<T: Numeric + Repr> Repr for Rel<T> {
    fn repr(&self) -> EcoString {
-        match (self.rel.is_zero(), self.abs.is_zero()) {
-            (false, false) => eco_format!("{} + {}", self.rel.repr(), self.abs.repr()),
-            (false, true) => self.rel.repr(),
-            (true, _) => self.abs.repr(),
-        }
+        eco_format!("{} + {}", self.rel.repr(), self.abs.repr())
    }
 }

--- a/tests/ref/compiler/content-field.png
+++ b/tests/ref/compiler/content-field.png
--- a/tests/ref/compiler/repr.png
+++ b/tests/ref/compiler/repr.png
--- a/tests/ref/layout/grid-cell.png
+++ b/tests/ref/layout/grid-cell.png
--- a/tests/ref/layout/table-cell.png
+++ b/tests/ref/layout/table-cell.png
--- a/tests/typ/compiler/repr.typ
+++ b/tests/typ/compiler/repr.typ
@ -22,6 +22,10 @@
 #1.7em \
 #(1cm + 0em) \
 #(2em + 10pt) \
+#(100% + (2em + 2pt)) \
+#(100% + 0pt) \
+#(100% - 2em + 2pt) \
+#(100% - 2pt) \
 #2.3fr

 ---