Merge 476096c2db5f4d539a4cb0c4cb24e4e1a36a022e into b036fd97ab2c1cdc003b50eea7850279a1a7601f

Cargo.lock

@@ -181,9 +181,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.1"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 dependencies = [
  "serde",
 ]
@@ -214,9 +214,9 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
 
 [[package]]
 name = "bytemuck"
-version = "1.23.1"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
+checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -964,69 +964,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "hayro"
-version = "0.1.0"
-source = "git+https://github.com/LaurenzV/hayro?rev=e701f95#e701f9569157a2fe4ade68930dc9e9283782dcca"
-dependencies = [
- "bytemuck",
- "hayro-interpret",
- "image",
- "kurbo",
- "rustc-hash",
- "smallvec",
-]
-
-[[package]]
-name = "hayro-font"
-version = "0.1.0"
-source = "git+https://github.com/LaurenzV/hayro?rev=e701f95#e701f9569157a2fe4ade68930dc9e9283782dcca"
-dependencies = [
- "log",
- "phf",
-]
-
-[[package]]
-name = "hayro-interpret"
-version = "0.1.0"
-source = "git+https://github.com/LaurenzV/hayro?rev=e701f95#e701f9569157a2fe4ade68930dc9e9283782dcca"
-dependencies = [
- "bitflags 2.9.1",
- "hayro-font",
- "hayro-syntax",
- "kurbo",
- "log",
- "phf",
- "qcms",
- "skrifa",
- "smallvec",
- "yoke 0.8.0",
-]
-
-[[package]]
-name = "hayro-syntax"
-version = "0.0.1"
-source = "git+https://github.com/LaurenzV/hayro?rev=e701f95#e701f9569157a2fe4ade68930dc9e9283782dcca"
-dependencies = [
- "flate2",
- "kurbo",
- "log",
- "rustc-hash",
- "smallvec",
- "zune-jpeg",
-]
-
-[[package]]
-name = "hayro-write"
-version = "0.1.0"
-source = "git+https://github.com/LaurenzV/hayro?rev=e701f95#e701f9569157a2fe4ade68930dc9e9283782dcca"
-dependencies = [
- "flate2",
- "hayro-syntax",
- "log",
- "pdf-writer",
-]
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1263,9 +1200,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.6"
+version = "0.25.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a"
+checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -1328,7 +1265,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
  "inotify-sys",
  "libc",
 ]
@@ -1424,7 +1361,7 @@ dependencies = [
 [[package]]
 name = "krilla"
 version = "0.4.0"
-source = "git+https://github.com/LaurenzV/krilla?rev=37b9a00#37b9a00bfac87ed0b347b7cf8e9d37a6f68fcccd"
+source = "git+https://github.com/LaurenzV/krilla?rev=20c14fe#20c14fefee5002566b3d6668b338bbe2168784e7"
 dependencies = [
  "base64",
  "bumpalo",
@@ -1433,7 +1370,6 @@ dependencies = [
  "float-cmp 0.10.0",
  "fxhash",
  "gif",
- "hayro-write",
  "image-webp",
  "imagesize",
  "once_cell",
@@ -1443,7 +1379,6 @@ dependencies = [
  "rustybuzz",
  "siphasher",
  "skrifa",
- "smallvec",
  "subsetter",
  "tiny-skia-path",
  "xmp-writer",
@@ -1454,7 +1389,7 @@ dependencies = [
 [[package]]
 name = "krilla-svg"
 version = "0.1.0"
-source = "git+https://github.com/LaurenzV/krilla?rev=37b9a00#37b9a00bfac87ed0b347b7cf8e9d37a6f68fcccd"
+source = "git+https://github.com/LaurenzV/krilla?rev=20c14fe#20c14fefee5002566b3d6668b338bbe2168784e7"
 dependencies = [
  "flate2",
  "fontdb",
@@ -1467,9 +1402,9 @@ dependencies = [
 
 [[package]]
 name = "kurbo"
-version = "0.11.2"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1077d333efea6170d9ccb96d3c3026f300ca0773da4938cc4c811daa6df68b0c"
+checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f"
 dependencies = [
  "arrayvec",
  "smallvec",
@@ -1521,7 +1456,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
  "libc",
  "redox_syscall",
 ]
@@ -1687,7 +1622,7 @@ version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
  "filetime",
  "fsevent-sys",
  "inotify",
@@ -1769,7 +1704,7 @@ version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -1906,7 +1841,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ea27c5015ab81753fc61e49f8cde74999346605ee148bb20008ef3d3150e0dc"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
  "itoa",
  "memchr",
  "ryu",
@@ -2064,7 +1999,7 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
  "getopts",
  "memchr",
  "unicase",
@@ -2177,7 +2112,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
@@ -2280,7 +2215,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2299,7 +2234,7 @@ version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
  "bytemuck",
  "core_maths",
  "log",
@@ -2347,7 +2282,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2510,9 +2445,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "spin"
@@ -2920,7 +2855,7 @@ dependencies = [
 [[package]]
 name = "typst-assets"
 version = "0.13.1"
-source = "git+https://github.com/typst/typst-assets?rev=fbf00f9#fbf00f9539fdb0825bef4d39fb57d5986c51b756"
+source = "git+https://github.com/typst/typst-assets?rev=edf0d64#edf0d648376e29738a05a933af9ea99bb81557b1"
 
 [[package]]
 name = "typst-cli"
@@ -2970,7 +2905,7 @@ dependencies = [
 [[package]]
 name = "typst-dev-assets"
 version = "0.13.1"
-source = "git+https://github.com/typst/typst-dev-assets?rev=c6c2acf#c6c2acf6cdc31f99a23a478d3d614f8bf806a4f5"
+source = "git+https://github.com/typst/typst-dev-assets?rev=bfa947f#bfa947f3433d7d13a995168c40ae788a2ebfe648"
 
 [[package]]
 name = "typst-docs"
@@ -3120,7 +3055,7 @@ name = "typst-library"
 version = "0.13.1"
 dependencies = [
  "az",
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
  "bumpalo",
  "chinese-number",
  "ciborium",
@@ -3132,7 +3067,6 @@ dependencies = [
  "fontdb",
  "glidesort",
  "hayagriva",
- "hayro-syntax",
  "icu_properties",
  "icu_provider",
  "icu_provider_blob",
@@ -3231,13 +3165,11 @@ version = "0.13.1"
 dependencies = [
  "bytemuck",
  "comemo",
- "hayro",
  "image",
  "pixglyph",
  "resvg",
  "tiny-skia",
  "ttf-parser",
- "typst-assets",
  "typst-library",
  "typst-macros",
  "typst-timing",
@@ -3251,10 +3183,8 @@ dependencies = [
  "comemo",
  "ecow",
  "flate2",
- "hayro",
  "image",
  "ttf-parser",
- "typst-assets",
  "typst-library",
  "typst-macros",
  "typst-timing",
@@ -3651,7 +3581,7 @@ version = "0.221.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
  "indexmap 2.7.1",
 ]
 
@@ -3786,7 +3716,7 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.8.0",
 ]
 
 [[package]]

Cargo.toml

@@ -32,8 +32,8 @@ typst-svg = { path = "crates/typst-svg", version = "0.13.1" }
 typst-syntax = { path = "crates/typst-syntax", version = "0.13.1" }
 typst-timing = { path = "crates/typst-timing", version = "0.13.1" }
 typst-utils = { path = "crates/typst-utils", version = "0.13.1" }
-typst-assets = { git = "https://github.com/typst/typst-assets", rev = "fbf00f9" }
+typst-assets = { git = "https://github.com/typst/typst-assets", rev = "edf0d64" }
-typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", rev = "c6c2acf" }
+typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", rev = "bfa947f" }
 arrayvec = "0.7.4"
 az = "1.2"
 base64 = "0.22"
@@ -61,8 +61,6 @@ fontdb = { version = "0.23", default-features = false }
 fs_extra = "1.3"
 glidesort = "0.1.2"
 hayagriva = "0.8.1"
-hayro-syntax = { git = "https://github.com/LaurenzV/hayro", rev = "e701f95" }
-hayro = { git = "https://github.com/LaurenzV/hayro", rev = "e701f95" }
 heck = "0.5"
 hypher = "0.1.4"
 icu_properties = { version = "1.4", features = ["serde"] }
@@ -74,8 +72,8 @@ image = { version = "0.25.5", default-features = false, features = ["png", "jpeg
 indexmap = { version = "2", features = ["serde"] }
 infer = { version = "0.19.0", default-features = false }
 kamadak-exif = "0.6"
-krilla = { git = "https://github.com/LaurenzV/krilla", rev = "37b9a00", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
+krilla = { git = "https://github.com/LaurenzV/krilla", rev = "20c14fe", default-features = false, features = ["raster-images", "comemo", "rayon"] }
-krilla-svg = { git = "https://github.com/LaurenzV/krilla", rev = "37b9a00"}
+krilla-svg = { git = "https://github.com/LaurenzV/krilla", rev = "20c14fe" }
 kurbo = "0.11"
 libfuzzer-sys = "0.4"
 lipsum = "0.9"

crates/typst-library/Cargo.toml

@@ -31,7 +31,6 @@ flate2 = { workspace = true }
 fontdb = { workspace = true }
 glidesort = { workspace = true }
 hayagriva = { workspace = true }
-hayro-syntax = { workspace = true }
 icu_properties = { workspace = true }
 icu_provider = { workspace = true }
 icu_provider_blob = { workspace = true }

crates/typst-library/src/visualize/image/mod.rs

@@ -1,10 +1,8 @@
 //! Image handling.
 
-mod pdf;
 mod raster;
 mod svg;
 
-pub use self::pdf::PdfImage;
 pub use self::raster::{
     ExchangeFormat, PixelEncoding, PixelFormat, RasterFormat, RasterImage,
 };
@@ -12,15 +10,13 @@ pub use self::svg::SvgImage;
 
 use std::ffi::OsStr;
 use std::fmt::{self, Debug, Formatter};
-use std::num::NonZeroUsize;
 use std::sync::Arc;
 
 use ecow::EcoString;
-use hayro_syntax::LoadPdfError;
 use typst_syntax::{Span, Spanned};
-use typst_utils::{LazyHash, NonZeroExt};
+use typst_utils::LazyHash;
 
-use crate::diag::{At, LoadedWithin, SourceResult, StrResult, bail, warning};
+use crate::diag::{At, LoadedWithin, SourceResult, StrResult, warning};
 use crate::engine::Engine;
 use crate::foundations::{
     Bytes, Cast, Content, Derived, NativeElement, Packed, Smart, StyleChain, cast, elem,
@@ -30,7 +26,6 @@ use crate::layout::{Length, Rel, Sizing};
 use crate::loading::{DataSource, Load, LoadSource, Loaded, Readable};
 use crate::model::Figurable;
 use crate::text::{LocalName, families};
-use crate::visualize::image::pdf::PdfDocument;
 
 /// A raster or vector graphic.
 ///
@@ -84,7 +79,8 @@ pub struct ImageElem {
     /// format automatically, but that's not always possible).
     ///
     /// Supported formats are `{"png"}`, `{"jpg"}`, `{"gif"}`, `{"svg"}`,
-    /// `{"pdf"}`, `{"webp"}` as well as raw pixel data.
+    /// `{"webp"}` as well as raw pixel data. Embedding PDFs as images is
+    /// [not currently supported](https://github.com/typst/typst/issues/145).
     ///
     /// When providing raw pixel data as the `source`, you must specify a
     /// dictionary with the following keys as the `format`:
@@ -130,11 +126,6 @@ pub struct ImageElem {
     /// A text describing the image.
     pub alt: Option<EcoString>,
 
-    /// The page number that should be embedded as an image. This attribute only
-    /// has an effect for PDF files.
-    #[default(NonZeroUsize::ONE)]
-    pub page: NonZeroUsize,
-
     /// How the image should adjust itself to a given area (the area is defined
     /// by the `width` and `height` fields). Note that `fit` doesn't visually
     /// change anything if the area's aspect ratio is the same as the image's
@@ -270,45 +261,6 @@ impl Packed<ImageElem> {
                 )
                 .within(loaded)?,
             ),
-            ImageFormat::Vector(VectorFormat::Pdf) => {
-                let document = match PdfDocument::new(loaded.data.clone()) {
-                    Ok(doc) => doc,
-                    Err(e) => match e {
-                        LoadPdfError::Encryption => {
-                            bail!(
-                                span,
-                                "the PDF is encrypted or password-protected";
-                                hint: "such PDFs are currently not supported";
-                                hint: "preprocess the PDF to remove the encryption"
-                            );
-                        }
-                        LoadPdfError::Invalid => {
-                            bail!(
-                                span,
-                                "the PDF could not be loaded";
-                                hint: "perhaps the PDF file is malformed"
-                            );
-                        }
-                    },
-                };
-
-                // The user provides the page number start from 1, but further
-                // down the pipeline, page numbers are 0-based.
-                let page_num = self.page.get(styles).get();
-                let page_idx = page_num - 1;
-                let num_pages = document.num_pages();
-
-                let Some(pdf_image) = PdfImage::new(document, page_idx) else {
-                    let s = if num_pages == 1 { "" } else { "s" };
-                    bail!(
-                        span,
-                        "page {page_num} does not exist";
-                        hint: "the document only has {num_pages} page{s}"
-                    );
-                };
-
-                ImageKind::Pdf(pdf_image)
-            }
         };
 
         Ok(Image::new(kind, self.alt.get_cloned(styles), self.scaling.get(styles)))
@@ -334,7 +286,6 @@ impl Packed<ImageElem> {
                 "jpg" | "jpeg" => return Ok(ExchangeFormat::Jpg.into()),
                 "gif" => return Ok(ExchangeFormat::Gif.into()),
                 "svg" | "svgz" => return Ok(VectorFormat::Svg.into()),
-                "pdf" => return Ok(VectorFormat::Pdf.into()),
                 "webp" => return Ok(ExchangeFormat::Webp.into()),
                 _ => {}
             }
@@ -422,7 +373,6 @@ impl Image {
         match &self.0.kind {
             ImageKind::Raster(raster) => raster.format().into(),
             ImageKind::Svg(_) => VectorFormat::Svg.into(),
-            ImageKind::Pdf(_) => VectorFormat::Pdf.into(),
         }
     }
 
@@ -431,7 +381,6 @@ impl Image {
         match &self.0.kind {
             ImageKind::Raster(raster) => raster.width() as f64,
             ImageKind::Svg(svg) => svg.width(),
-            ImageKind::Pdf(pdf) => pdf.width() as f64,
         }
     }
 
@@ -440,7 +389,6 @@ impl Image {
         match &self.0.kind {
             ImageKind::Raster(raster) => raster.height() as f64,
             ImageKind::Svg(svg) => svg.height(),
-            ImageKind::Pdf(pdf) => pdf.height() as f64,
         }
     }
 
@@ -449,7 +397,6 @@ impl Image {
         match &self.0.kind {
             ImageKind::Raster(raster) => raster.dpi(),
             ImageKind::Svg(_) => Some(Image::USVG_DEFAULT_DPI),
-            ImageKind::Pdf(_) => Some(Image::DEFAULT_DPI),
         }
     }
 
@@ -488,8 +435,6 @@ pub enum ImageKind {
     Raster(RasterImage),
     /// An SVG image.
     Svg(SvgImage),
-    /// A PDF image.
-    Pdf(PdfImage),
 }
 
 impl From<RasterImage> for ImageKind {
@@ -524,20 +469,10 @@ impl ImageFormat {
             return Some(Self::Vector(VectorFormat::Svg));
         }
 
-        if is_pdf(data) {
-            return Some(Self::Vector(VectorFormat::Pdf));
-        }
-
         None
     }
 }
 
-/// Checks whether the data looks like a PDF file.
-fn is_pdf(data: &[u8]) -> bool {
-    let head = &data[..data.len().min(2048)];
-    memchr::memmem::find(head, b"%PDF-").is_some()
-}
-
 /// Checks whether the data looks like an SVG or a compressed SVG.
 fn is_svg(data: &[u8]) -> bool {
     // Check for the gzip magic bytes. This check is perhaps a bit too
@@ -558,9 +493,6 @@ fn is_svg(data: &[u8]) -> bool {
 pub enum VectorFormat {
     /// The vector graphics format of the web.
     Svg,
-    /// High-fidelity document and graphics format, with focus on exact
-    /// reproduction in print.
-    Pdf,
 }
 
 impl<R> From<R> for ImageFormat

crates/typst-library/src/visualize/image/pdf.rs

@@ -1,98 +0,0 @@
-use std::hash::{Hash, Hasher};
-use std::sync::Arc;
-
-use hayro_syntax::page::Page;
-use hayro_syntax::{LoadPdfError, Pdf};
-
-use crate::foundations::Bytes;
-
-/// A PDF document.
-#[derive(Clone, Hash)]
-pub struct PdfDocument(Arc<DocumentRepr>);
-
-/// The internal representation of a `PdfDocument`.
-struct DocumentRepr {
-    pdf: Arc<Pdf>,
-    data: Bytes,
-}
-
-impl PdfDocument {
-    /// Loads a PDF document.
-    #[comemo::memoize]
-    #[typst_macros::time(name = "load pdf document")]
-    pub fn new(data: Bytes) -> Result<PdfDocument, LoadPdfError> {
-        let pdf = Arc::new(Pdf::new(Arc::new(data.clone()))?);
-        Ok(Self(Arc::new(DocumentRepr { data, pdf })))
-    }
-
-    /// Returns the underlying PDF document.
-    pub fn pdf(&self) -> &Arc<Pdf> {
-        &self.0.pdf
-    }
-
-    /// Return the number of pages in the PDF.
-    pub fn num_pages(&self) -> usize {
-        self.0.pdf.pages().len()
-    }
-}
-
-impl Hash for DocumentRepr {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.data.hash(state);
-    }
-}
-
-/// A specific page of a PDF acting as an image.
-#[derive(Clone, Hash)]
-pub struct PdfImage(Arc<ImageRepr>);
-
-/// The internal representation of a `PdfImage`.
-struct ImageRepr {
-    document: PdfDocument,
-    page_index: usize,
-    width: f32,
-    height: f32,
-}
-
-impl PdfImage {
-    /// Creates a new PDF image.
-    ///
-    /// Returns `None` if the page index is not valid.
-    #[comemo::memoize]
-    pub fn new(document: PdfDocument, page_index: usize) -> Option<PdfImage> {
-        let (width, height) = document.0.pdf.pages().get(page_index)?.render_dimensions();
-        Some(Self(Arc::new(ImageRepr { document, page_index, width, height })))
-    }
-
-    /// Returns the underlying Typst PDF document.
-    pub fn document(&self) -> &PdfDocument {
-        &self.0.document
-    }
-
-    /// Returns the PDF page of the image.
-    pub fn page(&self) -> &Page {
-        &self.document().pdf().pages()[self.0.page_index]
-    }
-
-    /// Returns the width of the image.
-    pub fn width(&self) -> f32 {
-        self.0.width
-    }
-
-    /// Returns the height of the image.
-    pub fn height(&self) -> f32 {
-        self.0.height
-    }
-
-    /// Returns the page index of the image.
-    pub fn page_index(&self) -> usize {
-        self.0.page_index
-    }
-}
-
-impl Hash for ImageRepr {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.document.hash(state);
-        self.page_index.hash(state);
-    }
-}

crates/typst-pdf/src/convert.rs

@@ -9,7 +9,6 @@ use krilla::embed::EmbedError;
 use krilla::error::KrillaError;
 use krilla::geom::PathBuilder;
 use krilla::page::{PageLabel, PageSettings};
-use krilla::pdf::PdfError;
 use krilla::surface::Surface;
 use krilla::{Document, SerializeSettings};
 use krilla_svg::render_svg_glyph;
@@ -364,42 +363,6 @@ fn finish(
                     hint: "convert the image to 8 bit instead"
                 )
             }
-            KrillaError::Pdf(_, e, loc) => {
-                let span = to_span(loc);
-                match e {
-                    // We already validated in `typst-library` that the page index is valid.
-                    PdfError::InvalidPage(_) => bail!(
-                        span,
-                        "invalid page number for PDF file";
-                        hint: "please report this as a bug"
-                    ),
-                    PdfError::VersionMismatch(v) => {
-                        let pdf_ver = v.as_str();
-                        let config_ver = configuration.version();
-                        let cur_ver = config_ver.as_str();
-                        bail!(span,
-                            "the version of the PDF is too high";
-                            hint: "the current export target is {cur_ver}, while the PDF has version {pdf_ver}";
-                            hint: "raise the export target to {pdf_ver} or higher";
-                            hint: "or preprocess the PDF to convert it to a lower version"
-                        );
-                    }
-                }
-            }
-            KrillaError::DuplicateTagId(_, loc) => {
-                let span = to_span(loc);
-                bail!(span,
-                    "duplicate tag id";
-                    hint: "please report this as a bug"
-                );
-            }
-            KrillaError::UnknownTagId(_, loc) => {
-                let span = to_span(loc);
-                bail!(span,
-                    "unknown tag id";
-                    hint: "please report this as a bug"
-                );
-            }
         },
     }
 }
@@ -572,12 +535,12 @@ fn convert_error(
         }
         // The below errors cannot occur yet, only once Typst supports full PDF/A
         // and PDF/UA. But let's still add a message just to be on the safe side.
-        ValidationError::MissingAnnotationAltText(_) => error!(
+        ValidationError::MissingAnnotationAltText => error!(
             Span::detached(),
             "{prefix} missing annotation alt text";
             hint: "please report this as a bug"
         ),
-        ValidationError::MissingAltText(_) => error!(
+        ValidationError::MissingAltText => error!(
             Span::detached(),
             "{prefix} missing alt text";
             hint: "make sure your images and equations have alt text"
@@ -613,13 +576,6 @@ fn convert_error(
             "{prefix} missing document date";
             hint: "set the date of the document"
         ),
-        ValidationError::EmbeddedPDF(loc) => {
-            error!(
-                to_span(*loc),
-                "embedding PDFs is currently not supported in this export mode";
-                hint: "try converting the PDF to an SVG before embedding it"
-            )
-        }
     }
 }
 

crates/typst-pdf/src/image.rs

@@ -3,14 +3,13 @@ use std::sync::{Arc, OnceLock};
 
 use image::{DynamicImage, EncodableLayout, GenericImageView, Rgba};
 use krilla::image::{BitsPerComponent, CustomImage, ImageColorspace};
-use krilla::pdf::PdfDocument;
 use krilla::surface::Surface;
 use krilla_svg::{SurfaceExt, SvgSettings};
 use typst_library::diag::{SourceResult, bail};
 use typst_library::foundations::Smart;
 use typst_library::layout::{Abs, Angle, Ratio, Size, Transform};
 use typst_library::visualize::{
-    ExchangeFormat, Image, ImageKind, ImageScaling, PdfImage, RasterFormat, RasterImage,
+    ExchangeFormat, Image, ImageKind, ImageScaling, RasterFormat, RasterImage,
 };
 use typst_syntax::Span;
 
@@ -61,9 +60,6 @@ pub(crate) fn handle_image(
                 SvgSettings { embed_text: true, ..Default::default() },
             );
         }
-        ImageKind::Pdf(pdf) => {
-            surface.draw_pdf_page(&convert_pdf(pdf), size.to_krilla(), pdf.page_index())
-        }
     }
 
     if image.alt().is_some() {
@@ -89,9 +85,9 @@ struct Repr {
 
 /// A wrapper around `RasterImage` so that we can implement `CustomImage`.
 #[derive(Clone)]
-struct PdfRasterImage(Arc<Repr>);
+struct PdfImage(Arc<Repr>);
 
-impl PdfRasterImage {
+impl PdfImage {
     pub fn new(raster: RasterImage) -> Self {
         Self(Arc::new(Repr {
             raster,
@@ -101,7 +97,7 @@ impl PdfRasterImage {
     }
 }
 
-impl Hash for PdfRasterImage {
+impl Hash for PdfImage {
     fn hash<H: Hasher>(&self, state: &mut H) {
         // `alpha_channel` and `actual_dynamic` are generated from the underlying `RasterImage`,
         // so this is enough. Since `raster` is prehashed, this is also very cheap.
@@ -109,7 +105,7 @@ impl Hash for PdfRasterImage {
     }
 }
 
-impl CustomImage for PdfRasterImage {
+impl CustomImage for PdfImage {
     fn color_channel(&self) -> &[u8] {
         self.0
             .actual_dynamic
@@ -200,15 +196,10 @@ fn convert_raster(
             interpolate,
         )
     } else {
-        krilla::image::Image::from_custom(PdfRasterImage::new(raster), interpolate)
+        krilla::image::Image::from_custom(PdfImage::new(raster), interpolate)
     }
 }
 
-#[comemo::memoize]
-fn convert_pdf(pdf: &PdfImage) -> PdfDocument {
-    PdfDocument::new(pdf.document().pdf().clone())
-}
-
 fn exif_transform(image: &RasterImage, size: Size) -> (Transform, Size) {
     let base = |hp: bool, vp: bool, mut base_ts: Transform, size: Size| {
         if hp {

crates/typst-pdf/src/link.rs

@@ -49,6 +49,7 @@ pub(crate) fn handle_link(
             fc.push_annotation(
                 LinkAnnotation::new(
                     rect,
+                    None,
                     Target::Action(Action::Link(LinkAction::new(u.to_string()))),
                 )
                 .into(),
@@ -63,6 +64,7 @@ pub(crate) fn handle_link(
                 fc.push_annotation(
                     LinkAnnotation::new(
                         rect,
+                        None,
                         Target::Destination(krilla::destination::Destination::Named(
                             nd.clone(),
                         )),
@@ -81,6 +83,7 @@ pub(crate) fn handle_link(
         fc.push_annotation(
             LinkAnnotation::new(
                 rect,
+                None,
                 Target::Destination(krilla::destination::Destination::Xyz(
                     XyzDestination::new(index, pos.point.to_krilla()),
                 )),

crates/typst-render/Cargo.toml

@@ -13,13 +13,11 @@ keywords = { workspace = true }
 readme = { workspace = true }
 
 [dependencies]
-typst-assets = { workspace = true }
 typst-library = { workspace = true }
 typst-macros = { workspace = true }
 typst-timing = { workspace = true }
 bytemuck = { workspace = true }
 comemo = { workspace = true }
-hayro = { workspace = true }
 image = { workspace = true }
 pixglyph = { workspace = true }
 resvg = { workspace = true }

crates/typst-render/src/image.rs

@@ -1,12 +1,11 @@
-use hayro::{FontData, FontQuery, InterpreterSettings, RenderSettings, StandardFont};
+use std::sync::Arc;
+
 use image::imageops::FilterType;
 use image::{GenericImageView, Rgba};
-use std::sync::Arc;
 use tiny_skia as sk;
-use tiny_skia::IntSize;
 use typst_library::foundations::Smart;
 use typst_library::layout::Size;
-use typst_library::visualize::{Image, ImageKind, ImageScaling, PdfImage};
+use typst_library::visualize::{Image, ImageKind, ImageScaling};
 
 use crate::{AbsExt, State};
 
@@ -60,9 +59,9 @@ pub fn render_image(
 /// Prepare a texture for an image at a scaled size.
 #[comemo::memoize]
 fn build_texture(image: &Image, w: u32, h: u32) -> Option<Arc<sk::Pixmap>> {
-    let texture = match image.kind() {
+    let mut texture = sk::Pixmap::new(w, h)?;
+    match image.kind() {
         ImageKind::Raster(raster) => {
-            let mut texture = sk::Pixmap::new(w, h)?;
             let w = texture.width();
             let h = texture.height();
 
@@ -86,63 +85,15 @@ fn build_texture(image: &Image, w: u32, h: u32) -> Option<Arc<sk::Pixmap>> {
                 let Rgba([r, g, b, a]) = src;
                 *dest = sk::ColorU8::from_rgba(r, g, b, a).premultiply();
             }
-
-            texture
         }
         ImageKind::Svg(svg) => {
-            let mut texture = sk::Pixmap::new(w, h)?;
             let tree = svg.tree();
             let ts = tiny_skia::Transform::from_scale(
                 w as f32 / tree.size().width(),
                 h as f32 / tree.size().height(),
             );
             resvg::render(tree, ts, &mut texture.as_mut());
-            texture
         }
-        ImageKind::Pdf(pdf) => build_pdf_texture(pdf, w, h)?,
+    }
-    };
-
     Some(Arc::new(texture))
 }
-
-// Keep this in sync with `typst-svg`!
-fn build_pdf_texture(pdf: &PdfImage, w: u32, h: u32) -> Option<sk::Pixmap> {
-    let select_standard_font = move |font: StandardFont| -> Option<(FontData, u32)> {
-        let bytes = match font {
-            StandardFont::Helvetica => typst_assets::pdf::SANS,
-            StandardFont::HelveticaBold => typst_assets::pdf::SANS_BOLD,
-            StandardFont::HelveticaOblique => typst_assets::pdf::SANS_ITALIC,
-            StandardFont::HelveticaBoldOblique => typst_assets::pdf::SANS_BOLD_ITALIC,
-            StandardFont::Courier => typst_assets::pdf::FIXED,
-            StandardFont::CourierBold => typst_assets::pdf::FIXED_BOLD,
-            StandardFont::CourierOblique => typst_assets::pdf::FIXED_ITALIC,
-            StandardFont::CourierBoldOblique => typst_assets::pdf::FIXED_BOLD_ITALIC,
-            StandardFont::TimesRoman => typst_assets::pdf::SERIF,
-            StandardFont::TimesBold => typst_assets::pdf::SERIF_BOLD,
-            StandardFont::TimesItalic => typst_assets::pdf::SERIF_ITALIC,
-            StandardFont::TimesBoldItalic => typst_assets::pdf::SERIF_BOLD_ITALIC,
-            StandardFont::ZapfDingBats => typst_assets::pdf::DING_BATS,
-            StandardFont::Symbol => typst_assets::pdf::SYMBOL,
-        };
-        Some((Arc::new(bytes), 0))
-    };
-
-    let interpreter_settings = InterpreterSettings {
-        font_resolver: Arc::new(move |query| match query {
-            FontQuery::Standard(s) => select_standard_font(*s),
-            FontQuery::Fallback(f) => select_standard_font(f.pick_standard_font()),
-        }),
-        warning_sink: Arc::new(|_| {}),
-    };
-
-    let render_settings = RenderSettings {
-        x_scale: w as f32 / pdf.width(),
-        y_scale: h as f32 / pdf.height(),
-        width: Some(w as u16),
-        height: Some(h as u16),
-    };
-
-    let hayro_pix = hayro::render(pdf.page(), &interpreter_settings, &render_settings);
-
-    sk::Pixmap::from_vec(hayro_pix.take_u8(), IntSize::from_wh(w, h)?)
-}

crates/typst-svg/Cargo.toml

@@ -13,7 +13,6 @@ keywords = { workspace = true }
 readme = { workspace = true }
 
 [dependencies]
-typst-assets = { workspace = true }
 typst-library = { workspace = true }
 typst-macros = { workspace = true }
 typst-timing = { workspace = true }
@@ -22,7 +21,6 @@ base64 = { workspace = true }
 comemo = { workspace = true }
 ecow = { workspace = true }
 flate2 = { workspace = true }
-hayro = { workspace = true }
 image = { workspace = true }
 ttf-parser = { workspace = true }
 xmlparser = { workspace = true }

crates/typst-svg/src/image.rs

@@ -1,13 +1,10 @@
-use std::sync::Arc;
-
 use base64::Engine;
 use ecow::{EcoString, eco_format};
-use hayro::{FontData, FontQuery, InterpreterSettings, RenderSettings, StandardFont};
 use image::{ImageEncoder, codecs::png::PngEncoder};
 use typst_library::foundations::Smart;
 use typst_library::layout::{Abs, Axes};
 use typst_library::visualize::{
-    ExchangeFormat, Image, ImageKind, ImageScaling, PdfImage, RasterFormat,
+    ExchangeFormat, Image, ImageKind, ImageScaling, RasterFormat,
 };
 
 use crate::SVGRenderer;
@@ -69,25 +66,6 @@ pub fn convert_image_to_base64_url(image: &Image) -> EcoString {
             }),
         },
         ImageKind::Svg(svg) => ("svg+xml", svg.data()),
-        ImageKind::Pdf(pdf) => {
-            // To make sure the image isn't pixelated, we always scale up so the
-            // lowest dimension has at least 1000 pixels. However, we only scale
-            // up as much so that the largest dimension doesn't exceed 3000
-            // pixels.
-            const MIN_RES: f32 = 1000.0;
-            const MAX_RES: f32 = 3000.0;
-
-            let base_width = pdf.width();
-            let w_scale = (MIN_RES / base_width).max(MAX_RES / base_width);
-            let base_height = pdf.height();
-            let h_scale = (MIN_RES / base_height).min(MAX_RES / base_height);
-            let total_scale = w_scale.min(h_scale);
-            let width = (base_width * total_scale).ceil() as u32;
-            let height = (base_height * total_scale).ceil() as u32;
-
-            buf = pdf_to_png(pdf, width, height);
-            ("png", buf.as_slice())
-        }
     };
 
     let mut url = eco_format!("data:image/{format};base64,");
@@ -95,45 +73,3 @@ pub fn convert_image_to_base64_url(image: &Image) -> EcoString {
     url.push_str(&data);
     url
 }
-
-// Keep this in sync with `typst-png`!
-fn pdf_to_png(pdf: &PdfImage, w: u32, h: u32) -> Vec<u8> {
-    let select_standard_font = move |font: StandardFont| -> Option<(FontData, u32)> {
-        let bytes = match font {
-            StandardFont::Helvetica => typst_assets::pdf::SANS,
-            StandardFont::HelveticaBold => typst_assets::pdf::SANS_BOLD,
-            StandardFont::HelveticaOblique => typst_assets::pdf::SANS_ITALIC,
-            StandardFont::HelveticaBoldOblique => typst_assets::pdf::SANS_BOLD_ITALIC,
-            StandardFont::Courier => typst_assets::pdf::FIXED,
-            StandardFont::CourierBold => typst_assets::pdf::FIXED_BOLD,
-            StandardFont::CourierOblique => typst_assets::pdf::FIXED_ITALIC,
-            StandardFont::CourierBoldOblique => typst_assets::pdf::FIXED_BOLD_ITALIC,
-            StandardFont::TimesRoman => typst_assets::pdf::SERIF,
-            StandardFont::TimesBold => typst_assets::pdf::SERIF_BOLD,
-            StandardFont::TimesItalic => typst_assets::pdf::SERIF_ITALIC,
-            StandardFont::TimesBoldItalic => typst_assets::pdf::SERIF_BOLD_ITALIC,
-            StandardFont::ZapfDingBats => typst_assets::pdf::DING_BATS,
-            StandardFont::Symbol => typst_assets::pdf::SYMBOL,
-        };
-        Some((Arc::new(bytes), 0))
-    };
-
-    let interpreter_settings = InterpreterSettings {
-        font_resolver: Arc::new(move |query| match query {
-            FontQuery::Standard(s) => select_standard_font(*s),
-            FontQuery::Fallback(f) => select_standard_font(f.pick_standard_font()),
-        }),
-        warning_sink: Arc::new(|_| {}),
-    };
-
-    let render_settings = RenderSettings {
-        x_scale: w as f32 / pdf.width(),
-        y_scale: h as f32 / pdf.height(),
-        width: Some(w as u16),
-        height: Some(h as u16),
-    };
-
-    let hayro_pix = hayro::render(pdf.page(), &interpreter_settings, &render_settings);
-
-    hayro_pix.take_png()
-}

docs/guides/guide-for-latex-users.md

@@ -665,3 +665,12 @@ applicable, contains possible workarounds.
   [`page` function]($page) which will force a page break. If you just want a few
   paragraphs to stretch into the margins, then reverting to the old margins, you
   can use the [`pad` function]($pad) with negative padding.
+
+- **Include PDFs as images.** In LaTeX, it has become customary to insert vector
+  graphics as PDF or EPS files. Typst supports neither format as an image
+  format, but you can easily convert both into SVG files with [online
+  tools](https://cloudconvert.com/pdf-to-svg) or
+  [Inkscape](https://inkscape.org/). The web app will automatically convert PDF
+  files to SVG files upon uploading them. You can also use the
+  community-provided [`muchpdf` package](https://typst.app/universe/package/muchpdf)
+  to embed PDFs. It internally converts PDFs to SVGs on-the-fly.

tests/suite/visualize/image.typ

@@ -258,7 +258,7 @@ A #box(image("/assets/images/tiger.jpg", height: 1cm, width: 80%)) B
 --- image-png-but-pixmap-format ---
 #image(
   read("/assets/images/tiger.jpg", encoding: none),
-  // Error: 11-18 expected "png", "jpg", "gif", "webp", dictionary, "svg", "pdf", or auto
+  // Error: 11-18 expected "png", "jpg", "gif", "webp", dictionary, "svg", or auto
   format: "rgba8",
 )
 
@@ -289,16 +289,3 @@ A #box(image("/assets/images/tiger.jpg", height: 1cm, width: 80%)) B
   ..rotations.map(v => raw(str(v), lang: "typc")),
   ..rotations.map(rotated)
 )
-
---- image-pdf ---
-#image("/assets/images/matplotlib.pdf")
-
---- image-pdf-multiple-pages ---
-#image("/assets/images/diagrams.pdf", page: 1)
-#image("/assets/images/diagrams.pdf", page: 3)
-#image("/assets/images/diagrams.pdf", page: 2)
-
---- image-pdf-invalid-page ---
-// Error: 2-49 page 2 does not exist
-// Hint: 2-49 the document only has 1 page
-#image("/assets/images/matplotlib.pdf", page: 2)