mirror of
https://github.com/typst/typst
synced 2025-07-27 14:27:56 +08:00
Compare commits
8 Commits
f93907a24f
...
a253106bfd
| Author | SHA1 | Date | |
|---|---|---|---|
|
a253106bfd | ||
|
af2253ba16 | ||
|
476096c2db | ||
|
|
fd35268a88 | ||
|
|
3fba007c13 | ||
|
|
7dd3523044 | ||
|
|
0160bf1547 | ||
|
|
4d8a9863d7 |
126
Cargo.lock
generated
126
Cargo.lock
generated
@ -181,9 +181,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.8.0"
|
||||
version = "2.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
|
||||
checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
@ -214,9 +214,9 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.21.0"
|
||||
version = "1.23.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
|
||||
checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
|
||||
dependencies = [
|
||||
"bytemuck_derive",
|
||||
]
|
||||
@ -413,7 +413,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "codex"
|
||||
version = "0.1.1"
|
||||
source = "git+https://github.com/typst/codex?rev=9ac86f9#9ac86f96af5b89fce555e6bba8b6d1ac7b44ef00"
|
||||
source = "git+https://github.com/typst/codex?rev=775d828#775d82873c3f74ce95ec2621f8541de1b48778a7"
|
||||
|
||||
[[package]]
|
||||
name = "color-print"
|
||||
@ -964,6 +964,69 @@ 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"
|
||||
@ -1200,9 +1263,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "image"
|
||||
version = "0.25.5"
|
||||
version = "0.25.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
|
||||
checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"byteorder-lite",
|
||||
@ -1265,7 +1328,7 @@ version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
"inotify-sys",
|
||||
"libc",
|
||||
]
|
||||
@ -1361,7 +1424,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "krilla"
|
||||
version = "0.4.0"
|
||||
source = "git+https://github.com/LaurenzV/krilla?rev=20c14fe#20c14fefee5002566b3d6668b338bbe2168784e7"
|
||||
source = "git+https://github.com/LaurenzV/krilla?rev=37b9a00#37b9a00bfac87ed0b347b7cf8e9d37a6f68fcccd"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"bumpalo",
|
||||
@ -1370,6 +1433,7 @@ dependencies = [
|
||||
"float-cmp 0.10.0",
|
||||
"fxhash",
|
||||
"gif",
|
||||
"hayro-write",
|
||||
"image-webp",
|
||||
"imagesize",
|
||||
"once_cell",
|
||||
@ -1379,6 +1443,7 @@ dependencies = [
|
||||
"rustybuzz",
|
||||
"siphasher",
|
||||
"skrifa",
|
||||
"smallvec",
|
||||
"subsetter",
|
||||
"tiny-skia-path",
|
||||
"xmp-writer",
|
||||
@ -1389,7 +1454,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "krilla-svg"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/LaurenzV/krilla?rev=20c14fe#20c14fefee5002566b3d6668b338bbe2168784e7"
|
||||
source = "git+https://github.com/LaurenzV/krilla?rev=37b9a00#37b9a00bfac87ed0b347b7cf8e9d37a6f68fcccd"
|
||||
dependencies = [
|
||||
"flate2",
|
||||
"fontdb",
|
||||
@ -1402,9 +1467,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "kurbo"
|
||||
version = "0.11.1"
|
||||
version = "0.11.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f"
|
||||
checksum = "1077d333efea6170d9ccb96d3c3026f300ca0773da4938cc4c811daa6df68b0c"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"smallvec",
|
||||
@ -1456,7 +1521,7 @@ version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
]
|
||||
@ -1622,7 +1687,7 @@ version = "8.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
"filetime",
|
||||
"fsevent-sys",
|
||||
"inotify",
|
||||
@ -1704,7 +1769,7 @@ version = "0.10.72"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
"cfg-if",
|
||||
"foreign-types",
|
||||
"libc",
|
||||
@ -1841,7 +1906,7 @@ version = "0.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3ea27c5015ab81753fc61e49f8cde74999346605ee148bb20008ef3d3150e0dc"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
"itoa",
|
||||
"memchr",
|
||||
"ryu",
|
||||
@ -1999,7 +2064,7 @@ version = "0.9.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
"getopts",
|
||||
"memchr",
|
||||
"unicase",
|
||||
@ -2112,7 +2177,7 @@ version = "0.5.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2215,7 +2280,7 @@ version = "0.38.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
@ -2234,7 +2299,7 @@ version = "0.20.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
"bytemuck",
|
||||
"core_maths",
|
||||
"log",
|
||||
@ -2282,7 +2347,7 @@ version = "2.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
"core-foundation",
|
||||
"core-foundation-sys",
|
||||
"libc",
|
||||
@ -2445,9 +2510,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.13.2"
|
||||
version = "1.15.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
|
||||
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
|
||||
|
||||
[[package]]
|
||||
name = "spin"
|
||||
@ -2855,7 +2920,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "typst-assets"
|
||||
version = "0.13.1"
|
||||
source = "git+https://github.com/typst/typst-assets?rev=edf0d64#edf0d648376e29738a05a933af9ea99bb81557b1"
|
||||
source = "git+https://github.com/typst/typst-assets?rev=fbf00f9#fbf00f9539fdb0825bef4d39fb57d5986c51b756"
|
||||
|
||||
[[package]]
|
||||
name = "typst-cli"
|
||||
@ -2905,7 +2970,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "typst-dev-assets"
|
||||
version = "0.13.1"
|
||||
source = "git+https://github.com/typst/typst-dev-assets?rev=bfa947f#bfa947f3433d7d13a995168c40ae788a2ebfe648"
|
||||
source = "git+https://github.com/typst/typst-dev-assets?rev=c6c2acf#c6c2acf6cdc31f99a23a478d3d614f8bf806a4f5"
|
||||
|
||||
[[package]]
|
||||
name = "typst-docs"
|
||||
@ -3055,7 +3120,7 @@ name = "typst-library"
|
||||
version = "0.13.1"
|
||||
dependencies = [
|
||||
"az",
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
"bumpalo",
|
||||
"chinese-number",
|
||||
"ciborium",
|
||||
@ -3067,6 +3132,7 @@ dependencies = [
|
||||
"fontdb",
|
||||
"glidesort",
|
||||
"hayagriva",
|
||||
"hayro-syntax",
|
||||
"icu_properties",
|
||||
"icu_provider",
|
||||
"icu_provider_blob",
|
||||
@ -3165,11 +3231,13 @@ version = "0.13.1"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"comemo",
|
||||
"hayro",
|
||||
"image",
|
||||
"pixglyph",
|
||||
"resvg",
|
||||
"tiny-skia",
|
||||
"ttf-parser",
|
||||
"typst-assets",
|
||||
"typst-library",
|
||||
"typst-macros",
|
||||
"typst-timing",
|
||||
@ -3183,8 +3251,10 @@ dependencies = [
|
||||
"comemo",
|
||||
"ecow",
|
||||
"flate2",
|
||||
"hayro",
|
||||
"image",
|
||||
"ttf-parser",
|
||||
"typst-assets",
|
||||
"typst-library",
|
||||
"typst-macros",
|
||||
"typst-timing",
|
||||
@ -3581,7 +3651,7 @@ version = "0.221.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
"indexmap 2.7.1",
|
||||
]
|
||||
|
||||
@ -3716,7 +3786,7 @@ version = "0.33.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"bitflags 2.9.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
12
Cargo.toml
12
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 = "edf0d64" }
|
||||
typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", rev = "bfa947f" }
|
||||
typst-assets = { git = "https://github.com/typst/typst-assets", rev = "fbf00f9" }
|
||||
typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", rev = "c6c2acf" }
|
||||
arrayvec = "0.7.4"
|
||||
az = "1.2"
|
||||
base64 = "0.22"
|
||||
@ -47,7 +47,7 @@ clap = { version = "4.4", features = ["derive", "env", "wrap_help"] }
|
||||
clap_complete = "4.2.1"
|
||||
clap_mangen = "0.2.10"
|
||||
codespan-reporting = "0.11"
|
||||
codex = { git = "https://github.com/typst/codex", rev = "9ac86f9" }
|
||||
codex = { git = "https://github.com/typst/codex", rev = "775d828" }
|
||||
color-print = "0.3.6"
|
||||
comemo = "0.4"
|
||||
csv = "1"
|
||||
@ -61,6 +61,8 @@ 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"] }
|
||||
@ -72,8 +74,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 = "20c14fe", default-features = false, features = ["raster-images", "comemo", "rayon"] }
|
||||
krilla-svg = { git = "https://github.com/LaurenzV/krilla", rev = "20c14fe" }
|
||||
krilla = { git = "https://github.com/LaurenzV/krilla", rev = "37b9a00", default-features = false, features = ["raster-images", "comemo", "rayon", "pdf"] }
|
||||
krilla-svg = { git = "https://github.com/LaurenzV/krilla", rev = "37b9a00"}
|
||||
kurbo = "0.11"
|
||||
libfuzzer-sys = "0.4"
|
||||
lipsum = "0.9"
|
||||
|
||||
@ -123,7 +123,7 @@ impl Eval for ast::Escape<'_> {
|
||||
type Output = Value;
|
||||
|
||||
fn eval(self, _: &mut Vm) -> SourceResult<Self::Output> {
|
||||
Ok(Value::Symbol(Symbol::single(self.get())))
|
||||
Ok(Value::Symbol(Symbol::runtime_char(self.get())))
|
||||
}
|
||||
}
|
||||
|
||||
@ -131,7 +131,7 @@ impl Eval for ast::Shorthand<'_> {
|
||||
type Output = Value;
|
||||
|
||||
fn eval(self, _: &mut Vm) -> SourceResult<Self::Output> {
|
||||
Ok(Value::Symbol(Symbol::single(self.get())))
|
||||
Ok(Value::Symbol(Symbol::runtime_char(self.get())))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ impl Eval for ast::MathShorthand<'_> {
|
||||
type Output = Value;
|
||||
|
||||
fn eval(self, _: &mut Vm) -> SourceResult<Self::Output> {
|
||||
Ok(Value::Symbol(Symbol::single(self.get())))
|
||||
Ok(Value::Symbol(Symbol::runtime_char(self.get())))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -97,7 +97,7 @@ pub enum CompletionKind {
|
||||
/// A font family.
|
||||
Font,
|
||||
/// A symbol.
|
||||
Symbol(char),
|
||||
Symbol(EcoString),
|
||||
}
|
||||
|
||||
/// Complete in comments. Or rather, don't!
|
||||
@ -449,7 +449,7 @@ fn field_access_completions(
|
||||
for modifier in symbol.modifiers() {
|
||||
if let Ok(modified) = symbol.clone().modified((), modifier) {
|
||||
ctx.completions.push(Completion {
|
||||
kind: CompletionKind::Symbol(modified.get()),
|
||||
kind: CompletionKind::Symbol(modified.get().into()),
|
||||
label: modifier.into(),
|
||||
apply: None,
|
||||
detail: None,
|
||||
@ -1366,7 +1366,7 @@ impl<'a> CompletionContext<'a> {
|
||||
kind: kind.unwrap_or_else(|| match value {
|
||||
Value::Func(_) => CompletionKind::Func,
|
||||
Value::Type(_) => CompletionKind::Type,
|
||||
Value::Symbol(s) => CompletionKind::Symbol(s.get()),
|
||||
Value::Symbol(s) => CompletionKind::Symbol(s.get().into()),
|
||||
_ => CompletionKind::Constant,
|
||||
}),
|
||||
label,
|
||||
|
||||
@ -129,12 +129,22 @@ pub fn layout_symbol(
|
||||
ctx: &mut MathContext,
|
||||
styles: StyleChain,
|
||||
) -> SourceResult<()> {
|
||||
assert!(
|
||||
elem.text.len() <= 4 && elem.text.chars().count() == 1,
|
||||
"TODO: layout multi-char symbol"
|
||||
);
|
||||
let elem_char = elem
|
||||
.text
|
||||
.chars()
|
||||
.next()
|
||||
.expect("TODO: should an empty symbol value forbidden?");
|
||||
|
||||
// Switch dotless char to normal when we have the dtls OpenType feature.
|
||||
// This should happen before the main styling pass.
|
||||
let dtls = style_dtls();
|
||||
let (unstyled_c, symbol_styles) = match try_dotless(elem.text) {
|
||||
let (unstyled_c, symbol_styles) = match try_dotless(elem_char) {
|
||||
Some(c) if has_dtls_feat(ctx.font) => (c, styles.chain(&dtls)),
|
||||
_ => (elem.text, styles),
|
||||
_ => (elem_char, styles),
|
||||
};
|
||||
|
||||
let variant = styles.get(EquationElem::variant);
|
||||
|
||||
@ -31,6 +31,7 @@ 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 }
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
use std::collections::{BTreeSet, HashMap};
|
||||
use std::fmt::{self, Debug, Display, Formatter, Write};
|
||||
use std::fmt::{self, Debug, Display, Formatter};
|
||||
use std::sync::Arc;
|
||||
|
||||
use codex::ModifierSet;
|
||||
@ -52,7 +52,7 @@ pub struct Symbol(Repr);
|
||||
#[derive(Clone, Eq, PartialEq, Hash)]
|
||||
enum Repr {
|
||||
/// A native symbol that has no named variant.
|
||||
Single(char),
|
||||
Single(&'static str),
|
||||
/// A native symbol with multiple named variants.
|
||||
Complex(&'static [Variant<&'static str>]),
|
||||
/// A symbol with multiple named variants, where some modifiers may have
|
||||
@ -61,9 +61,9 @@ enum Repr {
|
||||
Modified(Arc<(List, ModifierSet<EcoString>)>),
|
||||
}
|
||||
|
||||
/// A symbol variant, consisting of a set of modifiers, a character, and an
|
||||
/// A symbol variant, consisting of a set of modifiers, the variant's value, and an
|
||||
/// optional deprecation message.
|
||||
type Variant<S> = (ModifierSet<S>, char, Option<S>);
|
||||
type Variant<S> = (ModifierSet<S>, S, Option<S>);
|
||||
|
||||
/// A collection of symbols.
|
||||
#[derive(Clone, Eq, PartialEq, Hash)]
|
||||
@ -73,9 +73,9 @@ enum List {
|
||||
}
|
||||
|
||||
impl Symbol {
|
||||
/// Create a new symbol from a single character.
|
||||
pub const fn single(c: char) -> Self {
|
||||
Self(Repr::Single(c))
|
||||
/// Create a new symbol from a single value.
|
||||
pub const fn single(value: &'static str) -> Self {
|
||||
Self(Repr::Single(value))
|
||||
}
|
||||
|
||||
/// Create a symbol with a static variant list.
|
||||
@ -85,6 +85,11 @@ impl Symbol {
|
||||
Self(Repr::Complex(list))
|
||||
}
|
||||
|
||||
/// Create a symbol from a runtime char.
|
||||
pub fn runtime_char(c: char) -> Self {
|
||||
Self::runtime(Box::new([(ModifierSet::default(), c.into(), None)]))
|
||||
}
|
||||
|
||||
/// Create a symbol with a runtime variant list.
|
||||
#[track_caller]
|
||||
pub fn runtime(list: Box<[Variant<EcoString>]>) -> Self {
|
||||
@ -92,15 +97,15 @@ impl Symbol {
|
||||
Self(Repr::Modified(Arc::new((List::Runtime(list), ModifierSet::default()))))
|
||||
}
|
||||
|
||||
/// Get the symbol's character.
|
||||
pub fn get(&self) -> char {
|
||||
/// Get the symbol's value.
|
||||
pub fn get(&self) -> &str {
|
||||
match &self.0 {
|
||||
Repr::Single(c) => *c,
|
||||
Repr::Single(value) => value,
|
||||
Repr::Complex(_) => ModifierSet::<&'static str>::default()
|
||||
.best_match_in(self.variants().map(|(m, c, _)| (m, c)))
|
||||
.best_match_in(self.variants().map(|(m, v, _)| (m, v)))
|
||||
.unwrap(),
|
||||
Repr::Modified(arc) => {
|
||||
arc.1.best_match_in(self.variants().map(|(m, c, _)| (m, c))).unwrap()
|
||||
arc.1.best_match_in(self.variants().map(|(m, v, _)| (m, v))).unwrap()
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -108,27 +113,27 @@ impl Symbol {
|
||||
/// Try to get the function associated with the symbol, if any.
|
||||
pub fn func(&self) -> StrResult<Func> {
|
||||
match self.get() {
|
||||
'⌈' => Ok(crate::math::ceil::func()),
|
||||
'⌊' => Ok(crate::math::floor::func()),
|
||||
'–' => Ok(crate::math::accent::dash::func()),
|
||||
'⋅' | '\u{0307}' => Ok(crate::math::accent::dot::func()),
|
||||
'¨' => Ok(crate::math::accent::dot_double::func()),
|
||||
'\u{20db}' => Ok(crate::math::accent::dot_triple::func()),
|
||||
'\u{20dc}' => Ok(crate::math::accent::dot_quad::func()),
|
||||
'∼' => Ok(crate::math::accent::tilde::func()),
|
||||
'´' => Ok(crate::math::accent::acute::func()),
|
||||
'˝' => Ok(crate::math::accent::acute_double::func()),
|
||||
'˘' => Ok(crate::math::accent::breve::func()),
|
||||
'ˇ' => Ok(crate::math::accent::caron::func()),
|
||||
'^' => Ok(crate::math::accent::hat::func()),
|
||||
'`' => Ok(crate::math::accent::grave::func()),
|
||||
'¯' => Ok(crate::math::accent::macron::func()),
|
||||
'○' => Ok(crate::math::accent::circle::func()),
|
||||
'→' => Ok(crate::math::accent::arrow::func()),
|
||||
'←' => Ok(crate::math::accent::arrow_l::func()),
|
||||
'↔' => Ok(crate::math::accent::arrow_l_r::func()),
|
||||
'⇀' => Ok(crate::math::accent::harpoon::func()),
|
||||
'↼' => Ok(crate::math::accent::harpoon_lt::func()),
|
||||
"⌈" => Ok(crate::math::ceil::func()),
|
||||
"⌊" => Ok(crate::math::floor::func()),
|
||||
"–" => Ok(crate::math::accent::dash::func()),
|
||||
"⋅" | "\u{0307}" => Ok(crate::math::accent::dot::func()),
|
||||
"¨" => Ok(crate::math::accent::dot_double::func()),
|
||||
"\u{20db}" => Ok(crate::math::accent::dot_triple::func()),
|
||||
"\u{20dc}" => Ok(crate::math::accent::dot_quad::func()),
|
||||
"∼" => Ok(crate::math::accent::tilde::func()),
|
||||
"´" => Ok(crate::math::accent::acute::func()),
|
||||
"˝" => Ok(crate::math::accent::acute_double::func()),
|
||||
"˘" => Ok(crate::math::accent::breve::func()),
|
||||
"ˇ" => Ok(crate::math::accent::caron::func()),
|
||||
"^" => Ok(crate::math::accent::hat::func()),
|
||||
"`" => Ok(crate::math::accent::grave::func()),
|
||||
"¯" => Ok(crate::math::accent::macron::func()),
|
||||
"○" => Ok(crate::math::accent::circle::func()),
|
||||
"→" => Ok(crate::math::accent::arrow::func()),
|
||||
"←" => Ok(crate::math::accent::arrow_l::func()),
|
||||
"↔" => Ok(crate::math::accent::arrow_l_r::func()),
|
||||
"⇀" => Ok(crate::math::accent::harpoon::func()),
|
||||
"↼" => Ok(crate::math::accent::harpoon_lt::func()),
|
||||
_ => bail!("symbol {self} is not callable"),
|
||||
}
|
||||
}
|
||||
@ -163,7 +168,7 @@ impl Symbol {
|
||||
/// The characters that are covered by this symbol.
|
||||
pub fn variants(&self) -> impl Iterator<Item = Variant<&str>> {
|
||||
match &self.0 {
|
||||
Repr::Single(c) => Variants::Single(Some(*c).into_iter()),
|
||||
Repr::Single(value) => Variants::Single(std::iter::once(*value)),
|
||||
Repr::Complex(list) => Variants::Static(list.iter()),
|
||||
Repr::Modified(arc) => arc.0.variants(),
|
||||
}
|
||||
@ -279,14 +284,14 @@ impl Symbol {
|
||||
|
||||
impl Display for Symbol {
|
||||
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
|
||||
f.write_char(self.get())
|
||||
f.write_str(self.get())
|
||||
}
|
||||
}
|
||||
|
||||
impl Debug for Repr {
|
||||
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
|
||||
match self {
|
||||
Self::Single(c) => Debug::fmt(c, f),
|
||||
Self::Single(value) => Debug::fmt(value, f),
|
||||
Self::Complex(list) => list.fmt(f),
|
||||
Self::Modified(lists) => lists.fmt(f),
|
||||
}
|
||||
@ -305,7 +310,7 @@ impl Debug for List {
|
||||
impl crate::foundations::Repr for Symbol {
|
||||
fn repr(&self) -> EcoString {
|
||||
match &self.0 {
|
||||
Repr::Single(c) => eco_format!("symbol(\"{}\")", *c),
|
||||
Repr::Single(value) => eco_format!("symbol({})", value.repr()),
|
||||
Repr::Complex(variants) => {
|
||||
eco_format!(
|
||||
"symbol{}",
|
||||
@ -341,15 +346,15 @@ fn repr_variants<'a>(
|
||||
// that contain all applied modifiers.
|
||||
applied_modifiers.iter().all(|am| modifiers.contains(am))
|
||||
})
|
||||
.map(|(modifiers, c, _)| {
|
||||
.map(|(modifiers, value, _)| {
|
||||
let trimmed_modifiers =
|
||||
modifiers.into_iter().filter(|&m| !applied_modifiers.contains(m));
|
||||
if trimmed_modifiers.clone().all(|m| m.is_empty()) {
|
||||
eco_format!("\"{c}\"")
|
||||
value.repr()
|
||||
} else {
|
||||
let trimmed_modifiers =
|
||||
trimmed_modifiers.collect::<Vec<_>>().join(".");
|
||||
eco_format!("(\"{}\", \"{}\")", trimmed_modifiers, c)
|
||||
eco_format!("({}, {})", trimmed_modifiers.repr(), value.repr())
|
||||
}
|
||||
})
|
||||
.collect::<Vec<_>>(),
|
||||
@ -362,7 +367,7 @@ impl Serialize for Symbol {
|
||||
where
|
||||
S: Serializer,
|
||||
{
|
||||
serializer.serialize_char(self.get())
|
||||
serializer.serialize_str(self.get())
|
||||
}
|
||||
}
|
||||
|
||||
@ -377,11 +382,12 @@ impl List {
|
||||
}
|
||||
|
||||
/// A value that can be cast to a symbol.
|
||||
pub struct SymbolVariant(EcoString, char);
|
||||
pub struct SymbolVariant(EcoString, EcoString);
|
||||
|
||||
cast! {
|
||||
SymbolVariant,
|
||||
c: char => Self(EcoString::new(), c),
|
||||
c: char => Self(EcoString::new(), c.into()),
|
||||
s: EcoString => Self(EcoString::new(), s),
|
||||
array: Array => {
|
||||
let mut iter = array.into_iter();
|
||||
match (iter.next(), iter.next(), iter.next()) {
|
||||
@ -393,7 +399,7 @@ cast! {
|
||||
|
||||
/// Iterator over variants.
|
||||
enum Variants<'a> {
|
||||
Single(std::option::IntoIter<char>),
|
||||
Single(std::iter::Once<&'static str>),
|
||||
Static(std::slice::Iter<'static, Variant<&'static str>>),
|
||||
Runtime(std::slice::Iter<'a, Variant<EcoString>>),
|
||||
}
|
||||
@ -406,7 +412,7 @@ impl<'a> Iterator for Variants<'a> {
|
||||
Self::Single(iter) => Some((ModifierSet::default(), iter.next()?, None)),
|
||||
Self::Static(list) => list.next().copied(),
|
||||
Self::Runtime(list) => {
|
||||
list.next().map(|(m, c, d)| (m.as_deref(), *c, d.as_deref()))
|
||||
list.next().map(|(m, s, d)| (m.as_deref(), s.as_str(), d.as_deref()))
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -415,21 +421,21 @@ impl<'a> Iterator for Variants<'a> {
|
||||
/// A single character.
|
||||
#[elem(Repr, PlainText)]
|
||||
pub struct SymbolElem {
|
||||
/// The symbol's character.
|
||||
/// The symbol's value.
|
||||
#[required]
|
||||
pub text: char, // This is called `text` for consistency with `TextElem`.
|
||||
pub text: EcoString, // This is called `text` for consistency with `TextElem`.
|
||||
}
|
||||
|
||||
impl SymbolElem {
|
||||
/// Create a new packed symbol element.
|
||||
pub fn packed(text: impl Into<char>) -> Content {
|
||||
pub fn packed(text: impl Into<EcoString>) -> Content {
|
||||
Self::new(text.into()).pack()
|
||||
}
|
||||
}
|
||||
|
||||
impl PlainText for Packed<SymbolElem> {
|
||||
fn plain_text(&self, text: &mut EcoString) {
|
||||
text.push(self.text);
|
||||
text.push_str(&self.text);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -188,7 +188,7 @@ cast! {
|
||||
self => self.0.into_value(),
|
||||
v: char => Self::new(v),
|
||||
v: Content => match v.to_packed::<SymbolElem>() {
|
||||
Some(elem) => Self::new(elem.text),
|
||||
None => bail!("expected a symbol"),
|
||||
Some(elem) if elem.text.chars().count() == 1 => Self::new(elem.text.chars().next().unwrap()),
|
||||
_ => bail!("expected a single-codepoint symbol"),
|
||||
},
|
||||
}
|
||||
|
||||
@ -274,7 +274,7 @@ cast! {
|
||||
Delimiter,
|
||||
self => self.0.into_value(),
|
||||
_: NoneValue => Self::none(),
|
||||
v: Symbol => Self::char(v.get())?,
|
||||
v: Symbol => Self::char(v.get().parse::<char>().map_err(|_| "expected a single-codepoint symbol")?)?,
|
||||
v: char => Self::char(v)?,
|
||||
}
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@ impl From<codex::Module> for Scope {
|
||||
impl From<codex::Symbol> for Symbol {
|
||||
fn from(symbol: codex::Symbol) -> Self {
|
||||
match symbol {
|
||||
codex::Symbol::Single(c) => Symbol::single(c),
|
||||
codex::Symbol::Single(value) => Symbol::single(value),
|
||||
codex::Symbol::Multi(list) => Symbol::list(list),
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
//! Image handling.
|
||||
|
||||
mod pdf;
|
||||
mod raster;
|
||||
mod svg;
|
||||
|
||||
pub use self::pdf::PdfImage;
|
||||
pub use self::raster::{
|
||||
ExchangeFormat, PixelEncoding, PixelFormat, RasterFormat, RasterImage,
|
||||
};
|
||||
@ -10,13 +12,15 @@ 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;
|
||||
use typst_utils::{LazyHash, NonZeroExt};
|
||||
|
||||
use crate::diag::{At, LoadedWithin, SourceResult, StrResult, warning};
|
||||
use crate::diag::{At, LoadedWithin, SourceResult, StrResult, bail, warning};
|
||||
use crate::engine::Engine;
|
||||
use crate::foundations::{
|
||||
Bytes, Cast, Content, Derived, NativeElement, Packed, Smart, StyleChain, cast, elem,
|
||||
@ -26,6 +30,7 @@ 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.
|
||||
///
|
||||
@ -79,8 +84,7 @@ pub struct ImageElem {
|
||||
/// format automatically, but that's not always possible).
|
||||
///
|
||||
/// Supported formats are `{"png"}`, `{"jpg"}`, `{"gif"}`, `{"svg"}`,
|
||||
/// `{"webp"}` as well as raw pixel data. Embedding PDFs as images is
|
||||
/// [not currently supported](https://github.com/typst/typst/issues/145).
|
||||
/// `{"pdf"}`, `{"webp"}` as well as raw pixel data.
|
||||
///
|
||||
/// When providing raw pixel data as the `source`, you must specify a
|
||||
/// dictionary with the following keys as the `format`:
|
||||
@ -126,6 +130,11 @@ 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
|
||||
@ -261,6 +270,45 @@ 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)))
|
||||
@ -286,6 +334,7 @@ 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()),
|
||||
_ => {}
|
||||
}
|
||||
@ -373,6 +422,7 @@ impl Image {
|
||||
match &self.0.kind {
|
||||
ImageKind::Raster(raster) => raster.format().into(),
|
||||
ImageKind::Svg(_) => VectorFormat::Svg.into(),
|
||||
ImageKind::Pdf(_) => VectorFormat::Pdf.into(),
|
||||
}
|
||||
}
|
||||
|
||||
@ -381,6 +431,7 @@ 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,
|
||||
}
|
||||
}
|
||||
|
||||
@ -389,6 +440,7 @@ 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,
|
||||
}
|
||||
}
|
||||
|
||||
@ -397,6 +449,7 @@ impl Image {
|
||||
match &self.0.kind {
|
||||
ImageKind::Raster(raster) => raster.dpi(),
|
||||
ImageKind::Svg(_) => Some(Image::USVG_DEFAULT_DPI),
|
||||
ImageKind::Pdf(_) => Some(Image::DEFAULT_DPI),
|
||||
}
|
||||
}
|
||||
|
||||
@ -435,6 +488,8 @@ pub enum ImageKind {
|
||||
Raster(RasterImage),
|
||||
/// An SVG image.
|
||||
Svg(SvgImage),
|
||||
/// A PDF image.
|
||||
Pdf(PdfImage),
|
||||
}
|
||||
|
||||
impl From<RasterImage> for ImageKind {
|
||||
@ -469,10 +524,20 @@ 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
|
||||
@ -493,6 +558,9 @@ 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
|
||||
|
||||
98
crates/typst-library/src/visualize/image/pdf.rs
Normal file
98
crates/typst-library/src/visualize/image/pdf.rs
Normal file
@ -0,0 +1,98 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
@ -9,6 +9,7 @@ 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;
|
||||
@ -363,6 +364,42 @@ 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"
|
||||
);
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
@ -535,12 +572,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"
|
||||
@ -576,6 +613,13 @@ 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"
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -3,13 +3,14 @@ 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, RasterFormat, RasterImage,
|
||||
ExchangeFormat, Image, ImageKind, ImageScaling, PdfImage, RasterFormat, RasterImage,
|
||||
};
|
||||
use typst_syntax::Span;
|
||||
|
||||
@ -60,6 +61,9 @@ 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() {
|
||||
@ -85,9 +89,9 @@ struct Repr {
|
||||
|
||||
/// A wrapper around `RasterImage` so that we can implement `CustomImage`.
|
||||
#[derive(Clone)]
|
||||
struct PdfImage(Arc<Repr>);
|
||||
struct PdfRasterImage(Arc<Repr>);
|
||||
|
||||
impl PdfImage {
|
||||
impl PdfRasterImage {
|
||||
pub fn new(raster: RasterImage) -> Self {
|
||||
Self(Arc::new(Repr {
|
||||
raster,
|
||||
@ -97,7 +101,7 @@ impl PdfImage {
|
||||
}
|
||||
}
|
||||
|
||||
impl Hash for PdfImage {
|
||||
impl Hash for PdfRasterImage {
|
||||
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.
|
||||
@ -105,7 +109,7 @@ impl Hash for PdfImage {
|
||||
}
|
||||
}
|
||||
|
||||
impl CustomImage for PdfImage {
|
||||
impl CustomImage for PdfRasterImage {
|
||||
fn color_channel(&self) -> &[u8] {
|
||||
self.0
|
||||
.actual_dynamic
|
||||
@ -196,10 +200,15 @@ fn convert_raster(
|
||||
interpolate,
|
||||
)
|
||||
} else {
|
||||
krilla::image::Image::from_custom(PdfImage::new(raster), interpolate)
|
||||
krilla::image::Image::from_custom(PdfRasterImage::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 {
|
||||
|
||||
@ -49,7 +49,6 @@ pub(crate) fn handle_link(
|
||||
fc.push_annotation(
|
||||
LinkAnnotation::new(
|
||||
rect,
|
||||
None,
|
||||
Target::Action(Action::Link(LinkAction::new(u.to_string()))),
|
||||
)
|
||||
.into(),
|
||||
@ -64,7 +63,6 @@ pub(crate) fn handle_link(
|
||||
fc.push_annotation(
|
||||
LinkAnnotation::new(
|
||||
rect,
|
||||
None,
|
||||
Target::Destination(krilla::destination::Destination::Named(
|
||||
nd.clone(),
|
||||
)),
|
||||
@ -83,7 +81,6 @@ 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()),
|
||||
)),
|
||||
|
||||
@ -301,9 +301,7 @@ fn visit_kind_rules<'a>(
|
||||
// textual elements via `TEXTUAL` grouping. However, in math, this is
|
||||
// not desirable, so we just do it on a per-element basis.
|
||||
if let Some(elem) = content.to_packed::<SymbolElem>() {
|
||||
if let Some(m) =
|
||||
find_regex_match_in_str(elem.text.encode_utf8(&mut [0; 4]), styles)
|
||||
{
|
||||
if let Some(m) = find_regex_match_in_str(elem.text.as_str(), styles) {
|
||||
visit_regex_match(s, &[(content, styles)], m)?;
|
||||
return Ok(true);
|
||||
}
|
||||
@ -324,7 +322,7 @@ fn visit_kind_rules<'a>(
|
||||
// Symbols in non-math content transparently convert to `TextElem` so we
|
||||
// don't have to handle them in non-math layout.
|
||||
if let Some(elem) = content.to_packed::<SymbolElem>() {
|
||||
let mut text = TextElem::packed(elem.text).spanned(elem.span());
|
||||
let mut text = TextElem::packed(elem.text.clone()).spanned(elem.span());
|
||||
if let Some(label) = elem.label() {
|
||||
text.set_label(label);
|
||||
}
|
||||
@ -1238,7 +1236,7 @@ fn visit_regex_match<'a>(
|
||||
let len = if let Some(elem) = content.to_packed::<TextElem>() {
|
||||
elem.text.len()
|
||||
} else if let Some(elem) = content.to_packed::<SymbolElem>() {
|
||||
elem.text.len_utf8()
|
||||
elem.text.len()
|
||||
} else {
|
||||
1 // The rest are Ascii, so just one byte.
|
||||
};
|
||||
|
||||
@ -13,11 +13,13 @@ 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 }
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use hayro::{FontData, FontQuery, InterpreterSettings, RenderSettings, StandardFont};
|
||||
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};
|
||||
use typst_library::visualize::{Image, ImageKind, ImageScaling, PdfImage};
|
||||
|
||||
use crate::{AbsExt, State};
|
||||
|
||||
@ -59,9 +60,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 mut texture = sk::Pixmap::new(w, h)?;
|
||||
match image.kind() {
|
||||
let texture = match image.kind() {
|
||||
ImageKind::Raster(raster) => {
|
||||
let mut texture = sk::Pixmap::new(w, h)?;
|
||||
let w = texture.width();
|
||||
let h = texture.height();
|
||||
|
||||
@ -85,15 +86,63 @@ 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)?)
|
||||
}
|
||||
|
||||
@ -13,6 +13,7 @@ keywords = { workspace = true }
|
||||
readme = { workspace = true }
|
||||
|
||||
[dependencies]
|
||||
typst-assets = { workspace = true }
|
||||
typst-library = { workspace = true }
|
||||
typst-macros = { workspace = true }
|
||||
typst-timing = { workspace = true }
|
||||
@ -21,6 +22,7 @@ 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 }
|
||||
|
||||
@ -1,10 +1,13 @@
|
||||
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, RasterFormat,
|
||||
ExchangeFormat, Image, ImageKind, ImageScaling, PdfImage, RasterFormat,
|
||||
};
|
||||
|
||||
use crate::SVGRenderer;
|
||||
@ -66,6 +69,25 @@ 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,");
|
||||
@ -73,3 +95,45 @@ 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()
|
||||
}
|
||||
|
||||
@ -665,12 +665,3 @@ 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.
|
||||
|
||||
@ -718,9 +718,13 @@ fn symbols_model(resolver: &dyn Resolver, group: &GroupData) -> SymbolsModel {
|
||||
}
|
||||
};
|
||||
|
||||
for (variant, c, deprecation) in symbol.variants() {
|
||||
for (variant, value, deprecation) in symbol.variants() {
|
||||
let value_char = value.parse::<char>().ok();
|
||||
|
||||
let shorthand = |list: &[(&'static str, char)]| {
|
||||
list.iter().copied().find(|&(_, x)| x == c).map(|(s, _)| s)
|
||||
value_char.and_then(|c| {
|
||||
list.iter().copied().find(|&(_, x)| x == c).map(|(s, _)| s)
|
||||
})
|
||||
};
|
||||
|
||||
let name = complete(variant);
|
||||
@ -729,9 +733,12 @@ fn symbols_model(resolver: &dyn Resolver, group: &GroupData) -> SymbolsModel {
|
||||
name,
|
||||
markup_shorthand: shorthand(typst::syntax::ast::Shorthand::LIST),
|
||||
math_shorthand: shorthand(typst::syntax::ast::MathShorthand::LIST),
|
||||
math_class: typst_utils::default_math_class(c).map(math_class_name),
|
||||
codepoint: c as _,
|
||||
accent: typst::math::Accent::combine(c).is_some(),
|
||||
math_class: value_char.and_then(|c| {
|
||||
typst_utils::default_math_class(c).map(math_class_name)
|
||||
}),
|
||||
value: value.into(),
|
||||
accent: value_char
|
||||
.is_some_and(|c| typst::math::Accent::combine(c).is_some()),
|
||||
alternates: symbol
|
||||
.variants()
|
||||
.filter(|(other, _, _)| other != &variant)
|
||||
|
||||
@ -159,7 +159,7 @@ pub struct SymbolsModel {
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct SymbolModel {
|
||||
pub name: EcoString,
|
||||
pub codepoint: u32,
|
||||
pub value: EcoString,
|
||||
pub accent: bool,
|
||||
pub alternates: Vec<EcoString>,
|
||||
pub markup_shorthand: Option<&'static str>,
|
||||
|
||||
BIN
tests/ref/image-pdf-multiple-pages.png
Normal file
BIN
tests/ref/image-pdf-multiple-pages.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.4 KiB |
BIN
tests/ref/image-pdf.png
Normal file
BIN
tests/ref/image-pdf.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.9 KiB |
@ -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", or auto
|
||||
// Error: 11-18 expected "png", "jpg", "gif", "webp", dictionary, "svg", "pdf", or auto
|
||||
format: "rgba8",
|
||||
)
|
||||
|
||||
@ -289,3 +289,16 @@ 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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user