From 584a43277dbfbdba834a2681afe63d10598db3f9 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Fri, 12 Mar 2021 14:12:30 +0100
Subject: =?UTF-8?q?Rename=20ChildAlign=20to=20LayoutAligns=20=E2=9C=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/exec/context.rs | 22 +++++++++++-----------
 src/exec/mod.rs     |  2 +-
 src/exec/state.rs   | 14 +++++++-------
 3 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/exec')

diff --git a/src/exec/context.rs b/src/exec/context.rs
index 4d2047a6..3b0fd897 100644
--- a/src/exec/context.rs
+++ b/src/exec/context.rs
@@ -5,7 +5,7 @@ use fontdock::FontStyle;
 
 use super::*;
 use crate::diag::{Diag, DiagSet};
-use crate::geom::{ChildAlign, Dir, Gen, LayoutDirs, Length, Linear, Sides, Size};
+use crate::geom::{Dir, Gen, LayoutAligns, LayoutDirs, Length, Linear, Sides, Size};
 use crate::layout::{
     Node, NodePad, NodePages, NodePar, NodeSpacing, NodeStack, NodeText, Tree,
 };
@@ -108,7 +108,7 @@ impl<'a> ExecContext<'a> {
     /// Execute a template and return the result as a stack node.
     pub fn exec(&mut self, template: &ValueTemplate) -> Node {
         let dirs = self.state.dirs;
-        let align = self.state.align;
+        let aligns = self.state.aligns;
 
         self.start_group(ContentGroup);
         self.start_par_group();
@@ -116,7 +116,7 @@ impl<'a> ExecContext<'a> {
         self.end_par_group();
         let children = self.end_group::<ContentGroup>().1;
 
-        NodeStack { dirs, align, children }.into()
+        NodeStack { dirs, aligns, children }.into()
     }
 
     /// Start a page group based on the active page state.
@@ -130,7 +130,7 @@ impl<'a> ExecContext<'a> {
             size: self.state.page.size,
             padding: self.state.page.margins(),
             dirs: self.state.dirs,
-            align: self.state.align,
+            aligns: self.state.aligns,
             softness,
         });
         self.start_par_group();
@@ -156,7 +156,7 @@ impl<'a> ExecContext<'a> {
                     padding: group.padding,
                     child: NodeStack {
                         dirs: group.dirs,
-                        align: group.align,
+                        aligns: group.aligns,
                         children,
                     }
                     .into(),
@@ -172,7 +172,7 @@ impl<'a> ExecContext<'a> {
         let em = self.state.font.font_size();
         self.start_group(ParGroup {
             dirs: self.state.dirs,
-            align: self.state.align,
+            aligns: self.state.aligns,
             line_spacing: self.state.par.line_spacing.resolve(em),
         });
     }
@@ -183,7 +183,7 @@ impl<'a> ExecContext<'a> {
         if !children.is_empty() {
             self.push(NodePar {
                 dirs: group.dirs,
-                align: group.align,
+                aligns: group.aligns,
                 line_spacing: group.line_spacing,
                 children,
             });
@@ -275,7 +275,7 @@ impl<'a> ExecContext<'a> {
 
         NodeText {
             text,
-            align: self.state.align,
+            aligns: self.state.aligns,
             dir: self.state.dirs.cross,
             font_size: self.state.font.font_size(),
             families: Rc::clone(&self.state.font.families),
@@ -296,10 +296,10 @@ pub enum Softness {
 /// A group for a page run.
 #[derive(Debug)]
 struct PageGroup {
+    dirs: LayoutDirs,
+    aligns: LayoutAligns,
     size: Size,
     padding: Sides<Linear>,
-    dirs: LayoutDirs,
-    align: ChildAlign,
     softness: Softness,
 }
 
@@ -311,6 +311,6 @@ struct ContentGroup;
 #[derive(Debug)]
 struct ParGroup {
     dirs: LayoutDirs,
-    align: ChildAlign,
+    aligns: LayoutAligns,
     line_spacing: Length,
 }
diff --git a/src/exec/mod.rs b/src/exec/mod.rs
index 79ad81e7..58b5cdc0 100644
--- a/src/exec/mod.rs
+++ b/src/exec/mod.rs
@@ -126,7 +126,7 @@ impl Exec for NodeRaw {
             height: None,
             child: NodeStack {
                 dirs: ctx.state.dirs,
-                align: ctx.state.align,
+                aligns: ctx.state.aligns,
                 children,
             }
             .into(),
diff --git a/src/exec/state.rs b/src/exec/state.rs
index 3293662a..65f26439 100644
--- a/src/exec/state.rs
+++ b/src/exec/state.rs
@@ -3,33 +3,33 @@ use std::rc::Rc;
 use fontdock::{fallback, FallbackTree, FontStretch, FontStyle, FontVariant, FontWeight};
 
 use crate::geom::{
-    Align, ChildAlign, Dir, LayoutDirs, Length, Linear, Relative, Sides, Size,
+    Align, Dir, LayoutAligns, LayoutDirs, Length, Linear, Relative, Sides, Size,
 };
 use crate::paper::{Paper, PaperClass, PAPER_A4};
 
 /// The evaluation state.
 #[derive(Debug, Clone, PartialEq)]
 pub struct State {
+    /// The current directions along which layouts are placed in their parents.
+    pub dirs: LayoutDirs,
+    /// The current alignments of layouts in their parents.
+    pub aligns: LayoutAligns,
     /// The current page settings.
     pub page: PageState,
     /// The current paragraph settings.
     pub par: ParState,
     /// The current font settings.
     pub font: FontState,
-    /// The current layouting directions.
-    pub dirs: LayoutDirs,
-    /// The current alignments of an item in its parent.
-    pub align: ChildAlign,
 }
 
 impl Default for State {
     fn default() -> Self {
         Self {
+            dirs: LayoutDirs::new(Dir::TTB, Dir::LTR),
+            aligns: LayoutAligns::new(Align::Start, Align::Start),
             page: PageState::default(),
             par: ParState::default(),
             font: FontState::default(),
-            dirs: LayoutDirs::new(Dir::TTB, Dir::LTR),
-            align: ChildAlign::new(Align::Start, Align::Start),
         }
     }
 }
-- 
cgit v1.2.3