Merge pull request #19 from typst/shape-runs 🔀

Text work

3 files changed, 8 insertions, 4 deletions

diff --git a/src/geom/align.rs b/src/geom/align.rs
index 422624d8..515efdf2 100644
--- a/src/geom/align.rs
+++ b/src/geom/align.rs
@@ -13,8 +13,8 @@ pub enum Align {
 
 impl Align {
     /// Returns the position of this alignment in the given range.
-    pub fn resolve(self, range: Range<Length>) -> Length {
-        match self {
+    pub fn resolve(self, dir: Dir, range: Range<Length>) -> Length {
+        match if dir.is_positive() { self } else { self.inv() } {
             Self::Start => range.start,
             Self::Center => (range.start + range.end) / 2.0,
             Self::End => range.end,
diff --git a/src/geom/length.rs b/src/geom/length.rs
index 1175876c..1c2a5f86 100644
--- a/src/geom/length.rs
+++ b/src/geom/length.rs
@@ -81,6 +81,11 @@ impl Length {
         Self { raw: self.raw.max(other.raw) }
     }
 
+    /// Whether the other length fits into this one (i.e. is smaller).
+    pub fn fits(self, other: Self) -> bool {
+        self.raw + 1e-6 >= other.raw
+    }
+
     /// Whether the length is zero.
     pub fn is_zero(self) -> bool {
         self.raw == 0.0
diff --git a/src/geom/size.rs b/src/geom/size.rs
index 1ba2f04b..2dd34a87 100644
--- a/src/geom/size.rs
+++ b/src/geom/size.rs
@@ -28,8 +28,7 @@ impl Size {
 
     /// Whether the other size fits into this one (smaller width and height).
     pub fn fits(self, other: Self) -> bool {
-        const EPS: Length = Length::raw(1e-6);
-        self.width + EPS >= other.width && self.height + EPS >= other.height
+        self.width.fits(other.width) && self.height.fits(other.height)
     }
 
     /// Whether both components are finite.