From 6672f8f7dfcb38bbda3ec92bdf95341c05e9a782 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sun, 4 Oct 2020 18:18:55 +0200 Subject: =?UTF-8?q?Remove=20Typesetter=20in=20favor=20of=20typeset=20funct?= =?UTF-8?q?ion=20=F0=9F=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/src/main.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'main/src') diff --git a/main/src/main.rs b/main/src/main.rs index 2a09c77c..7abef034 100644 --- a/main/src/main.rs +++ b/main/src/main.rs @@ -10,7 +10,7 @@ use futures_executor::block_on; use typstc::export::pdf; use typstc::font::FontLoader; use typstc::parse::LineMap; -use typstc::{Feedback, Pass, Typesetter}; +use typstc::{typeset, Feedback, Pass}; fn main() { let args: Vec<_> = std::env::args().collect(); @@ -41,11 +41,12 @@ fn main() { let loader = FontLoader::new(Box::new(provider), descriptors); let loader = Rc::new(RefCell::new(loader)); - let typesetter = Typesetter::new(loader.clone()); + let style = Default::default(); + let scope = typstc::library::_std(); let Pass { output: layouts, feedback: Feedback { mut diagnostics, .. }, - } = block_on(typesetter.typeset(&src)); + } = block_on(typeset(&src, &style, &scope, Rc::clone(&loader))); if !diagnostics.is_empty() { diagnostics.sort(); -- cgit v1.2.3