diff options
Diffstat (limited to 'src/eval')
| -rw-r--r-- | src/eval/template.rs | 10 | ||||
| -rw-r--r-- | src/eval/walk.rs | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/eval/template.rs b/src/eval/template.rs index 92b3eb86..addbb466 100644 --- a/src/eval/template.rs +++ b/src/eval/template.rs @@ -308,7 +308,7 @@ impl Builder { /// Push an inline node into the active paragraph. fn inline(&mut self, node: impl Into<LayoutNode>) { - let align = self.state.aligns.cross; + let align = self.state.aligns.inline; self.stack.par.push(ParChild::Any(node.into(), align)); } @@ -323,11 +323,11 @@ impl Builder { /// Push spacing into the active paragraph or stack depending on the `axis`. fn spacing(&mut self, axis: GenAxis, amount: Linear) { match axis { - GenAxis::Main => { + GenAxis::Block => { self.stack.finish_par(&self.state); self.stack.push_hard(StackChild::Spacing(amount)); } - GenAxis::Cross => { + GenAxis::Inline => { self.stack.par.push_hard(ParChild::Spacing(amount)); } } @@ -351,7 +351,7 @@ impl Builder { fn make_text_node(&self, text: impl Into<EcoString>) -> ParChild { ParChild::Text( text.into(), - self.state.aligns.cross, + self.state.aligns.inline, Rc::clone(&self.state.font), ) } @@ -441,7 +441,7 @@ impl ParBuilder { fn new(state: &State) -> Self { Self { aligns: state.aligns, - dir: state.dirs.cross, + dir: state.dirs.inline, line_spacing: state.line_spacing(), children: vec![], last: Last::None, diff --git a/src/eval/walk.rs b/src/eval/walk.rs index 4c6a1605..d99db3ed 100644 --- a/src/eval/walk.rs +++ b/src/eval/walk.rs @@ -109,16 +109,16 @@ impl Walk for EnumNode { fn walk_item(ctx: &mut EvalContext, label: EcoString, body: Template) { ctx.template += Template::from_block(move |state| { let label = ParNode { - dir: state.dirs.cross, + dir: state.dirs.inline, line_spacing: state.line_spacing(), children: vec![ParChild::Text( label.clone(), - state.aligns.cross, + state.aligns.inline, Rc::clone(&state.font), )], }; StackNode { - dirs: Gen::new(state.dirs.main, state.dirs.cross), + dirs: Gen::new(state.dirs.block, state.dirs.inline), children: vec