build: bump typst package to 0.1.2 (#88)

* build: bump typst package to 0.1.2 * build: pull changes to fix bugs in typst * fix: broken typst
Myriad-Dreamin · Oct 26, 2024 · 9bc249a · 9bc249a
1 parent 8ba6b53
commit 9bc249a
Show file tree

Hide file tree

Showing 14 changed files with 304 additions and 356 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -70,10 +70,10 @@ include_dir = "0.7.3"
 pathdiff = "0.2.1"
 
 [patch.crates-io]
-typst = { git = "https://github.com/Myriad-Dreamin/typst.git", tag = "typst.ts/v0.5.0-rc8-2" }
-typst-syntax = { git = "https://github.com/Myriad-Dreamin/typst.git", tag = "typst.ts/v0.5.0-rc8-2" }
-reflexo-vec2svg = { git = "https://github.com/Myriad-Dreamin/typst.ts", tag = "v0.5.0-rc8", package = "reflexo-vec2svg" }
-reflexo-typst = { git = "https://github.com/Myriad-Dreamin/typst.ts", tag = "v0.5.0-rc8", package = "reflexo-typst" }
+typst = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "typst.ts-v0.5.0-rc8-4" }
+typst-syntax = { git = "https://github.com/Myriad-Dreamin/typst.git", branch = "typst.ts-v0.5.0-rc8-4" }
+reflexo-vec2svg = { git = "https://github.com/Myriad-Dreamin/typst.ts", rev = "c52a054ca31989e13eddc6f2cffb6db2ba5faa5d", package = "reflexo-vec2svg" }
+reflexo-typst = { git = "https://github.com/Myriad-Dreamin/typst.ts", rev = "c52a054ca31989e13eddc6f2cffb6db2ba5faa5d", package = "reflexo-typst" }
 
 # typst = { path = "../typst/crates/typst" }
 # typst-syntax = { path = "../typst/crates/typst-syntax" }

diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -15,7 +15,7 @@ use std::path::PathBuf;
 use clap::{ArgAction, Parser, Subcommand, ValueEnum};
 
 #[derive(Debug, Parser)]
-#[clap(name = "shiroa", version = "0.1.1")]
+#[clap(name = "shiroa", version = "0.1.2")]
 pub struct Opts {
     /// Print Version
     #[arg(short = 'V', long, group = "version-dump")]

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -100,7 +100,7 @@ async fn init(args: InitArgs) -> ZResult<()> {
         dir.join("book.typ"),
         format!(
             r##"
-#import "@preview/shiroa:0.1.1": *
+#import "@preview/shiroa:0.1.2": *
 
 #show: book
 
@@ -135,7 +135,7 @@ Sample page
     write_file(
         dir.join("ebook.typ"),
         format!(
-            r##"#import "@preview/shiroa:0.1.1": *
+            r##"#import "@preview/shiroa:0.1.2": *
 
 #import "{ebook_template}"
 

diff --git a/cli/src/project.rs b/cli/src/project.rs
@@ -183,12 +183,12 @@ impl Project {
 
             let package_meta = res
                 .first()
-                .ok_or_else(|| error_once!("no internal-package meta in book.typ (are you using old book package?, please import @preview/shiroa:0.1.1; or do you forget the show rule `#show: book`?)"))?;
+                .ok_or_else(|| error_once!("no internal-package meta in book.typ (are you using old book package?, please import @preview/shiroa:0.1.2; or do you forget the show rule `#show: book`?)"))?;
 
             let InternalPackageMeta::Package { version } = &package_meta.value;
-            if version != "0.1.1" {
+            if version != "0.1.2" {
                 return Err(error_once!(
-                    "outdated book package, please import @preview/shiroa:0.1.1", importing_version: version,
+                    "outdated book package, please import @preview/shiroa:0.1.2", importing_version: version,
                 ));
             }
         }

diff --git a/contrib/typst/gh-ebook.typ b/contrib/typst/gh-ebook.typ
@@ -1,4 +1,4 @@
-#import "@preview/shiroa:0.1.1": *
+#import "@preview/shiroa:0.1.2": *
 #import "/contrib/typst/gh-pages.typ": project, part-style
 
 #let _page-project = project

diff --git a/contrib/typst/gh-pages.typ b/contrib/typst/gh-pages.typ
@@ -1,6 +1,6 @@
 // This is important for shiroa to produce a responsive layout
 // and multiple targets.
-#import "@preview/shiroa:0.1.1": get-page-width, target, is-web-target, is-pdf-target, plain-text, templates
+#import "@preview/shiroa:0.1.2": get-page-width, target, is-web-target, is-pdf-target, plain-text, templates
 #import templates: *
 
 // Metadata

diff --git a/github-pages/docs/book.typ b/github-pages/docs/book.typ
@@ -1,5 +1,5 @@
 
-#import "@preview/shiroa:0.1.1": *
+#import "@preview/shiroa:0.1.2": *
 
 #show: book
 

diff --git a/github-pages/docs/cli/init.typ b/github-pages/docs/cli/init.typ
@@ -32,7 +32,7 @@ shiroa build my-book/ # memoryized dest-dir
 The harder way, by creating the book without `init` command, your `book.typ` should at least provides a `book-meta`, as #cross-link("/guide/get-started.typ")[Get Started] shown.
 
 ```typ
-#import "@preview/shiroa:0.1.1": *
+#import "@preview/shiroa:0.1.2": *
 #show: book
 
 #book-meta(
@@ -43,10 +43,10 @@ The harder way, by creating the book without `init` command, your `book.typ` sho
 )
 ```
 
-Your `template.typ` must import and respect the `page-width` and `target` variable from `@preview/shiroa:0.1.1` to this time. The two variables will be used by the tool for rendering responsive layout and multiple targets.
+Your `template.typ` must import and respect the `get-page-width` and `target` variable from `@preview/shiroa:0.1.2` to this time. The two variables will be used by the tool for rendering responsive layout and multiple targets.
 
 ```typ
-#import "@preview/shiroa:0.1.1": get-page-width, target, is-web-target, is-pdf-target
+#import "@preview/shiroa:0.1.2": get-page-width, target, is-web-target, is-pdf-target
 
 // Metadata
 #let page-width = get-page-width()

diff --git a/github-pages/docs/format/theme.typ b/github-pages/docs/format/theme.typ
@@ -17,7 +17,7 @@ Currently we have no much design on theme's html part. But you can still configu
 Your `book.typ` should at least provides a `book-meta`, as #t shown.
 
 ```typ
-#import "@preview/shiroa:0.1.1": *
+#import "@preview/shiroa:0.1.2": *
 #show: book
 
 #book-meta(
@@ -28,11 +28,10 @@ Your `book.typ` should at least provides a `book-meta`, as #t shown.
 )
 ```
 
-// todo: update it
-What is arguable, your `template.typ` must import and respect the `page-width` and `target` variable from `@preview/typst-ts-variables:0.1.1` to this time.
+To support specialized rendering for web pages and different page layouts, Your `template.typ` can import and respect the `page-width` and `target` variable from `@preview/shiroa:0.1.2` to this time.
 
 ```typ
-#import "@preview/typst-ts-variables:0.1.1": page-width, target
+#import "@preview/shiroa:0.1.2": page-width, target
 
 #let project(body) = {
   // set web/pdf page properties

diff --git a/github-pages/docs/guide/get-started.typ b/github-pages/docs/guide/get-started.typ
@@ -48,7 +48,7 @@ Before a chapter can be viewed, it must be added to this list.
 Here's a basic summary file with a few chapters:
 
 ```typ
-#import "@preview/shiroa:0.1.1": *
+#import "@preview/shiroa:0.1.2": *
 #show: book
 
 #book-meta( // put metadata of your book like book.toml of mdbook

diff --git a/github-pages/docs/pdf.typ b/github-pages/docs/pdf.typ
@@ -1,4 +1,4 @@
-#import "@preview/shiroa:0.1.1": *
+#import "@preview/shiroa:0.1.2": *
 
 #import "/contrib/typst/gh-ebook.typ"
 #let ebook = gh-ebook

diff --git a/packages/shiroa-tests/test-summary.typ b/packages/shiroa-tests/test-summary.typ
@@ -49,6 +49,4 @@
 ]
 #res.push(t)
 
-#res.push(t)
-
 #res
diff --git a/packages/shiroa/typst.toml b/packages/shiroa/typst.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shiroa"
-version = "0.1.1"
+version = "0.1.2"
 entrypoint = "lib.typ"
 authors = ["Myriad-Dreamin <https://github.com/Myriad-Dreamin>"]
 license = "Apache-2.0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,4 @@ @@
     ]
     #res.push(t)
-    #res.push(t)
     #res