typst 0.14.2.3 → 0.15.1.0

data/LICENSE

@@ -0,0 +1,176 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS

data/README.md

@@ -193,7 +193,8 @@ Typst::clear_cache(max_age)
 
 ## Contributors & Acknowledgements
 typst-rb is based on [typst-py](https://github.com/messense/typst-py) by [messense](https://github.com/messense)\
-clear_cache was contributed by [NRicciVestmark](https://github.com/NRicciVestmark)
+clear_cache was contributed by [NRicciVestmark](https://github.com/NRicciVestmark)\
+CI improvements were contributed by [am1006](https://github.com/am1006)
 
 ## License
 

data/README.typ

@@ -201,7 +201,8 @@ Typst::clear_cache(max_age)
 
 == Contributors & Acknowledgements
 typst-rb is based on #link("https://github.com/messense/typst-py")[typst-py] by #link("https://github.com/messense")[messense]\
-clear_cache was contributed by #link("https://github.com/NRicciVestmark")[NRicciVestmark]
+clear_cache was contributed by #link("https://github.com/NRicciVestmark")[NRicciVestmark]\
+CI improvements were contributed by #link("https://github.com/am1006")[am1006]
 
 == License
 

data/ext/typst/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "typst"
-version = "0.14.2"
+version = "0.15.1"
 edition = "2021"
 
 [lib]
@@ -12,7 +12,7 @@ chrono = { version = "0.4.42", default-features = false, features = [
     "std",
 ] }
 codespan-reporting = "0.13"
-comemo = "0.5.0"
+comemo = "0.5.1"
 dirs = "5" #
 ecow = "0.2"
 env_logger = "0.10.1" #
@@ -29,18 +29,21 @@ tar = "0.4" #
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1"
 serde_yaml = "0.9"
-typst = "0.14.2"
-typst-library  = "0.14.2"
-typst-kit = { version = "0.14.2", features = [
-    "downloads",
-    "embed-fonts",
+typst = "0.15.1"
+typst-library  = "0.15.1"
+typst-kit = { version = "0.15.1", features = [
+    "embedded-fonts",
+    "scan-fonts",
+    "system-downloader",
+    "system-packages",
     "vendor-openssl",
 ] }
-typst-pdf = "0.14.2"
-typst-svg = "0.14.2"
-typst-html = "0.14.2"
-typst-render = "0.14.2"
-typst-eval = "0.14.2"
+typst-pdf = "0.15.1"
+typst-svg = "0.15.1"
+typst-html = "0.15.1"
+typst-render = "0.15.1"
+typst-eval = "0.15.1"
+typst-layout = "0.15.1"
 ureq = { version = "2", default-features = false, features = [
     "gzip",
     "socks-proxy",
@@ -49,4 +52,4 @@ walkdir = "2.4.0"
 
 # enable rb-sys feature to test against Ruby head. This is only needed if you
 # want to work with the unreleased, in-development, next version of Ruby
-rb-sys = { version = "0.9.124", default-features = false, features = ["stable-api-compiled-fallback"] }
+rb-sys = { version = "0.9.128", default-features = false, features = ["stable-api-compiled-fallback"] }

data/ext/typst/src/compiler.rs

@@ -2,11 +2,11 @@ use chrono::{Datelike, Timelike};
 use codespan_reporting::diagnostic::{Diagnostic, Label};
 use codespan_reporting::term::{self, termcolor};
 use ecow::{eco_format, EcoString};
-use typst::diag::{Severity, SourceDiagnostic, StrResult, Warned};
+use typst::diag::{At, Severity, SourceDiagnostic, StrResult, Warned};
 use typst::foundations::Datetime;
 use typst_html::HtmlDocument;
-use typst::layout::PagedDocument;
-use typst::syntax::{FileId, Lines, Span};
+use typst_layout::PagedDocument;
+use typst::syntax::{DiagSpan, FileId, Lines, Span};
 use typst::{World, WorldExt};
 
 use crate::world::SystemWorld;
@@ -20,6 +20,7 @@ impl SystemWorld {
         format: Option<&str>,
         ppi: Option<f32>,
         pdf_standards: &[typst_pdf::PdfStandard],
+        pretty: bool,
     ) -> StrResult<Vec<Vec<u8>>> {
         // Reset everything and ensure that the main file is present.
         self.reset();
@@ -30,7 +31,7 @@ impl SystemWorld {
                 let Warned { output, warnings } = typst::compile::<HtmlDocument>(self);
                 match output {
                     Ok(document) => {
-                        Ok(vec![export_html(&document, self)?])
+                        Ok(vec![export_html(&document, self, pretty)?])
                     }
                     Err(errors) => Err(format_diagnostics(self, &errors, &warnings).unwrap().into()),
                 }
@@ -45,10 +46,13 @@ impl SystemWorld {
                             "pdf" => Ok(vec![export_pdf(
                                 &document,
                                 self,
-                                typst_pdf::PdfStandards::new(pdf_standards)?,
+                                typst_pdf::PdfStandards::new(pdf_standards)
+                                    .map_err(|e| eco_format!("PDF standards error: {:?}", e))
+                                    .at(Span::detached()).unwrap(),
+                                pretty
                             )?]),
-                            "png" => Ok(export_image(&document, ImageExportFormat::Png, ppi)?),
-                            "svg" => Ok(export_image(&document, ImageExportFormat::Svg, ppi)?),
+                            "png" => Ok(export_image(&document, ImageExportFormat::Png, ppi, pretty)?),
+                            "svg" => Ok(export_image(&document, ImageExportFormat::Svg, ppi, pretty)?),
                             fmt => Err(eco_format!("unknown format: {fmt}")),
                         }
                     }
@@ -64,8 +68,9 @@ impl SystemWorld {
 fn export_html(
     document: &HtmlDocument,
     world: &SystemWorld,
+    pretty: bool,
 ) -> StrResult<Vec<u8>> {
-    let html = typst_html::html(document)
+    let html = typst_html::html(document, &typst_html::HtmlOptions{ pretty: pretty })
     .map_err(|e| match format_diagnostics(world, &e, &[]) {
         Ok(e) => EcoString::from(e),
         Err(err) => eco_format!("failed to print diagnostics ({err})"),
@@ -80,14 +85,15 @@ fn export_pdf(
     document: &PagedDocument,
     world: &SystemWorld,
     standards: typst_pdf::PdfStandards,
+    pretty: bool,
 ) -> StrResult<Vec<u8>> {
-    let ident = world.input().to_string_lossy();
     let buffer = typst_pdf::pdf(
         document,
         &typst_pdf::PdfOptions {
-            ident: typst::foundations::Smart::Custom(&ident),
+            ident: typst::foundations::Smart::Auto,
             timestamp: now().map(typst_pdf::Timestamp::new_utc),
             standards,
+            pretty,
             ..Default::default()
         },
     )
@@ -95,7 +101,7 @@ fn export_pdf(
         Ok(e) => EcoString::from(e),
         Err(err) => eco_format!("failed to print diagnostics ({err})"),
     })?;
-    Ok(buffer)
+    Ok(buffer.into())
 }
 
 /// Get the current date and time in UTC.
@@ -122,15 +128,22 @@ fn export_image(
     document: &PagedDocument,
     fmt: ImageExportFormat,
     ppi: Option<f32>,
+    pretty: bool,
 ) -> StrResult<Vec<Vec<u8>>> {
     let mut buffers = Vec::new();
-    for page in &document.pages {
+    for page in document.pages() {
         let buffer = match fmt {
-            ImageExportFormat::Png => typst_render::render(page, ppi.unwrap_or(144.0) / 72.0)
-                .encode_png()
-                .map_err(|err| eco_format!("failed to write PNG file ({err})"))?,
+            ImageExportFormat::Png => typst_render::render(
+                page,
+                &typst_render::RenderOptions {
+                    pixel_per_pt: typst::utils::Scalar::new(f64::from(ppi.unwrap_or(144.0) / 72.0)),
+                    render_bleed: false,
+                },
+            )
+            .encode_png()
+            .map_err(|err| eco_format!("failed to write PNG file ({err})"))?,
             ImageExportFormat::Svg => {
-                let svg = typst_svg::svg(page);
+                let svg = typst_svg::svg(page, &typst_svg::SvgOptions{ render_bleed: false, pretty: pretty });
                 svg.as_bytes().to_vec()
             }
         };
@@ -162,7 +175,7 @@ pub fn format_diagnostics(
             diagnostic
                 .hints
                 .iter()
-                .map(|e| (eco_format!("hint: {e}")).into())
+                .map(|e| (eco_format!("hint: {}", e.v)).into())
                 .collect(),
         )
         .with_labels(label(world, diagnostic.span).into_iter().collect());
@@ -185,7 +198,8 @@ pub fn format_diagnostics(
 }
 
 /// Create a label for a span.
-fn label(world: &SystemWorld, span: Span) -> Option<Label<FileId>> {
+fn label(world: &SystemWorld, span: impl Into<DiagSpan>) -> Option<Label<FileId>> {
+    let span = span.into();
     Some(Label::primary(span.id()?, world.range(span)?))
 }
 
@@ -196,15 +210,16 @@ impl<'a> codespan_reporting::files::Files<'a> for SystemWorld {
 
     fn name(&'a self, id: FileId) -> CodespanResult<Self::Name> {
         let vpath = id.vpath();
-        Ok(if let Some(package) = id.package() {
-            format!("{package}{}", vpath.as_rooted_path().display())
+        Ok(if let typst::syntax::VirtualRoot::Package(package) = id.root() {
+            format!("{package}{}", vpath.get_with_slash())
         } else {
             // Try to express the path relative to the working directory.
             vpath
-                .resolve(self.root())
+                .realize(self.root())
+                .ok()
                 .and_then(|abs| pathdiff::diff_paths(abs, self.workdir()))
                 .as_deref()
-                .unwrap_or_else(|| vpath.as_rootless_path())
+                .unwrap_or_else(|| std::path::Path::new(vpath.get_without_slash()))
                 .to_string_lossy()
                 .into()
         })

data/ext/typst/src/download.rs

@@ -1,19 +1,7 @@
-use std::fmt::Display;
-
-use typst_kit::download::{DownloadState, Downloader, Progress};
-
-pub struct SlientDownload<T>(pub T);
-
-impl<T: Display> Progress for SlientDownload<T> {
-    fn print_start(&mut self) {}
-
-    fn print_progress(&mut self, _state: &DownloadState) {}
-
-    fn print_finish(&mut self, _state: &DownloadState) {}
-}
+use typst_kit::downloader::{Downloader, SystemDownloader};
 
 /// Returns a new downloader.
-pub fn downloader() -> Downloader {
+pub fn downloader() -> impl Downloader {
     let user_agent = concat!("typst-rb/", env!("CARGO_PKG_VERSION"));
-    Downloader::new(user_agent)
+    SystemDownloader::new(user_agent)
 }

data/ext/typst/src/lib.rs

@@ -19,8 +19,9 @@ fn to_html(
     input: PathBuf,
     root: Option<PathBuf>,
     font_paths: Vec<PathBuf>,
-    resource_path: PathBuf,
     ignore_system_fonts: bool,
+    ignore_embedded_fonts: bool,
+    pretty: bool,
     sys_inputs: HashMap<String, String>,
 ) -> Result<Vec<Vec<u8>>, Error> {
     let input = input.canonicalize()
@@ -35,22 +36,6 @@ fn to_html(
         PathBuf::new()
     };
 
-    let resource_path = resource_path.canonicalize()
-        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
-
-    let mut default_fonts = Vec::new();
-    for entry in walkdir::WalkDir::new(resource_path.join("fonts")) {
-        let path = entry
-            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
-            .into_path();
-        let Some(extension) = path.extension() else {
-            continue;
-        };
-        if extension == "ttf" || extension == "otf" {
-            default_fonts.push(path);
-        }
-    }
-
     let mut features = Vec::new();
     features.push(Feature::Html);
 
@@ -72,11 +57,12 @@ fn to_html(
         .features(feat)
         .font_paths(font_paths)
         .ignore_system_fonts(ignore_system_fonts)
+        .ignore_embedded_fonts(ignore_embedded_fonts)
         .build()
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     let bytes = world
-        .compile(Some("html"), None, &Vec::new())
+        .compile(Some("html"), None, &Vec::new(), pretty)
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(bytes)
@@ -87,8 +73,9 @@ fn to_svg(
     input: PathBuf,
     root: Option<PathBuf>,
     font_paths: Vec<PathBuf>,
-    resource_path: PathBuf,
     ignore_system_fonts: bool,
+    ignore_embedded_fonts: bool,
+    pretty: bool,
     sys_inputs: HashMap<String, String>,
 ) -> Result<Vec<Vec<u8>>, Error> {
     let input = input.canonicalize()
@@ -103,22 +90,6 @@ fn to_svg(
         PathBuf::new()
     };
 
-    let resource_path = resource_path.canonicalize()
-        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
-
-    let mut default_fonts = Vec::new();
-    for entry in walkdir::WalkDir::new(resource_path.join("fonts")) {
-        let path = entry
-            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
-            .into_path();
-        let Some(extension) = path.extension() else {
-            continue;
-        };
-        if extension == "ttf" || extension == "otf" {
-            default_fonts.push(path);
-        }
-    }
-
     let mut world = SystemWorld::builder(root, input)
         .inputs(Dict::from_iter(
             sys_inputs
@@ -127,11 +98,12 @@ fn to_svg(
         ))
         .font_paths(font_paths)
         .ignore_system_fonts(ignore_system_fonts)
+        .ignore_embedded_fonts(ignore_embedded_fonts)
         .build()
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     let svg_bytes = world
-        .compile(Some("svg"), None, &Vec::new())
+        .compile(Some("svg"), None, &Vec::new(), pretty)
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(svg_bytes)
@@ -142,8 +114,8 @@ fn to_png(
     input: PathBuf,
     root: Option<PathBuf>,
     font_paths: Vec<PathBuf>,
-    resource_path: PathBuf,
     ignore_system_fonts: bool,
+    ignore_embedded_fonts: bool,
     sys_inputs: HashMap<String, String>,
     ppi: Option<f32>,
 ) -> Result<Vec<Vec<u8>>, Error> {
@@ -159,22 +131,6 @@ fn to_png(
         PathBuf::new()
     };
 
-    let resource_path = resource_path.canonicalize()
-        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
-
-    let mut default_fonts = Vec::new();
-    for entry in walkdir::WalkDir::new(resource_path.join("fonts")) {
-        let path = entry
-            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
-            .into_path();
-        let Some(extension) = path.extension() else {
-            continue;
-        };
-        if extension == "ttf" || extension == "otf" {
-            default_fonts.push(path);
-        }
-    }
-
     let mut world = SystemWorld::builder(root, input)
         .inputs(Dict::from_iter(
             sys_inputs
@@ -183,11 +139,12 @@ fn to_png(
         ))
         .font_paths(font_paths)
         .ignore_system_fonts(ignore_system_fonts)
+        .ignore_embedded_fonts(ignore_embedded_fonts)
         .build()
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     let bytes = world
-        .compile(Some("png"), ppi, &Vec::new())
+        .compile(Some("png"), ppi, &Vec::new(), false)
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(bytes)
@@ -198,8 +155,9 @@ fn to_pdf(
     input: PathBuf,
     root: Option<PathBuf>,
     font_paths: Vec<PathBuf>,
-    resource_path: PathBuf,
     ignore_system_fonts: bool,
+    ignore_embedded_fonts: bool,
+    pretty: bool,
     sys_inputs: HashMap<String, String>,
     pdf_standards: Vec<String>,
 ) -> Result<Vec<Vec<u8>>, Error> {
@@ -215,22 +173,6 @@ fn to_pdf(
         PathBuf::new()
     };
 
-    let resource_path = resource_path.canonicalize()
-        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
-
-    let mut default_fonts = Vec::new();
-    for entry in walkdir::WalkDir::new(resource_path.join("fonts")) {
-        let path = entry
-            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
-            .into_path();
-        let Some(extension) = path.extension() else {
-            continue;
-        };
-        if extension == "ttf" || extension == "otf" {
-            default_fonts.push(path);
-        }
-    }
-
     let mut world = SystemWorld::builder(root, input)
         .inputs(Dict::from_iter(
             sys_inputs
@@ -239,6 +181,7 @@ fn to_pdf(
         ))
         .font_paths(font_paths)
         .ignore_system_fonts(ignore_system_fonts)
+        .ignore_embedded_fonts(ignore_embedded_fonts)
         .build()
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
@@ -272,7 +215,7 @@ fn to_pdf(
     }
 
     let pdf_bytes = world
-        .compile(Some("pdf"), None, &pdf_standards_vec)
+        .compile(Some("pdf"), None, &pdf_standards_vec, pretty)
         .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
     Ok(pdf_bytes)
@@ -287,8 +230,8 @@ fn query(
     input: PathBuf,
     root: Option<PathBuf>,
     font_paths: Vec<PathBuf>,
-    resource_path: PathBuf,
     ignore_system_fonts: bool,
+    ignore_embedded_fonts: bool,
     sys_inputs: HashMap<String, String>,
 ) -> Result<String, Error> {
     let format = match format.unwrap().to_ascii_lowercase().as_str() {
@@ -309,22 +252,6 @@ fn query(
         PathBuf::new()
     };
 
-    let resource_path = resource_path.canonicalize()
-        .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?;
-
-    let mut default_fonts = Vec::new();
-    for entry in walkdir::WalkDir::new(resource_path.join("fonts")) {
-        let path = entry
-            .map_err(|err| magnus::Error::new(ruby.exception_arg_error(), err.to_string()))?
-            .into_path();
-        let Some(extension) = path.extension() else {
-            continue;
-        };
-        if extension == "ttf" || extension == "otf" {
-            default_fonts.push(path);
-        }
-    }
-
     let mut world = SystemWorld::builder(root, input)
     .inputs(Dict::from_iter(
         sys_inputs
@@ -333,6 +260,7 @@ fn query(
     ))
     .font_paths(font_paths)
     .ignore_system_fonts(ignore_system_fonts)
+    .ignore_embedded_fonts(ignore_embedded_fonts)
     .build()
     .map_err(|msg| magnus::Error::new(ruby.exception_arg_error(), msg.to_string()))?;
 
@@ -361,10 +289,10 @@ fn init(ruby: &Ruby) -> Result<(), Error> {
     env_logger::init();
 
     let module = ruby.define_module("Typst")?;
-    module.define_singleton_method("_to_pdf", function!(to_pdf, 7))?;
-    module.define_singleton_method("_to_svg", function!(to_svg, 6))?;
+    module.define_singleton_method("_to_pdf", function!(to_pdf, 8))?;
+    module.define_singleton_method("_to_svg", function!(to_svg, 7))?;
     module.define_singleton_method("_to_png", function!(to_png, 7))?;
-    module.define_singleton_method("_to_html", function!(to_html, 6))?;
+    module.define_singleton_method("_to_html", function!(to_html, 7))?;
     module.define_singleton_method("_query", function!(query, 10))?;
     module.define_singleton_method("_clear_cache", function!(clear_cache, 1))?;
     Ok(())