From 665b4d2aca81af48b8e0eaca4e709ef2e7825844 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Fri, 13 Dec 2019 23:59:01 +0100
Subject: =?UTF-8?q?More=20consistent=20library=20code=20and=20functions=20?=
 =?UTF-8?q?=F0=9F=8E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/layouts/stack.typ | 52 ++++++++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

(limited to 'tests/layouts/stack.typ')

diff --git a/tests/layouts/stack.typ b/tests/layouts/stack.typ
index 934480ca..cbca41dc 100644
--- a/tests/layouts/stack.typ
+++ b/tests/layouts/stack.typ
@@ -6,76 +6,66 @@
     [box][
         [align: center]
         [box: ps=3cm, ss=1cm]
-        [direction: ttb, ltr]
+        [direction: p=ttb, s=ltr]
         [box: ps=3cm, ss=1cm]
         [box: ps=1cm, ss=1cm]
         [box: ps=2cm, ss=1cm]
         [box: ps=1cm, ss=1cm]
     ]
 ]
-[page.break]
 
 // Test 2
 [box: w=1, h=1, debug=false][
-    [align: secondary=top] Top
-    [align: secondary=center] Center
-    [align: secondary=bottom] Bottom
-    [direction: ttb, ltr]
-    [align: secondary=origin, primary=bottom]
+    [align: s=top] Top
+    [align: s=center] Center
+    [align: s=bottom] Bottom
+    [direction: p=ttb, s=ltr]
+    [align: p=bottom, s=origin]
     [box: w=1cm, h=1cm]
 ]
-[page.break]
 
 // Test 3
 [box: w=1, h=1, debug=false][
     [align: center][
-        Somelongspacelessword!
+        Some-long-spaceless-word!
         [align: left] Some
         [align: right] word!
     ]
 ]
-[page.break]
 
 // Test 4
 [box: w=1, h=1, debug=false][
-    [direction: ltr, ttb]
+    [direction: p=ltr, s=ttb]
     [align: center]
-    [align: secondary=origin]
-    [box: ps=1cm, ss=1cm]
-    [align: secondary=center]
-    [box: ps=3cm, ss=1cm]
-    [box: ps=4cm, ss=0.5cm]
-    [align: secondary=end]
-    [box: ps=2cm, ss=1cm]
+    [align: s=origin] [box: ps=1cm, ss=1cm]
+    [align: s=center] [box: ps=3cm, ss=1cm] [box: ps=4cm, ss=0.5cm]
+    [align: s=end] [box: ps=2cm, ss=1cm]
 ]
-[page.break]
 
 // Test 5
 [box: w=1, h=1, debug=false][
-    [direction: primary=btt, secondary=ltr]
-    [align: primary=center, secondary=left]
+    [direction: p=btt, s=ltr]
+    [align: p=center, s=left]
     [box: h=2cm, w=1cm]
 
-    [direction: rtl, btt]
+    [direction: p=rtl, s=btt]
     [align: center]
-    [align: vertical=origin] ORIGIN
-    [align: vertical=center] CENTER
-    [align: vertical=end] END
+    [align: v=origin] ORIGIN
+    [align: v=center] CENTER
+    [align: v=end] END
 ]
-[page.break]
 
 // Test 6
 [box: w=1, h=1, debug=false][
     [box: w=4cm, h=1cm]
 
-    [align: primary=right, secondary=center] CENTER
+    [align: p=right, s=center] CENTER
 
-    [direction: btt, rtl]
-    [align: primary=center, secondary=origin]
+    [direction: p=btt, s=rtl]
+    [align: p=center, s=origin]
     [box: w=0.5cm, h=0.5cm]
     [box: w=0.5cm, h=1cm]
     [box: w=0.5cm, h=0.5cm]
 
-    [align: primary=origin, secondary=end]
-    END
+    [align: p=origin, s=end] END
 ]
-- 
cgit v1.2.3