Merge upstream v0.13.1 (#111)

Author: 3w36zj6

Cargo.lock

@@ -4,7 +4,7 @@ default-members = ["crates/typst-cli"]
 resolver = "2"
 
 [workspace.package]
-version = "0.13.0"
+version = "0.13.1"
 rust-version = "1.80" # also change in ci.yml
 authors = ["The Typst Project Developers"]
 edition = "2021"
@@ -16,24 +16,24 @@ keywords = ["typst"]
 readme = "README.md"
 
 [workspace.dependencies]
-typst = { path = "crates/typst", version = "0.13.0" }
-typst-cli = { path = "crates/typst-cli", version = "0.13.0" }
-typst-eval = { path = "crates/typst-eval", version = "0.13.0" }
-typst-html = { path = "crates/typst-html", version = "0.13.0" }
-typst-ide = { path = "crates/typst-ide", version = "0.13.0" }
-typst-kit = { path = "crates/typst-kit", version = "0.13.0" }
-typst-layout = { path = "crates/typst-layout", version = "0.13.0" }
-typst-library = { path = "crates/typst-library", version = "0.13.0" }
-typst-macros = { path = "crates/typst-macros", version = "0.13.0" }
-typst-pdf = { path = "crates/typst-pdf", version = "0.13.0" }
-typst-realize = { path = "crates/typst-realize", version = "0.13.0" }
-typst-render = { path = "crates/typst-render", version = "0.13.0" }
-typst-svg = { path = "crates/typst-svg", version = "0.13.0" }
-typst-syntax = { path = "crates/typst-syntax", version = "0.13.0" }
-typst-timing = { path = "crates/typst-timing", version = "0.13.0" }
-typst-utils = { path = "crates/typst-utils", version = "0.13.0" }
-typst-assets = "0.13.0"
-typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", tag = "v0.13.0" }
+typst = { path = "crates/typst", version = "0.13.1" }
+typst-cli = { path = "crates/typst-cli", version = "0.13.1" }
+typst-eval = { path = "crates/typst-eval", version = "0.13.1" }
+typst-html = { path = "crates/typst-html", version = "0.13.1" }
+typst-ide = { path = "crates/typst-ide", version = "0.13.1" }
+typst-kit = { path = "crates/typst-kit", version = "0.13.1" }
+typst-layout = { path = "crates/typst-layout", version = "0.13.1" }
+typst-library = { path = "crates/typst-library", version = "0.13.1" }
+typst-macros = { path = "crates/typst-macros", version = "0.13.1" }
+typst-pdf = { path = "crates/typst-pdf", version = "0.13.1" }
+typst-realize = { path = "crates/typst-realize", version = "0.13.1" }
+typst-render = { path = "crates/typst-render", version = "0.13.1" }
+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 = "0.13.1"
+typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", tag = "v0.13.1" }
 arrayvec = "0.7.4"
 az = "1.2"
 base64 = "0.22"

Cargo.toml

@@ -5,7 +5,7 @@
 
 This is an unofficial Japanese translation of the documentation for the typesetting system [Typst](https://typst.app/docs). It has been created with the permission of [Typst GmbH](https://typst.app/legal/).
 
-The repository was forked from the [Chinese version](https://github.com/typst-doc-cn/typst-doc-cn.github.io) and is translated into Japanese based on the official documentation of [Typst v0.12.0](https://typst.app/docs/changelog/#v0.12.0) as of October 2024.
+The repository was forked from the [Chinese version](https://github.com/typst-doc-cn/typst-doc-cn.github.io) and is translated into Japanese based on the official documentation of [Typst v0.13.1](https://typst.app/docs/changelog/#v0.13.1) as of October 2024.
 
 The actual working web version can be viewed at the following URL.
 > https://typst-jp.github.io/docs/

README.en.md

@@ -8,7 +8,7 @@
 
 組版システム [Typst](https://typst.app/docs) の非公式な日本語ドキュメントです。[Typst GmbH](https://typst.app/legal/) の許諾を得て作成されています。
 
-このリポジトリは[中国語版](https://github.com/typst-doc-cn/typst-doc-cn.github.io)からフォークして作成され、2024年10月時点での最新版である [Typst v0.12.0](https://typst.app/docs/changelog/#v0.12.0) の公式ドキュメントを元に日本語訳を行います。
+このリポジトリは[中国語版](https://github.com/typst-doc-cn/typst-doc-cn.github.io)からフォークして作成され、2024年10月時点での最新版である [Typst v0.13.1](https://typst.app/docs/changelog/#v0.13.1) の公式ドキュメントを元に日本語訳を行います。
 
 実際に作動している Web 版は、以下の URL から閲覧できます。
 > https://typst-jp.github.io/docs/

README.md

@@ -204,6 +204,10 @@ impl Watcher {
                 let event = event
                     .map_err(|err| eco_format!("failed to watch dependencies ({err})"))?;
 
+                if !is_relevant_event_kind(&event.kind) {
+                    continue;
+                }
+
                 // Workaround for notify-rs' implicit unwatch on remove/rename
                 // (triggered by some editors when saving files) with the
                 // inotify backend. By keeping track of the potentially
@@ -224,7 +228,17 @@ impl Watcher {
                     }
                 }
 
-                relevant |= self.is_event_relevant(&event);
+                // Don't recompile because the output file changed.
+                // FIXME: This doesn't work properly for multifile image export.
+                if event
+                    .paths
+                    .iter()
+                    .all(|path| is_same_file(path, &self.output).unwrap_or(false))
+                {
+                    continue;
+                }
+
+                relevant = true;
             }
 
             // If we found a relevant event or if any of the missing files now
@@ -234,32 +248,23 @@ impl Watcher {
             }
         }
     }
+}
 
-    /// Whether a watch event is relevant for compilation.
-    fn is_event_relevant(&self, event: &notify::Event) -> bool {
-        // Never recompile because the output file changed.
-        if event
-            .paths
-            .iter()
-            .all(|path| is_same_file(path, &self.output).unwrap_or(false))
-        {
-            return false;
-        }
-
-        match &event.kind {
-            notify::EventKind::Any => true,
-            notify::EventKind::Access(_) => false,
-            notify::EventKind::Create(_) => true,
-            notify::EventKind::Modify(kind) => match kind {
-                notify::event::ModifyKind::Any => true,
-                notify::event::ModifyKind::Data(_) => true,
-                notify::event::ModifyKind::Metadata(_) => false,
-                notify::event::ModifyKind::Name(_) => true,
-                notify::event::ModifyKind::Other => false,
-            },
-            notify::EventKind::Remove(_) => true,
-            notify::EventKind::Other => false,
-        }
+/// Whether a kind of watch event is relevant for compilation.
+fn is_relevant_event_kind(kind: &notify::EventKind) -> bool {
+    match kind {
+        notify::EventKind::Any => true,
+        notify::EventKind::Access(_) => false,
+        notify::EventKind::Create(_) => true,
+        notify::EventKind::Modify(kind) => match kind {
+            notify::event::ModifyKind::Any => true,
+            notify::event::ModifyKind::Data(_) => true,
+            notify::event::ModifyKind::Metadata(_) => false,
+            notify::event::ModifyKind::Name(_) => true,
+            notify::event::ModifyKind::Other => false,
+        },
+        notify::EventKind::Remove(_) => true,
+        notify::EventKind::Other => false,
     }
 }
 

crates/typst-cli/src/watch.rs

@@ -83,8 +83,8 @@ fn html_document_impl(
     )?;
 
     let output = handle_list(&mut engine, &mut locator, children.iter().copied())?;
+    let introspector = Introspector::html(&output);
     let root = root_element(output, &info)?;
-    let introspector = Introspector::html(&root);
 
     Ok(HtmlDocument { info, root, introspector })
 }
@@ -307,18 +307,18 @@ fn head_element(info: &DocumentInfo) -> HtmlElement {
 
 /// Determine which kind of output the user generated.
 fn classify_output(mut output: Vec<HtmlNode>) -> SourceResult<OutputKind> {
-    let len = output.len();
+    let count = output.iter().filter(|node| !matches!(node, HtmlNode::Tag(_))).count();
     for node in &mut output {
         let HtmlNode::Element(elem) = node else { continue };
         let tag = elem.tag;
         let mut take = || std::mem::replace(elem, HtmlElement::new(tag::html));
-        match (tag, len) {
+        match (tag, count) {
             (tag::html, 1) => return Ok(OutputKind::Html(take())),
             (tag::body, 1) => return Ok(OutputKind::Body(take())),
             (tag::html | tag::body, _) => bail!(
                 elem.span,
                 "`{}` element must be the only element in the document",
-                elem.tag
+                elem.tag,
             ),
             _ => {}
         }

crates/typst-html/src/lib.rs

@@ -284,6 +284,7 @@ impl<'a> CurveBuilder<'a> {
         self.last_point = point;
         self.last_control_from = point;
         self.is_started = true;
+        self.is_empty = true;
     }
 
     /// Add a line segment.

crates/typst-layout/src/shapes.rs

@@ -769,7 +769,7 @@ impl Array {
     ///
     /// ```example
     /// #let array = (1, 2, 3, 4, 5, 6, 7, 8)
-    /// #array.chunks(3)
+    /// #array.chunks(3) \
     /// #array.chunks(3, exact: true)
     /// ```
     #[func]

crates/typst-library/src/foundations/array.rs

@@ -437,10 +437,10 @@ impl PartialEq for Func {
     }
 }
 
-impl PartialEq<&NativeFuncData> for Func {
-    fn eq(&self, other: &&NativeFuncData) -> bool {
+impl PartialEq<&'static NativeFuncData> for Func {
+    fn eq(&self, other: &&'static NativeFuncData) -> bool {
         match &self.repr {
-            Repr::Native(native) => native.function == other.function,
+            Repr::Native(native) => *native == Static(*other),
             _ => false,
         }
     }