Configurable font edges ⚙

Adds top-edge and bottom-edge parameters to the font function. These define how
the box around a word is computed. The possible values are:
- ascender
- cap-height (default top edge)
- x-height
- baseline (default bottom edge)
- descender

The defaults are chosen so that it's easy to create good-looking designs with
vertical alignment. Since they are much tighter than what most other software
uses by default, the default leading had to be increased to 50% of the font size
and paragraph spacing to 100% of the font size.

The values cap-height and x-height fall back to ascender in case they are zero
because this value may occur in fonts that don't have glyphs with cap- or
x-height (like Twitter Color Emoji). Since cap-height is the default top edge,
doing no fallback would break things badly.

Removes softness in favor of a simple boolean for pages and a more finegread u8
for spacing. This is needed to make paragraph spacing consume line spacing
created by hard line breaks.

1 files changed, 6 insertions, 12 deletions

diff --git a/src/layout/spacing.rs b/src/layout/spacing.rs
index 4b564a2b..2bcb7ac1 100644
--- a/src/layout/spacing.rs
+++ b/src/layout/spacing.rs
@@ -1,7 +1,6 @@
 use std::fmt::{self, Debug, Formatter};
 
 use super::*;
-use crate::exec::Softness;
 
 /// A spacing node.
 #[derive(Copy, Clone, PartialEq)]
@@ -10,13 +9,11 @@ pub struct NodeSpacing {
     pub amount: Length,
     /// Defines how spacing interacts with surrounding spacing.
     ///
-    /// Hard spacing assures that a fixed amount of spacing will always be
-    /// inserted. Soft spacing will be consumed by previous soft spacing or
-    /// neighbouring hard spacing and can be used to insert overridable spacing,
-    /// e.g. between words or paragraphs.
-    ///
-    /// This field is only used in evaluation, not in layouting.
-    pub softness: Softness,
+    /// Hard spacing (`softness = 0`) assures that a fixed amount of spacing
+    /// will always be inserted. Soft spacing (`softness >= 1`) will be consumed
+    /// by other spacing with lower softness and can be used to insert
+    /// overridable spacing, e.g. between words or paragraphs.
+    pub softness: u8,
 }
 
 impl Layout for NodeSpacing {
@@ -27,10 +24,7 @@ impl Layout for NodeSpacing {
 
 impl Debug for NodeSpacing {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        match self.softness {
-            Softness::Soft => write!(f, "Soft({})", self.amount),
-            Softness::Hard => write!(f, "Hard({})", self.amount),
-        }
+        write!(f, "Spacing({}, {})", self.amount, self.softness)
     }
 }