Merge 4aa6dcf578ce3fde6209369c358bde012150146c into 36ecbb2c8dccc1a31c43fee1466f1425844d8607

crates/typst-layout/src/inline/shaping.rs

@@ -9,6 +9,7 @@ use ttf_parser::Tag;
 use typst_library::engine::Engine;
 use typst_library::foundations::{Smart, StyleChain};
 use typst_library::layout::{Abs, Dir, Em, Frame, FrameItem, Point, Size};
+use typst_library::model::{Microtype, ParElem};
 use typst_library::text::{
     families, features, is_default_ignorable, language, variant, Font, FontFamily,
     FontVariant, Glyph, Lang, Region, ShiftSettings, TextEdgeBounds, TextElem, TextItem,
@@ -144,7 +145,11 @@ impl ShapedGlyph {
             || self.c.is_ascii_digit()
     }
 
-    pub fn base_adjustability(&self, style: CjkPunctStyle) -> Adjustability {
+    pub fn base_adjustability(
+        &self,
+        style: CjkPunctStyle,
+        microtype: Microtype,
+    ) -> Adjustability {
         let width = self.x_advance;
         if self.is_space() {
             Adjustability {
@@ -168,7 +173,10 @@ impl ShapedGlyph {
                 shrinkability: (width / 4.0, width / 4.0),
             }
         } else {
-            Adjustability::default()
+            Adjustability {
+                stretchability: (Em::zero(), microtype.max_expand.em),
+                shrinkability: (Em::zero(), microtype.max_retract.em),
+            }
         }
     }
 
@@ -1100,9 +1108,10 @@ fn track_and_space(ctx: &mut ShapingContext) {
 /// and CJK punctuation adjustments according to Chinese Layout Requirements.
 fn calculate_adjustability(ctx: &mut ShapingContext, lang: Lang, region: Option<Region>) {
     let style = cjk_punct_style(lang, region);
+    let microtype = ParElem::microtype_in(ctx.styles);
 
     for glyph in &mut ctx.glyphs {
-        glyph.adjustability = glyph.base_adjustability(style);
+        glyph.adjustability = glyph.base_adjustability(style, microtype);
     }
 
     let mut glyphs = ctx.glyphs.iter_mut().peekable();

crates/typst-library/src/foundations/func.rs

@@ -20,7 +20,7 @@ use crate::foundations::{
 ///
 /// You can call a function by writing a comma-separated list of function
 /// _arguments_ enclosed in parentheses directly after the function name.
-/// Additionally, you can pass any number of trailing content blocks arguments
+/// Additionally, you can pass any number of trailing content block arguments
 /// to a function _after_ the normal argument list. If the normal argument list
 /// would become empty, it can be omitted. Typst supports positional and named
 /// arguments. The former are identified by position and type, while the latter

crates/typst-library/src/model/par.rs

@@ -138,6 +138,9 @@ pub struct ParElem {
     #[default(false)]
     pub justify: bool,
 
+    /// Microtypographical settings that are used during justification.
+    pub microtype: Microtype,
+
     /// How to determine line breaks.
     ///
     /// When this property is set to `{auto}`, its default value, optimized line
@@ -227,6 +230,36 @@ impl ParElem {
     type ParLine;
 }
 
+/// Configuration for microtypographical settings to be used during
+/// justification.
+#[derive(Debug, Default, Copy, Clone, PartialEq, Hash)]
+pub struct Microtype {
+    /// How much a glyph is allowed to translate into its neighbor.
+    pub max_retract: Length,
+    /// How much a glyph is allowed to translate away from its neighbor.
+    pub max_expand: Length,
+}
+
+cast! {
+    Microtype,
+    self => Value::Dict(self.into()),
+    mut dict: Dict => {
+        let max_retract = dict.take("max-retract")?.cast()?;
+        let max_expand = dict.take("max-expand")?.cast()?;
+        dict.finish(&["max-retract", "max-expand"])?;
+        Self { max_retract, max_expand }
+    },
+}
+
+impl From<Microtype> for Dict {
+    fn from(microtype: Microtype) -> Self {
+        dict! {
+            "max-retract" => microtype.max_retract,
+            "max-expand" => microtype.max_expand,
+        }
+    }
+}
+
 /// How to determine line breaks in a paragraph.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Cast)]
 pub enum Linebreaks {

docs/reference/groups.yml

@@ -205,7 +205,7 @@
       single or double quotes.
 
       The value is always of type [string]($str). More complex data
-      may be parsed manually using functions like [`json.decode`]($json.decode).
+      may be parsed manually using functions like [`json`]($json).
 
 - name: sym
   title: General