diff options
| author | Laurenz <laurmaedje@gmail.com> | 2019-11-18 15:10:11 +0100 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2019-11-18 15:10:11 +0100 |
| commit | 1a6fb48bc5e95d0a9ef243ab62517557189c0eea (patch) | |
| tree | 06f704fe638d5ae25f4976874500c5da75316348 /tests/layouting.rs | |
| parent | 1eb25f86dd6763c4f2d7e60b6d09af60ada50af6 (diff) | |
Page style modification functions 📜
- `page.size`
- `page.margins`
Diffstat (limited to 'tests/layouting.rs')
| -rw-r--r-- | tests/layouting.rs | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/tests/layouting.rs b/tests/layouting.rs index 27999d43..933335cc 100644 --- a/tests/layouting.rs +++ b/tests/layouting.rs @@ -9,8 +9,6 @@ use regex::{Regex, Captures}; use typst::export::pdf::PdfExporter; use typst::layout::LayoutAction; use typst::toddle::query::FileSystemFontProvider; -use typst::size::{Size, Size2D, SizeBox}; -use typst::style::PageStyle; use typst::Typesetter; const CACHE_DIR: &str = "tests/cache"; @@ -62,19 +60,12 @@ fn main() { fn test(name: &str, src: &str) { println!("Testing: {}.", name); - let (src, size) = preprocess(src); + let src = preprocess(src); let mut typesetter = Typesetter::new(); let provider = FileSystemFontProvider::from_listing("fonts/fonts.toml").unwrap(); typesetter.add_font_provider(provider.clone()); - if let Some(dimensions) = size { - typesetter.set_page_style(PageStyle { - dimensions, - margins: SizeBox::zero() - }); - } - // Make run warm. #[cfg(not(debug_assertions))] let warmup_start = Instant::now(); #[cfg(not(debug_assertions))] typesetter.typeset(&src).unwrap(); @@ -138,24 +129,11 @@ fn test(name: &str, src: &str) { exporter.export(&layouts, typesetter.loader(), file).unwrap(); } -fn preprocess<'a>(src: &'a str) -> (String, Option<Size2D>) { +fn preprocess<'a>(src: &'a str) -> String { let include_regex = Regex::new(r"\{include:((.|\.|\-)*)\}").unwrap(); let lorem_regex = Regex::new(r"\{lorem:(\d*)\}").unwrap(); - let size_regex = Regex::new(r"\{(size:(([\d\w]*)\sx\s([\d\w]*)))\}").unwrap(); - - let mut size = None; - - let mut preprocessed = size_regex.replace_all(&src, |cap: &Captures| { - let width_str = cap.get(3).unwrap().as_str(); - let height_str = cap.get(4).unwrap().as_str(); - let width = width_str.parse::<Size>().unwrap(); - let height = height_str.parse::<Size>().unwrap(); - - size = Some(Size2D::new(width, height)); - - "".to_string() - }).to_string(); + let mut preprocessed = src.to_string(); let mut changed = true; while changed { @@ -179,7 +157,7 @@ fn preprocess<'a>(src: &'a str) -> (String, Option<Size2D>) { generate_lorem(num_words) }).to_string(); - (preprocessed, size) + preprocessed } fn generate_lorem(num_words: usize) -> String { |
