Update Typst Version to Latest
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
[](https://github.com/sirblobby/typst-desktop)
|
[](https://github.com/sirblobby/typst-desktop)
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
[](https://typst.app/)
|
[](https://typst.app/)
|
||||||
[](https://www.rust-lang.org/)
|
[](https://www.rust-lang.org/)
|
||||||
[](https://tauri.app/)
|
[](https://tauri.app/)
|
||||||
[](https://kit.svelte.dev/)
|
[](https://kit.svelte.dev/)
|
||||||
|
|||||||
@@ -190,7 +190,7 @@
|
|||||||
|
|
||||||
"@sveltejs/adapter-static": ["@sveltejs/[email protected]", "", { "peerDependencies": { "@sveltejs/kit": "^2.0.0" } }, "sha512-7D9lYFWJmB7zxZyTE/qxjksvMqzMuYrrsyh1f4AlZqeZeACPRySjbC3aFiY55wb1tWUaKOQG9PVbm74JcN2Iew=="],
|
"@sveltejs/adapter-static": ["@sveltejs/[email protected]", "", { "peerDependencies": { "@sveltejs/kit": "^2.0.0" } }, "sha512-7D9lYFWJmB7zxZyTE/qxjksvMqzMuYrrsyh1f4AlZqeZeACPRySjbC3aFiY55wb1tWUaKOQG9PVbm74JcN2Iew=="],
|
||||||
|
|
||||||
"@sveltejs/kit": ["@sveltejs/[email protected].0", "", { "dependencies": { "@standard-schema/spec": "^1.0.0", "@sveltejs/acorn-typescript": "^1.0.9", "@types/cookie": "^0.6.0", "acorn": "^8.16.0", "cookie": "^0.6.0", "devalue": "^5.8.1", "esm-env": "^1.2.2", "kleur": "^4.1.5", "magic-string": "^0.30.5", "mrmime": "^2.0.0", "set-cookie-parser": "^3.0.0", "sirv": "^3.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0", "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0 || ^7.0.0", "svelte": "^4.0.0 || ^5.0.0-next.0", "typescript": "^5.3.3 || ^6.0.0", "vite": "^5.0.3 || ^6.0.0 || ^7.0.0-beta.0 || ^8.0.0" }, "optionalPeers": ["@opentelemetry/api", "typescript"], "bin": { "svelte-kit": "svelte-kit.js" } }, "sha512-5pBnJwdNzxbrxp1TLK1NPMFF0Cx57iZUDKInznKcfifYR9m9poWfZI2Tfhw6BZIjYor5dXvcibt4EQgar3k6ww=="],
|
"@sveltejs/kit": ["@sveltejs/[email protected].1", "", { "dependencies": { "@standard-schema/spec": "^1.0.0", "@sveltejs/acorn-typescript": "^1.0.9", "@types/cookie": "^0.6.0", "acorn": "^8.16.0", "cookie": "^0.6.0", "devalue": "^5.8.1", "esm-env": "^1.2.2", "kleur": "^4.1.5", "magic-string": "^0.30.5", "mrmime": "^2.0.0", "set-cookie-parser": "^3.0.0", "sirv": "^3.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0", "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0 || ^7.0.0", "svelte": "^4.0.0 || ^5.0.0-next.0", "typescript": "^5.3.3 || ^6.0.0", "vite": "^5.0.3 || ^6.0.0 || ^7.0.0-beta.0 || ^8.0.0" }, "optionalPeers": ["@opentelemetry/api", "typescript"], "bin": { "svelte-kit": "svelte-kit.js" } }, "sha512-nY9SPHGOZro3doud9vZXDBwl9tCZIouuJztjgSHs6PAIrv9M/z5O7eOhPV5xU7CgVHA976Jwu3BA1hIFvXztkA=="],
|
||||||
|
|
||||||
"@sveltejs/load-config": ["@sveltejs/[email protected]", "", {}, "sha512-1LgZ/qUqSoq+QorD83lk2hka79Px0wXNW2q5V1nZlxGhQgw1jrsIbVz5YiCeucVLo4XvFLjXukUaQjIiqowkcg=="],
|
"@sveltejs/load-config": ["@sveltejs/[email protected]", "", {}, "sha512-1LgZ/qUqSoq+QorD83lk2hka79Px0wXNW2q5V1nZlxGhQgw1jrsIbVz5YiCeucVLo4XvFLjXukUaQjIiqowkcg=="],
|
||||||
|
|
||||||
@@ -286,7 +286,7 @@
|
|||||||
|
|
||||||
"@tauri-apps/cli-win32-x64-msvc": ["@tauri-apps/[email protected]", "", { "os": "win32", "cpu": "x64" }, "sha512-+vDiqBIU5dMISg/wNvX3sF+ZHfgJGJ5T0AcO+EHNXV9GGAG+P5fzodlDXD3QdKCRgZxMoCm5PPvj3BqLNjBthw=="],
|
"@tauri-apps/cli-win32-x64-msvc": ["@tauri-apps/[email protected]", "", { "os": "win32", "cpu": "x64" }, "sha512-+vDiqBIU5dMISg/wNvX3sF+ZHfgJGJ5T0AcO+EHNXV9GGAG+P5fzodlDXD3QdKCRgZxMoCm5PPvj3BqLNjBthw=="],
|
||||||
|
|
||||||
"@tauri-apps/plugin-dialog": ["@tauri-apps/[email protected].1", "", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-OK1UBXYt+ojcmxMktzzuyonYIFta8CmAASpX+CA+DTGK24KlHjhYI6x2iOJ/TjZF4N7/ACK1oFmEOjIY9IhzOQ=="],
|
"@tauri-apps/plugin-dialog": ["@tauri-apps/[email protected].2", "", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-pX0IGm1I3I6wc+zeKYcq1GSqogK6okCNX5fOdaNU5ab1AjGS6l1E5wFNjEb7meg7ZFSp0JUs+0jQGQNyOvLrsg=="],
|
||||||
|
|
||||||
"@tauri-apps/plugin-opener": ["@tauri-apps/[email protected]", "", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-1HnPkb+AmgO29HBazm4uPLKB+r7zzcTBW1d0fyYp1uP+jwtpoiNDGKMMzz58SFp49nOIrxdE3aUJtT57lfO9CQ=="],
|
"@tauri-apps/plugin-opener": ["@tauri-apps/[email protected]", "", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-1HnPkb+AmgO29HBazm4uPLKB+r7zzcTBW1d0fyYp1uP+jwtpoiNDGKMMzz58SFp49nOIrxdE3aUJtT57lfO9CQ=="],
|
||||||
|
|
||||||
|
|||||||
+14
-14
@@ -14,27 +14,27 @@
|
|||||||
},
|
},
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@codemirror/autocomplete": "^6.20.2",
|
"@codemirror/autocomplete": "^6.20.3",
|
||||||
"@codemirror/commands": "^6.10.3",
|
"@codemirror/commands": "^6.10.4",
|
||||||
"@codemirror/language": "^6.10.8",
|
"@codemirror/language": "^6.12.4",
|
||||||
"@codemirror/legacy-modes": "^6.5.1",
|
"@codemirror/legacy-modes": "^6.5.3",
|
||||||
"@codemirror/lint": "^6.9.6",
|
"@codemirror/lint": "^6.9.7",
|
||||||
"@codemirror/lsp-client": "^6.2.4",
|
"@codemirror/lsp-client": "^6.2.5",
|
||||||
"@codemirror/state": "^6.6.0",
|
"@codemirror/state": "^6.7.1",
|
||||||
"@codemirror/view": "^6.43.0",
|
"@codemirror/view": "^6.43.6",
|
||||||
"@iconify/svelte": "^5.2.1",
|
"@iconify/svelte": "^5.2.2",
|
||||||
"@lezer/highlight": "^1.2.1",
|
"@lezer/highlight": "^1.2.3",
|
||||||
"@tauri-apps/api": "^2.11.1",
|
"@tauri-apps/api": "^2.11.1",
|
||||||
"@tauri-apps/plugin-dialog": "^2.4.1",
|
"@tauri-apps/plugin-dialog": "^2.7.2",
|
||||||
"@tauri-apps/plugin-opener": "^2.5.4",
|
"@tauri-apps/plugin-opener": "^2.5.4",
|
||||||
"codemirror": "^6.0.2",
|
"codemirror": "^6.0.2",
|
||||||
"codemirror-lang-typst": "^0.4.0"
|
"codemirror-lang-typst": "^0.4.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@sveltejs/adapter-static": "^3.0.10",
|
"@sveltejs/adapter-static": "^3.0.10",
|
||||||
"@tailwindcss/vite": "^4.3.0",
|
"@tailwindcss/vite": "^4.3.3",
|
||||||
"tailwindcss": "^4.3.0",
|
"tailwindcss": "^4.3.3",
|
||||||
"@sveltejs/kit": "^2.70.0",
|
"@sveltejs/kit": "^2.70.1",
|
||||||
"@sveltejs/vite-plugin-svelte": "^5.1.1",
|
"@sveltejs/vite-plugin-svelte": "^5.1.1",
|
||||||
"svelte": "^5.56.6",
|
"svelte": "^5.56.6",
|
||||||
"svelte-check": "^4.7.3",
|
"svelte-check": "^4.7.3",
|
||||||
|
|||||||
@@ -26,14 +26,14 @@ serde = { version = "1", features = ["derive"] }
|
|||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
rusqlite = { version = "0.32", features = ["bundled"] }
|
rusqlite = { version = "0.32", features = ["bundled"] }
|
||||||
|
|
||||||
typst = { version = "0.14.2", path = "../../typstdrive/typst/crates/typst" }
|
typst = { version = "0.15.1", path = "../../typstdrive/typst/crates/typst" }
|
||||||
typst-kit = { path = "../../typstdrive/typst/crates/typst-kit", features = ["system-downloader", "system-packages", "embedded-fonts"] }
|
typst-kit = { path = "../../typstdrive/typst/crates/typst-kit", features = ["system-downloader", "system-packages", "embedded-fonts"] }
|
||||||
typst-pdf = { path = "../../typstdrive/typst/crates/typst-pdf" }
|
typst-pdf = { path = "../../typstdrive/typst/crates/typst-pdf" }
|
||||||
typst-render = { path = "../../typstdrive/typst/crates/typst-render" }
|
typst-render = { path = "../../typstdrive/typst/crates/typst-render" }
|
||||||
typst-svg = { path = "../../typstdrive/typst/crates/typst-svg" }
|
typst-svg = { path = "../../typstdrive/typst/crates/typst-svg" }
|
||||||
typst-html = { path = "../../typstdrive/typst/crates/typst-html" }
|
typst-html = { path = "../../typstdrive/typst/crates/typst-html" }
|
||||||
typst-layout = { path = "../../typstdrive/typst/crates/typst-layout" }
|
typst-layout = { path = "../../typstdrive/typst/crates/typst-layout" }
|
||||||
typst-assets = { version = "0.14.2", features = ["fonts"] }
|
typst-assets = { version = "0.15.1", features = ["fonts"] }
|
||||||
|
|
||||||
chrono = { version = "0.4", features = ["serde"] }
|
chrono = { version = "0.4", features = ["serde"] }
|
||||||
sha2 = "0.10"
|
sha2 = "0.10"
|
||||||
|
|||||||
@@ -2,8 +2,9 @@ use serde::Serialize;
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use typst::diag::Warned;
|
use typst::diag::Warned;
|
||||||
use typst::layout::{Frame, FrameItem};
|
use typst::layout::{Frame, FrameItem};
|
||||||
|
use typst::utils::Scalar;
|
||||||
use typst::WorldExt;
|
use typst::WorldExt;
|
||||||
use typst_html::HtmlDocument;
|
use typst_html::{HtmlDocument, HtmlOptions};
|
||||||
use typst_layout::PagedDocument;
|
use typst_layout::PagedDocument;
|
||||||
use typst_pdf::{pdf, PdfOptions};
|
use typst_pdf::{pdf, PdfOptions};
|
||||||
use typst_render::{render, RenderOptions};
|
use typst_render::{render, RenderOptions};
|
||||||
@@ -174,7 +175,7 @@ pub fn export_png(
|
|||||||
warnings: _,
|
warnings: _,
|
||||||
} => {
|
} => {
|
||||||
let options = RenderOptions {
|
let options = RenderOptions {
|
||||||
pixel_per_pt: 2.0,
|
pixel_per_pt: Scalar::new(2.0),
|
||||||
..RenderOptions::default()
|
..RenderOptions::default()
|
||||||
};
|
};
|
||||||
match document.pages().first() {
|
match document.pages().first() {
|
||||||
@@ -207,7 +208,7 @@ pub fn export_html(
|
|||||||
} => return Err(collect_diagnostics(&world, &source_text, errors)),
|
} => return Err(collect_diagnostics(&world, &source_text, errors)),
|
||||||
};
|
};
|
||||||
|
|
||||||
typst_html::html(&document)
|
typst_html::html(&document, &HtmlOptions::default())
|
||||||
.map(|html| html.into_bytes())
|
.map(|html| html.into_bytes())
|
||||||
.map_err(|errors| collect_diagnostics(&world, &source_text, errors))
|
.map_err(|errors| collect_diagnostics(&world, &source_text, errors))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ pub struct AppInfo {
|
|||||||
fn app_info() -> AppInfo {
|
fn app_info() -> AppInfo {
|
||||||
AppInfo {
|
AppInfo {
|
||||||
version: env!("CARGO_PKG_VERSION").to_string(),
|
version: env!("CARGO_PKG_VERSION").to_string(),
|
||||||
typst_version: "0.14.2".to_string(),
|
typst_version: "0.15.1".to_string(),
|
||||||
authors: "SirBlobby".to_string(),
|
authors: "SirBlobby".to_string(),
|
||||||
license: "Apache-2.0".to_string(),
|
license: "Apache-2.0".to_string(),
|
||||||
tauri_version: tauri::VERSION.to_string(),
|
tauri_version: tauri::VERSION.to_string(),
|
||||||
|
|||||||
Reference in New Issue
Block a user