Rename secondary/primary to main/cross ✏

3 files changed, 19 insertions, 20 deletions

diff --git a/src/library/align.rs b/src/library/align.rs
index e7a8eb77..6c9c675f 100644
--- a/src/library/align.rs
+++ b/src/library/align.rs
@@ -35,7 +35,7 @@ pub async fn align(mut args: Args, ctx: &mut LayoutContext) -> Value {
         Some(tree) => vec![
             SetAlignment(aligns),
             LayoutSyntaxTree(tree),
-            SetAlignment(ctx.state.align),
+            SetAlignment(ctx.state.aligns),
         ],
         None => vec![SetAlignment(aligns)],
     })
@@ -45,8 +45,8 @@ pub async fn align(mut args: Args, ctx: &mut LayoutContext) -> Value {
 fn dedup_aligns(
     ctx: &mut LayoutContext,
     iter: impl Iterator<Item = (Option<SpecAxis>, Spanned<SpecAlign>)>,
-) -> LayoutAlign {
-    let mut aligns = ctx.state.align;
+) -> Gen2<GenAlign> {
+    let mut aligns = ctx.state.aligns;
     let mut had = Gen2::new(false, false);
     let mut had_center = false;
 
@@ -54,8 +54,8 @@ fn dedup_aligns(
         // Check whether we know which axis this alignment belongs to.
         if let Some(axis) = axis {
             // We know the axis.
-            let gen_axis = axis.to_gen(ctx.state.sys);
-            let gen_align = align.to_gen(ctx.state.sys);
+            let gen_axis = axis.to_gen(ctx.state.dirs);
+            let gen_align = align.to_gen(ctx.state.dirs);
 
             if align.axis().map_or(false, |a| a != axis) {
                 ctx.diag(error!(
@@ -73,14 +73,13 @@ fn dedup_aligns(
             // positional argument.
             debug_assert_eq!(align, SpecAlign::Center);
 
-            if had.primary && had.secondary {
+            if had.main && had.cross {
                 ctx.diag(error!(span, "duplicate alignment"));
             } else if had_center {
                 // Both this and the previous one are unspecified `center`
                 // alignments. Both axes should be centered.
-                aligns = LayoutAlign::new(GenAlign::Center, GenAlign::Center);
-                had.primary = true;
-                had.secondary = true;
+                aligns = Gen2::new(GenAlign::Center, GenAlign::Center);
+                had = Gen2::new(true, true);
             } else {
                 had_center = true;
             }
@@ -88,22 +87,22 @@ fn dedup_aligns(
 
         // If we we know one alignment, we can handle the unspecified `center`
         // alignment.
-        if had_center && (had.primary || had.secondary) {
-            if had.primary {
-                aligns.secondary = GenAlign::Center;
-                had.secondary = true;
+        if had_center && (had.main || had.cross) {
+            if had.main {
+                aligns.cross = GenAlign::Center;
+                had.cross = true;
             } else {
-                aligns.primary = GenAlign::Center;
-                had.primary = true;
+                aligns.main = GenAlign::Center;
+                had.main = true;
             }
             had_center = false;
         }
     }
 
     // If center has not been flushed by now, it is the only argument and then
-    // we default to applying it to the primary axis.
+    // we default to applying it to the cross axis.
     if had_center {
-        aligns.primary = GenAlign::Center;
+        aligns.cross = GenAlign::Center;
     }
 
     aligns
diff --git a/src/library/boxed.rs b/src/library/boxed.rs
index caeb206e..b88f5b7c 100644
--- a/src/library/boxed.rs
+++ b/src/library/boxed.rs
@@ -12,7 +12,7 @@ pub async fn boxed(mut args: Args, ctx: &mut LayoutContext) -> Value {
     let height = args.get::<_, Linear>(ctx, "height");
     args.done(ctx);
 
-    let align = ctx.state.align;
+    let aligns = ctx.state.aligns;
     let constraints = &mut ctx.constraints;
     constraints.base = constraints.spaces[0].size;
     constraints.spaces.truncate(1);
@@ -35,5 +35,5 @@ pub async fn boxed(mut args: Args, ctx: &mut LayoutContext) -> Value {
     let layouted = layout_tree(&body, ctx).await;
     let layout = layouted.into_iter().next().unwrap();
 
-    Value::Commands(vec![Add(layout, align)])
+    Value::Commands(vec![Add(layout, aligns)])
 }
diff --git a/src/library/spacing.rs b/src/library/spacing.rs
index b38f0607..7a55ff98 100644
--- a/src/library/spacing.rs
+++ b/src/library/spacing.rs
@@ -24,7 +24,7 @@ fn spacing(mut args: Args, ctx: &mut LayoutContext, axis: SpecAxis) -> Value {
 
     Value::Commands(if let Some(spacing) = spacing {
         let spacing = spacing.eval(ctx.state.text.font_size());
-        let axis = axis.to_gen(ctx.state.sys);
+        let axis = axis.to_gen(ctx.state.dirs);
         vec![AddSpacing(spacing, SpacingKind::Hard, axis)]
     } else {
         vec![]