From cc35c8f6afba42567ba2dad741b38b4b0fda65a6 Mon Sep 17 00:00:00 2001
From: Laurenz Stampfl <47084093+LaurenzV@users.noreply.github.com>
Date: Tue, 17 Dec 2024 20:07:24 +0100
Subject: [PATCH] rename krilla file

---
 Cargo.lock                                     | 1 +
 Cargo.toml                                     | 7 ++++---
 crates/typst-pdf/src/{krilla.rs => convert.rs} | 3 +--
 crates/typst-pdf/src/image.rs                  | 2 +-
 crates/typst-pdf/src/lib.rs                    | 4 ++--
 crates/typst-pdf/src/link.rs                   | 2 +-
 crates/typst-pdf/src/metadata.rs               | 2 +-
 crates/typst-pdf/src/outline.rs                | 2 +-
 crates/typst-pdf/src/paint.rs                  | 2 +-
 crates/typst-pdf/src/shape.rs                  | 2 +-
 crates/typst-pdf/src/text.rs                   | 2 +-
 11 files changed, 15 insertions(+), 14 deletions(-)
 rename crates/typst-pdf/src/{krilla.rs => convert.rs} (99%)

diff --git a/Cargo.lock b/Cargo.lock
index facf3d2fe..807dd65b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1313,6 +1313,7 @@ dependencies = [
 [[package]]
 name = "krilla"
 version = "0.3.0"
+source = "git+https://github.com/LaurenzV/krilla#e1a36bf6094332f0875f507a051e7e018e8bf6cf"
 dependencies = [
  "base64",
  "bumpalo",
diff --git a/Cargo.toml b/Cargo.toml
index f4afefa43..6452ca945 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,7 +56,7 @@ dirs = "5"
 ecow = { version = "0.2", features = ["serde"] }
 env_proxy = "0.4"
 flate2 = "1"
-fontdb = { version = "0.21", default-features = false }
+fontdb = { version = "0.22", default-features = false }
 fs_extra = "1.3"
 hayagriva = "0.8"
 heck = "0.5"
@@ -70,6 +70,7 @@ if_chain = "1"
 image = { version = "0.25.2", default-features = false, features = ["png", "jpeg", "gif"] }
 indexmap = { version = "2", features = ["serde"] }
 kamadak-exif = "0.5"
+krilla = { git = "https://github.com/LaurenzV/krilla", features = ["comemo", "rayon", "svg"] }
 kurbo = "0.11"
 libfuzzer-sys = "0.4"
 lipsum = "0.9"
@@ -95,7 +96,7 @@ quote = "1"
 rayon = "1.7.0"
 regex = "1"
 regex-syntax = "0.8"
-resvg = { version = "0.43", default-features = false, features = ["raster-images"] }
+resvg = { version = "0.44", default-features = false, features = ["raster-images"] }
 roxmltree = "0.20"
 rust_decimal = { version = "1.36.0", default-features = false, features = ["maths"] }
 rustybuzz = "0.18"
@@ -131,7 +132,7 @@ unicode-script = "0.5"
 unicode-segmentation = "1"
 unscanny = "0.1"
 ureq = { version = "2", default-features = false, features = ["native-tls", "gzip", "json"] }
-usvg = { version = "0.43", default-features = false, features = ["text"] }
+usvg = { version = "0.44", default-features = false, features = ["text"] }
 walkdir = "2"
 wasmi = "0.39.0"
 xmlparser = "0.13.5"
diff --git a/crates/typst-pdf/src/krilla.rs b/crates/typst-pdf/src/convert.rs
similarity index 99%
rename from crates/typst-pdf/src/krilla.rs
rename to crates/typst-pdf/src/convert.rs
index 831c276d9..6b43b704a 100644
--- a/crates/typst-pdf/src/krilla.rs
+++ b/crates/typst-pdf/src/convert.rs
@@ -30,8 +30,7 @@ use crate::text::handle_text;
 use crate::util::{convert_path, display_font, AbsExt, TransformExt};
 use crate::PdfOptions;
 
-#[typst_macros::time(name = "write pdf")]
-pub fn pdf(
+pub fn convert(
     typst_document: &PagedDocument,
     options: &PdfOptions,
 ) -> SourceResult<Vec<u8>> {
diff --git a/crates/typst-pdf/src/image.rs b/crates/typst-pdf/src/image.rs
index 62fa601bb..608ac4036 100644
--- a/crates/typst-pdf/src/image.rs
+++ b/crates/typst-pdf/src/image.rs
@@ -10,7 +10,7 @@ use typst_library::layout::Size;
 use typst_library::visualize::{Image, ImageKind, RasterFormat, RasterImage};
 use typst_syntax::Span;
 
-use crate::krilla::{FrameContext, GlobalContext};
+use crate::convert::{FrameContext, GlobalContext};
 use crate::util::{SizeExt, TransformExt};
 
 pub(crate) fn handle_image(
diff --git a/crates/typst-pdf/src/lib.rs b/crates/typst-pdf/src/lib.rs
index e43e1acca..3929d06ab 100644
--- a/crates/typst-pdf/src/lib.rs
+++ b/crates/typst-pdf/src/lib.rs
@@ -1,7 +1,7 @@
 //! Exporting Typst documents to PDF.
 
 mod image;
-mod krilla;
+mod convert;
 mod link;
 mod metadata;
 mod outline;
@@ -23,7 +23,7 @@ pub use ::krilla::version::PdfVersion;
 /// Returns the raw bytes making up the PDF file.
 #[typst_macros::time(name = "pdf")]
 pub fn pdf(document: &PagedDocument, options: &PdfOptions) -> SourceResult<Vec<u8>> {
-    krilla::pdf(document, options)
+    convert::convert(document, options)
 }
 
 /// Settings for PDF export.
diff --git a/crates/typst-pdf/src/link.rs b/crates/typst-pdf/src/link.rs
index 4f97844e8..e03130d4c 100644
--- a/crates/typst-pdf/src/link.rs
+++ b/crates/typst-pdf/src/link.rs
@@ -5,7 +5,7 @@ use krilla::geom::Rect;
 use typst_library::layout::{Abs, Point, Size};
 use typst_library::model::Destination;
 
-use crate::krilla::{FrameContext, GlobalContext};
+use crate::convert::{FrameContext, GlobalContext};
 use crate::util::{AbsExt, PointExt};
 
 pub(crate) fn handle_link(
diff --git a/crates/typst-pdf/src/metadata.rs b/crates/typst-pdf/src/metadata.rs
index 87fcaa78f..ebdae1ccf 100644
--- a/crates/typst-pdf/src/metadata.rs
+++ b/crates/typst-pdf/src/metadata.rs
@@ -2,7 +2,7 @@ use ecow::EcoString;
 use krilla::metadata::Metadata;
 use typst_library::foundations::{Datetime, Smart};
 
-use crate::krilla::GlobalContext;
+use crate::convert::GlobalContext;
 use crate::Timezone;
 
 pub(crate) fn build_metadata(gc: &GlobalContext) -> Metadata {
diff --git a/crates/typst-pdf/src/outline.rs b/crates/typst-pdf/src/outline.rs
index 7b8443094..8839bee1f 100644
--- a/crates/typst-pdf/src/outline.rs
+++ b/crates/typst-pdf/src/outline.rs
@@ -6,7 +6,7 @@ use typst_library::foundations::{NativeElement, Packed, StyleChain};
 use typst_library::layout::Abs;
 use typst_library::model::HeadingElem;
 
-use crate::krilla::GlobalContext;
+use crate::convert::GlobalContext;
 use crate::util::AbsExt;
 
 pub(crate) fn build_outline(gc: &GlobalContext) -> Outline {
diff --git a/crates/typst-pdf/src/paint.rs b/crates/typst-pdf/src/paint.rs
index c93a134b8..b090daa4d 100644
--- a/crates/typst-pdf/src/paint.rs
+++ b/crates/typst-pdf/src/paint.rs
@@ -11,7 +11,7 @@ use typst_library::visualize::{
 };
 use typst_utils::Numeric;
 
-use crate::krilla::{handle_frame, FrameContext, GlobalContext, State};
+use crate::convert::{handle_frame, FrameContext, GlobalContext, State};
 use crate::util::{AbsExt, ColorExt, FillRuleExt, LineCapExt, LineJoinExt, TransformExt};
 
 pub(crate) fn convert_fill(
diff --git a/crates/typst-pdf/src/shape.rs b/crates/typst-pdf/src/shape.rs
index 135a2728a..500ff240c 100644
--- a/crates/typst-pdf/src/shape.rs
+++ b/crates/typst-pdf/src/shape.rs
@@ -1,4 +1,4 @@
-use crate::krilla::{FrameContext, GlobalContext};
+use crate::convert::{FrameContext, GlobalContext};
 use crate::paint;
 use crate::util::{convert_path, AbsExt, TransformExt};
 use krilla::geom::Rect;
diff --git a/crates/typst-pdf/src/text.rs b/crates/typst-pdf/src/text.rs
index 5f98cf521..f9815875c 100644
--- a/crates/typst-pdf/src/text.rs
+++ b/crates/typst-pdf/src/text.rs
@@ -10,7 +10,7 @@ use typst_library::text::{Font, Glyph, TextItem};
 use typst_library::visualize::FillRule;
 use typst_syntax::Span;
 
-use crate::krilla::{FrameContext, GlobalContext};
+use crate::convert::{FrameContext, GlobalContext};
 use crate::paint;
 use crate::util::{display_font, AbsExt, TransformExt};