diff --git a/Cargo.toml b/Cargo.toml index 519d06f10..ec69bfa6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,10 +10,10 @@ authors = ["The Typst Project Developers"] edition = "2021" homepage = "https://typst.app" repository = "https://github.com/typst/typst" -readme = "README.md" license = "Apache-2.0" categories = ["compilers"] keywords = ["typst"] +readme = "README.md" [workspace.dependencies] typst = { path = "crates/typst" } diff --git a/crates/typst-cli/Cargo.toml b/crates/typst-cli/Cargo.toml index 74c53e464..57251a64a 100644 --- a/crates/typst-cli/Cargo.toml +++ b/crates/typst-cli/Cargo.toml @@ -10,6 +10,7 @@ edition = { workspace = true } homepage = { workspace = true } repository = { workspace = true } license = { workspace = true } +readme = { workspace = true } [[bin]] name = "typst" diff --git a/crates/typst-ide/Cargo.toml b/crates/typst-ide/Cargo.toml index 28083af4c..b29275622 100644 --- a/crates/typst-ide/Cargo.toml +++ b/crates/typst-ide/Cargo.toml @@ -10,6 +10,7 @@ repository = { workspace = true } license = { workspace = true } categories = { workspace = true } keywords = { workspace = true } +readme = { workspace = true } [lib] test = false diff --git a/crates/typst-macros/Cargo.toml b/crates/typst-macros/Cargo.toml index a7f130ec9..caef7eb4b 100644 --- a/crates/typst-macros/Cargo.toml +++ b/crates/typst-macros/Cargo.toml @@ -10,6 +10,7 @@ repository = { workspace = true } license = { workspace = true } categories = { workspace = true } keywords = { workspace = true } +readme = { workspace = true } [lib] proc-macro = true diff --git a/crates/typst-pdf/Cargo.toml b/crates/typst-pdf/Cargo.toml index 61b844981..709ed1088 100644 --- a/crates/typst-pdf/Cargo.toml +++ b/crates/typst-pdf/Cargo.toml @@ -10,6 +10,7 @@ repository = { workspace = true } license = { workspace = true } categories = { workspace = true } keywords = { workspace = true } +readme = { workspace = true } [lib] doctest = false diff --git a/crates/typst-render/Cargo.toml b/crates/typst-render/Cargo.toml index 28033b3ef..2db9b5eda 100644 --- a/crates/typst-render/Cargo.toml +++ b/crates/typst-render/Cargo.toml @@ -10,6 +10,7 @@ repository = { workspace = true } license = { workspace = true } categories = { workspace = true } keywords = { workspace = true } +readme = { workspace = true } [lib] doctest = false diff --git a/crates/typst-svg/Cargo.toml b/crates/typst-svg/Cargo.toml index a0acff95d..143e88ed7 100644 --- a/crates/typst-svg/Cargo.toml +++ b/crates/typst-svg/Cargo.toml @@ -10,6 +10,7 @@ repository = { workspace = true } license = { workspace = true } categories = { workspace = true } keywords = { workspace = true } +readme = { workspace = true } [lib] doctest = false diff --git a/crates/typst-syntax/Cargo.toml b/crates/typst-syntax/Cargo.toml index 708f7de88..f92b6d9b9 100644 --- a/crates/typst-syntax/Cargo.toml +++ b/crates/typst-syntax/Cargo.toml @@ -10,6 +10,7 @@ repository = { workspace = true } license = { workspace = true } categories = { workspace = true } keywords = { workspace = true } +readme = { workspace = true } [lib] doctest = false diff --git a/crates/typst-timing/Cargo.toml b/crates/typst-timing/Cargo.toml index 557561ea0..525d65c54 100644 --- a/crates/typst-timing/Cargo.toml +++ b/crates/typst-timing/Cargo.toml @@ -10,6 +10,7 @@ repository = { workspace = true } license = { workspace = true } categories = { workspace = true } keywords = { workspace = true } +readme = { workspace = true } [dependencies] typst-syntax = { workspace = true } diff --git a/crates/typst/Cargo.toml b/crates/typst/Cargo.toml index f15cdc8a3..fd82c2ccd 100644 --- a/crates/typst/Cargo.toml +++ b/crates/typst/Cargo.toml @@ -10,6 +10,7 @@ edition = { workspace = true } homepage = { workspace = true } repository = { workspace = true } license = { workspace = true } +readme = { workspace = true } [lib] doctest = false diff --git a/crates/typst/src/layout/grid/mod.rs b/crates/typst/src/layout/grid/mod.rs index 4ad096eb4..30507e7bc 100644 --- a/crates/typst/src/layout/grid/mod.rs +++ b/crates/typst/src/layout/grid/mod.rs @@ -191,8 +191,8 @@ pub struct GridElem { /// /// ```example /// #grid( - /// fill: (col, row) => - /// if calc.even(col + row) { luma(230) } + /// fill: (x, y) => + /// if calc.even(x + y) { luma(230) } /// else { white }, /// align: center + horizon, /// columns: 4, diff --git a/crates/typst/src/model/table.rs b/crates/typst/src/model/table.rs index 1b616a0bb..50578780b 100644 --- a/crates/typst/src/model/table.rs +++ b/crates/typst/src/model/table.rs @@ -160,12 +160,12 @@ pub struct TableElem { /// /// ```example /// #table( - /// fill: (col, _) => - /// if calc.odd(col) { luma(240) } + /// fill: (x, _) => + /// if calc.odd(x) { luma(240) } /// else { white }, - /// align: (col, row) => - /// if row == 0 { center } - /// else if col == 0 { left } + /// align: (x, y) => + /// if y == 0 { center } + /// else if x == 0 { left } /// else { right }, /// columns: 4, /// [], [*Q1*], [*Q2*], [*Q3*], diff --git a/crates/typst/src/visualize/mod.rs b/crates/typst/src/visualize/mod.rs index 086c150ce..5c8bf6468 100644 --- a/crates/typst/src/visualize/mod.rs +++ b/crates/typst/src/visualize/mod.rs @@ -28,7 +28,7 @@ use crate::foundations::{category, Category, Scope}; /// /// If you want to create more advanced drawings or plots, also have a look at /// the [CetZ](https://github.com/johannes-wolf/cetz) package as well as more -/// specialized [packages] for your use case. +/// specialized [packages]($universe) for your use case. #[category] pub static VISUALIZE: Category; diff --git a/docs/changelog.md b/docs/changelog.md index b58361038..6b99f1546 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -7,7 +7,8 @@ description: | # Changelog ## Unreleased - Tables (thanks to [@PgBiel](https://github.com/PgBiel)) - - Tables are now _much_ more flexible + - Tables are now _much_ more flexible, read the new + [table guide]($guides/table-guide) to get started - Added [`table.cell`] element for per-cell configuration - Cells can now span multiple [columns]($table.cell.colspan) or [rows]($table.cell.rowspan) @@ -24,13 +25,13 @@ description: | - You can now use template packages to get started with new projects. Click _Start from template_ on the web app's dashboard and choose your preferred template or run the `typst init