summaryrefslogtreecommitdiff
path: root/src/library/page.rs
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2020-07-29 18:09:51 +0200
committerLaurenz <laurmaedje@gmail.com>2020-07-29 18:09:51 +0200
commitbbcdeb128cce04cd95714b7bc7af5a23a7e38bd2 (patch)
treee0a1620d335982669cd7671cbd71df46d100e9ea /src/library/page.rs
parentf34ba3dcda182d9b9c14cc94fdb48810bf18bef0 (diff)
Move, rename and switch some things (boring) 🚚
- Problems -> Diagnostics - Position -> Pos - offset_spans -> Offset trait - Size -> Length (and some more size types renamed) - Paper into its own module - scope::Parser -> parsing::CallParser - Create `Decorations` alias - Remove lots of double newlines - Switch from f32 to f64
Diffstat (limited to 'src/library/page.rs')
-rw-r--r--src/library/page.rs21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/library/page.rs b/src/library/page.rs
index 1e782f8f..dd63a0a7 100644
--- a/src/library/page.rs
+++ b/src/library/page.rs
@@ -1,23 +1,22 @@
-use crate::size::Size;
-use crate::style::{Paper, PaperClass};
+use crate::length::Length;
+use crate::paper::{Paper, PaperClass};
use super::*;
-
function! {
/// `page.size`: Set the size of pages.
#[derive(Debug, Clone, PartialEq)]
pub struct PageSizeFunc {
paper: Option<Paper>,
- extents: AxisMap<Size>,
+ extents: AxisMap<Length>,
flip: bool,
}
parse(header, body, state, f) {
body!(nope: body, f);
PageSizeFunc {
- paper: header.args.pos.get::<Paper>(&mut f.problems),
- extents: AxisMap::parse::<ExtentKey>(&mut f.problems, &mut header.args.key),
- flip: header.args.key.get::<bool>(&mut f.problems, "flip").unwrap_or(false),
+ paper: header.args.pos.get::<Paper>(&mut f.diagnostics),
+ extents: AxisMap::parse::<ExtentKey>(&mut f.diagnostics, &mut header.args.key),
+ flip: header.args.key.get::<bool>(&mut f.diagnostics, "flip").unwrap_or(false),
}
}
@@ -26,12 +25,12 @@ function! {
if let Some(paper) = self.paper {
style.class = paper.class;
- style.dimensions = paper.dimensions;
+ style.dimensions = paper.size();
} else {
style.class = PaperClass::Custom;
}
- let map = self.extents.dedup(&mut f.problems, ctx.axes);
+ let map = self.extents.dedup(&mut f.diagnostics, ctx.axes);
map.with(Horizontal, |&width| style.dimensions.x = width);
map.with(Vertical, |&height| style.dimensions.y = height);
@@ -53,13 +52,13 @@ function! {
parse(header, body, state, f) {
body!(nope: body, f);
PageMarginsFunc {
- padding: PaddingMap::parse(&mut f.problems, &mut header.args),
+ padding: PaddingMap::parse(&mut f.diagnostics, &mut header.args),
}
}
layout(self, ctx, f) {
let mut style = ctx.style.page;
- self.padding.apply(&mut f.problems, ctx.axes, &mut style.margins);
+ self.padding.apply(&mut f.diagnostics, ctx.axes, &mut style.margins);
vec![SetPageStyle(style)]
}
}