caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-07-27 14:27:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add proper errors for PDFs that failed to load

Browse Source
This commit is contained in:
Laurenz Stampfl 2025-07-20 14:40:14 +02:00
parent d9fb17edb3
commit 62daf7d3ef
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/typst-library/src/visualize/image/mod.rs
View File

@ -15,6 +15,7 @@ use std::fmt::{self, Debug, Formatter};
use std::sync::Arc;
use ecow::EcoString;
use hayro_syntax::LoadPdfError;
use typst_library::{Feature, World};
use typst_syntax::{Span, Spanned};
use typst_utils::LazyHash;
@ -272,8 +273,27 @@ impl Packed<ImageElem> {
),
ImageFormat::Vector(VectorFormat::Pdf) => {
if engine.world.library().features.is_enabled(Feature::PdfEmbedding) {
let document =
PdfDocument::new(loaded.data.clone()).within(loaded)?;
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"
);
}
},
};
let page_num = self.page.get(styles);
if page_num == 0 {
@ -284,7 +304,7 @@ impl Packed<ImageElem> {
)
};
// The user provides the page number start from 1, further down the pipeline,
// The user provides the page number start from 1, but further down the pipeline,
// page numbers are 0-based.
let page_idx = page_num - 1;
let num_pages = document.len();

8
crates/typst-library/src/visualize/image/pdf.rs
View File

@ -1,7 +1,6 @@
use crate::diag::LoadResult;
use crate::foundations::Bytes;
use hayro_syntax::page::Page;
use hayro_syntax::Pdf;
use hayro_syntax::{LoadPdfError, Pdf};
use std::hash::{Hash, Hasher};
use std::sync::Arc;
@ -25,9 +24,8 @@ impl PdfDocument {
/// Load a PDF document.
#[comemo::memoize]
#[typst_macros::time(name = "load pdf document")]
pub fn new(data: Bytes) -> LoadResult<PdfDocument> {
// TODO: Remove unwraps
let pdf = Arc::new(Pdf::new(Arc::new(data.clone())).unwrap());
pub fn new(data: Bytes) -> Result<PdfDocument, LoadPdfError> {
let pdf = Arc::new(Pdf::new(Arc::new(data.clone()))?);
let standard_fonts = get_standard_fonts();
Ok(Self(Arc::new(DocumentRepr { data, pdf, standard_fonts })))