From d9c529347d7f46eb2f4698d256b1906c1ced6b76 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 17 Nov 2021 23:54:43 +0100
Subject: Configurable paragraph alignment

---
 src/library/par.rs | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/library/par.rs b/src/library/par.rs
index 67c2969b..9d48ef05 100644
--- a/src/library/par.rs
+++ b/src/library/par.rs
@@ -15,17 +15,26 @@ pub fn par(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
     let spacing = args.named("spacing")?;
     let leading = args.named("leading")?;
 
-    let mut dir = args.named::<EcoString>("lang")?.map(|iso| {
-        match iso.to_ascii_lowercase().as_str() {
-            "ar" | "he" | "fa" | "ur" | "ps" | "yi" => Dir::RTL,
-            "en" | "fr" | "de" => Dir::LTR,
-            _ => Dir::LTR,
-        }
-    });
+    let mut dir =
+        args.named("lang")?
+            .map(|iso: EcoString| match iso.to_lowercase().as_str() {
+                "ar" | "he" | "fa" | "ur" | "ps" | "yi" => Dir::RTL,
+                "en" | "fr" | "de" => Dir::LTR,
+                _ => Dir::LTR,
+            });
 
     if let Some(Spanned { v, span }) = args.named::<Spanned<Dir>>("dir")? {
         if v.axis() == SpecAxis::Horizontal {
-            dir = Some(v)
+            dir = Some(v);
+        } else {
+            bail!(span, "must be horizontal");
+        }
+    }
+
+    let mut align = None;
+    if let Some(Spanned { v, span }) = args.named::<Spanned<Align>>("align")? {
+        if matches!(v.axis(), None | Some(SpecAxis::Horizontal)) {
+            align = Some(v);
         } else {
             bail!(span, "must be horizontal");
         }
@@ -39,6 +48,10 @@ pub fn par(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
             par.align = if dir == Dir::LTR { Align::Left } else { Align::Right };
         }
 
+        if let Some(align) = align {
+            par.align = align;
+        }
+
         if let Some(leading) = leading {
             par.leading = leading;
         }
-- 
cgit v1.2.3