diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a6686a..09047e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,10 +15,6 @@ jobs: - uses: actions/checkout@v3 with: submodules: recursive - - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: imagemagick cargo parallel - version: 1.0 - name: Install just from crates.io uses: baptiste0928/cargo-install@v3 with: @@ -31,10 +27,10 @@ jobs: tag: ci-semi-stable - run: | mkdir -p ~/.local/share/typst/packages/preview/cetz - git clone --depth 1 --branch v0.3.1 https://github.com/cetz-package/cetz.git ~/.local/share/typst/packages/preview/cetz/0.3.1 + git clone --depth 1 --branch v0.3.2 https://github.com/cetz-package/cetz.git ~/.local/share/typst/packages/preview/cetz/0.3.2 - uses: typst-community/setup-typst@v3 with: - typst-version: '0.12.0-rc2' + typst-version: '0.12.0' cache-dependency-path: src/cetz.typ - run: | just install @local diff --git a/README.md b/README.md index 2c0e697..8b6bc62 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,8 @@ For information, see the [manual (stable)](https://github.com/cetz-package/cetz- To use this package, simply add the following code to your document: ``` -#import "@preview/cetz:0.3.1" -#import "@preview/cetz-plot:0.1.0": plot, chart +#import "@preview/cetz:0.3.2" +#import "@preview/cetz-plot:0.1.1": plot, chart #cetz.canvas({ // Your plot/chart code goes here diff --git a/doc/style.typ b/doc/style.typ index 95512a7..5342181 100644 --- a/doc/style.typ +++ b/doc/style.typ @@ -1,7 +1,7 @@ #import "example.typ": example #import "/src/lib.typ" -#import "@preview/tidy:0.1.0" +#import "@preview/tidy:0.3.0" #import "@preview/t4t:0.3.2": is #let show-function(fn, style-args) = { @@ -61,7 +61,7 @@ stack(dir: ttb, spacing: 1em, // name Default: block(breakable: false, width: 100%, stack(dir: ltr, - [#text(weight: "bold", name + [:]) #types.map(tidy.styles.default.show-type).join(" or ")], + [#text(weight: "bold", name + [:]) #types.map(tidy.styles.default.show-type.with(style-args: tidy.styles.default)).join(" or ")], if show-default { align(right)[ Default: #raw( @@ -77,19 +77,6 @@ ) } - -#let show-type = tidy.styles.default.show-type -#let show-outline = tidy.styles.default.show-outline -#let show-parameter-list = tidy.styles.default.show-parameter-list - -#let style = ( - show-function: show-function, - show-parameter-block: show-parameter-block.with(in-tidy: true), - show-type: show-type, - show-outline: show-outline, - show-parameter-list: show-parameter-list -) - #let parse-show-module(path) = { tidy.show-module( tidy.parse-module( @@ -102,6 +89,5 @@ ), show-outline: false, sort-functions: none, - style: style ) } diff --git a/gallery/barchart.typ b/gallery/barchart.typ index d1b500d..1e6250a 100644 --- a/gallery/barchart.typ +++ b/gallery/barchart.typ @@ -1,5 +1,5 @@ -#import "@preview/cetz:0.3.1": canvas, draw -#import "@preview/cetz-plot:0.1.0": chart +#import "@preview/cetz:0.3.2": canvas, draw +#import "@preview/cetz-plot:0.1.1": chart #set page(width: auto, height: auto, margin: .5cm) diff --git a/gallery/line.typ b/gallery/line.typ index d663292..55509b2 100644 --- a/gallery/line.typ +++ b/gallery/line.typ @@ -1,5 +1,5 @@ -#import "@preview/cetz:0.3.1": canvas, draw -#import "@preview/cetz-plot:0.1.0": plot +#import "@preview/cetz:0.3.2": canvas, draw +#import "@preview/cetz-plot:0.1.1": plot #set page(width: auto, height: auto, margin: .5cm) diff --git a/gallery/piechart.typ b/gallery/piechart.typ index 3d6529c..e38d5b9 100644 --- a/gallery/piechart.typ +++ b/gallery/piechart.typ @@ -1,5 +1,5 @@ -#import "@preview/cetz:0.3.1" -#import "@preview/cetz-plot:0.1.0": chart +#import "@preview/cetz:0.3.2" +#import "@preview/cetz-plot:0.1.1": chart #set page(width: auto, height: auto, margin: .5cm) diff --git a/gallery/pyramid.typ b/gallery/pyramid.typ index c010726..6f2fbbc 100644 --- a/gallery/pyramid.typ +++ b/gallery/pyramid.typ @@ -1,5 +1,5 @@ -#import "@preview/cetz:0.3.1" -#import "@preview/cetz-plot:0.1.0": chart +#import "@preview/cetz:0.3.2" +#import "@preview/cetz-plot:0.1.1": chart #set page(width: auto, height: auto, margin: .5cm) diff --git a/manual.pdf b/manual.pdf index 3266a06..fc380ea 100644 Binary files a/manual.pdf and b/manual.pdf differ diff --git a/manual.typ b/manual.typ index ba24879..14c4b0f 100644 --- a/manual.typ +++ b/manual.typ @@ -39,8 +39,8 @@ CeTZ-Plot is a simple plotting library for use with CeTZ. This is the minimal starting point: #pad(left: 1em)[```typ -#import "@preview/cetz:0.3.1" -#import "@preview/cetz-plot:0.1.0" +#import "@preview/cetz:0.3.2" +#import "@preview/cetz-plot:0.1.1" #cetz.canvas({ import cetz.draw: * import cetz-plot: * diff --git a/src/cetz.typ b/src/cetz.typ index 8772069..420d1c7 100644 --- a/src/cetz.typ +++ b/src/cetz.typ @@ -1,2 +1,2 @@ // Import cetz into the root scope. Import cetz by importing this file only! -#import "@preview/cetz:0.3.1": * +#import "@preview/cetz:0.3.2": * diff --git a/typst.toml b/typst.toml index 9a92105..0de882c 100644 --- a/typst.toml +++ b/typst.toml @@ -1,7 +1,7 @@ [package] name = "cetz-plot" -version = "0.1.0" -compiler = "0.11.0" +version = "0.1.1" +compiler = "0.12.0" repository = "https://github.com/cetz-package/cetz-plot" entrypoint = "src/lib.typ" authors = [