updated compiler version + dependencies
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "../src/circuit.typ": circuit
|
#import "../src/circuit.typ": circuit
|
||||||
#import "../src/util.typ"
|
#import "../src/util.typ"
|
||||||
|
|
||||||
|
40
gallery.bash
@ -1,40 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
PDFS=false
|
|
||||||
|
|
||||||
while getopts "p" flag
|
|
||||||
do
|
|
||||||
case "${flag}" in
|
|
||||||
p) PDFS=true;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "Generating gallery images"
|
|
||||||
|
|
||||||
set -- ./gallery/*.typ
|
|
||||||
cnt="$#"
|
|
||||||
i=1
|
|
||||||
for f
|
|
||||||
do
|
|
||||||
f2="${f/typ/png}"
|
|
||||||
echo "($i/$cnt) $f -> $f2"
|
|
||||||
typst c --root ./ "$f" "$f2"
|
|
||||||
i=$((i+1))
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ "$PDFS" = true ]
|
|
||||||
then
|
|
||||||
echo
|
|
||||||
echo "Generating gallery PDFs"
|
|
||||||
|
|
||||||
set -- ./gallery/*.typ
|
|
||||||
cnt="$#"
|
|
||||||
i=1
|
|
||||||
for f
|
|
||||||
do
|
|
||||||
f2="${f/typ/pdf}"
|
|
||||||
echo "($i/$cnt) $f -> $f2"
|
|
||||||
typst c --root ./ "$f" "$f2"
|
|
||||||
i=$((i+1))
|
|
||||||
done
|
|
||||||
fi
|
|
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 45 KiB |
BIN
gallery/test.png
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 142 KiB |
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 142 KiB |
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 66 KiB |
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "../src/lib.typ": circuit, element, util, wire
|
#import "../src/lib.typ": circuit, element, util, wire
|
||||||
|
|
||||||
#set page(width: auto, height: auto, margin: .5cm)
|
#set page(width: auto, height: auto, margin: .5cm)
|
||||||
|
Before Width: | Height: | Size: 159 KiB After Width: | Height: | Size: 159 KiB |
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "../src/lib.typ": *
|
#import "../src/lib.typ": *
|
||||||
|
|
||||||
#set page(width: auto, height: auto, margin: .5cm)
|
#set page(width: auto, height: auto, margin: .5cm)
|
||||||
|
Before Width: | Height: | Size: 276 KiB After Width: | Height: | Size: 275 KiB |
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "../src/lib.typ": *
|
#import "../src/lib.typ": *
|
||||||
|
|
||||||
#set page(width: auto, height: auto, margin: .5cm)
|
#set page(width: auto, height: auto, margin: .5cm)
|
||||||
|
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 76 KiB |
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw, vector
|
#import "@preview/cetz:0.3.2": draw, vector
|
||||||
#import "../src/lib.typ": *
|
#import "../src/lib.typ": *
|
||||||
|
|
||||||
#set page(width: auto, height: auto, margin: .5cm)
|
#set page(width: auto, height: auto, margin: .5cm)
|
||||||
|
11
justfile
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# Local Variables:
|
||||||
|
# mode: makefile
|
||||||
|
# End:
|
||||||
|
gallery_dir := "./gallery"
|
||||||
|
set shell := ["bash", "-uc"]
|
||||||
|
|
||||||
|
manual:
|
||||||
|
typst c manual.typ manual.pdf
|
||||||
|
|
||||||
|
gallery:
|
||||||
|
for f in "{{gallery_dir}}"/*.typ; do typst c --root . "$f" "${f%typ}png"; done
|
BIN
manual.pdf
23
manual.typ
@ -1,5 +1,5 @@
|
|||||||
#import "@preview/tidy:0.3.0"
|
#import "@preview/tidy:0.4.1"
|
||||||
#import "@preview/cetz:0.2.2": draw, canvas
|
#import "@preview/cetz:0.3.2": draw, canvas
|
||||||
#import "src/lib.typ"
|
#import "src/lib.typ"
|
||||||
#import "doc/examples.typ"
|
#import "doc/examples.typ"
|
||||||
#import "src/circuit.typ": circuit
|
#import "src/circuit.typ": circuit
|
||||||
@ -12,7 +12,7 @@
|
|||||||
numbering("1.1", ..num)
|
numbering("1.1", ..num)
|
||||||
})
|
})
|
||||||
#{
|
#{
|
||||||
outline(indent: true, depth: 3)
|
outline(indent: auto, depth: 3)
|
||||||
}
|
}
|
||||||
|
|
||||||
#show link: set text(blue)
|
#show link: set text(blue)
|
||||||
@ -47,7 +47,7 @@
|
|||||||
|
|
||||||
#set page(numbering: "1/1", header: align(right)[circuiteria #sym.dash.em v#lib.version])
|
#set page(numbering: "1/1", header: align(right)[circuiteria #sym.dash.em v#lib.version])
|
||||||
#set page(
|
#set page(
|
||||||
header: locate(loc => {
|
header: context {
|
||||||
let txt = [circuiteria #sym.dash.em v#lib.version]
|
let txt = [circuiteria #sym.dash.em v#lib.version]
|
||||||
let cnt = counter(heading)
|
let cnt = counter(heading)
|
||||||
let cnt-val = cnt.get()
|
let cnt-val = cnt.get()
|
||||||
@ -65,8 +65,8 @@
|
|||||||
#rect(width: 100%, height: .5em, radius: .25em, stroke: none, fill: util.colors.values().at(i))
|
#rect(width: 100%, height: .5em, radius: .25em, stroke: none, fill: util.colors.values().at(i))
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
}),
|
},
|
||||||
footer: locate(loc => {
|
footer: context {
|
||||||
let cnt = counter(heading)
|
let cnt = counter(heading)
|
||||||
let cnt-val = cnt.get()
|
let cnt-val = cnt.get()
|
||||||
if cnt-val.len() < 2 { return }
|
if cnt-val.len() < 2 { return }
|
||||||
@ -80,12 +80,12 @@
|
|||||||
],
|
],
|
||||||
counter(page).display("1/1", both: true)
|
counter(page).display("1/1", both: true)
|
||||||
)
|
)
|
||||||
})
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
#let doc-ref(target, full: false, var: false) = {
|
#let doc-ref(target, full: false, var: false) = {
|
||||||
let (module, func) = target.split(".")
|
let (module, func) = target.split(".")
|
||||||
let label-name = module + func
|
let label-name = module + "-" + func
|
||||||
let display-name = func
|
let display-name = func
|
||||||
if full {
|
if full {
|
||||||
display-name = target
|
display-name = target
|
||||||
@ -94,7 +94,7 @@
|
|||||||
label-name += "()"
|
label-name += "()"
|
||||||
display-name += "()"
|
display-name += "()"
|
||||||
}
|
}
|
||||||
link(label(label-name))[#display-name]
|
link(label(label-name), raw(display-name))
|
||||||
}
|
}
|
||||||
|
|
||||||
= Introduction
|
= Introduction
|
||||||
@ -117,6 +117,7 @@ Simply import #link("src/lib.typ") and call the `circuit` function:
|
|||||||
#let circuit-docs = tidy.parse-module(
|
#let circuit-docs = tidy.parse-module(
|
||||||
read("src/circuit.typ"),
|
read("src/circuit.typ"),
|
||||||
name: "circuit",
|
name: "circuit",
|
||||||
|
old-syntax: true,
|
||||||
require-all-parameters: true
|
require-all-parameters: true
|
||||||
)
|
)
|
||||||
#tidy.show-module(circuit-docs)
|
#tidy.show-module(circuit-docs)
|
||||||
@ -126,6 +127,7 @@ Simply import #link("src/lib.typ") and call the `circuit` function:
|
|||||||
#let util-docs = tidy.parse-module(
|
#let util-docs = tidy.parse-module(
|
||||||
read("src/util.typ"),
|
read("src/util.typ"),
|
||||||
name: "util",
|
name: "util",
|
||||||
|
old-syntax: true,
|
||||||
require-all-parameters: true,
|
require-all-parameters: true,
|
||||||
scope: (
|
scope: (
|
||||||
util: util,
|
util: util,
|
||||||
@ -140,6 +142,7 @@ Simply import #link("src/lib.typ") and call the `circuit` function:
|
|||||||
#let wire-docs = tidy.parse-module(
|
#let wire-docs = tidy.parse-module(
|
||||||
read("src/wire.typ"),
|
read("src/wire.typ"),
|
||||||
name: "wire",
|
name: "wire",
|
||||||
|
old-syntax: true,
|
||||||
require-all-parameters: true,
|
require-all-parameters: true,
|
||||||
scope: (
|
scope: (
|
||||||
wire: wire,
|
wire: wire,
|
||||||
@ -161,6 +164,7 @@ Simply import #link("src/lib.typ") and call the `circuit` function:
|
|||||||
read("src/elements/multiplexer.typ") + "\n" +
|
read("src/elements/multiplexer.typ") + "\n" +
|
||||||
read("src/elements/group.typ"),
|
read("src/elements/group.typ"),
|
||||||
name: "element",
|
name: "element",
|
||||||
|
old-syntax: true,
|
||||||
scope: (
|
scope: (
|
||||||
element: element,
|
element: element,
|
||||||
circuit: circuit,
|
circuit: circuit,
|
||||||
@ -183,6 +187,7 @@ Simply import #link("src/lib.typ") and call the `circuit` function:
|
|||||||
read("src/elements/logic/or.typ") + "\n" +
|
read("src/elements/logic/or.typ") + "\n" +
|
||||||
read("src/elements/logic/xor.typ"),
|
read("src/elements/logic/xor.typ"),
|
||||||
name: "gates",
|
name: "gates",
|
||||||
|
old-syntax: true,
|
||||||
scope: (
|
scope: (
|
||||||
element: element,
|
element: element,
|
||||||
circuit: circuit,
|
circuit: circuit,
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": canvas
|
#import "@preview/cetz:0.3.2": canvas
|
||||||
#import "@preview/tidy:0.3.0"
|
#import "@preview/tidy:0.3.0"
|
||||||
|
|
||||||
/// Draws a block circuit diagram
|
/// Draws a block circuit diagram
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "element.typ"
|
#import "element.typ"
|
||||||
#import "ports.typ": add-port
|
#import "ports.typ": add-port
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "element.typ"
|
#import "element.typ"
|
||||||
|
|
||||||
#let draw-shape(id, tl, tr, br, bl, fill, stroke) = {
|
#let draw-shape(id, tl, tr, br, bl, fill, stroke) = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw, coordinate
|
#import "@preview/cetz:0.3.2": draw, coordinate
|
||||||
#import "ports.typ": add-ports, add-port
|
#import "ports.typ": add-ports, add-port
|
||||||
#import "../util.typ"
|
#import "../util.typ"
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "element.typ"
|
#import "element.typ"
|
||||||
#import "ports.typ": add-port
|
#import "ports.typ": add-port
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw, coordinate
|
#import "@preview/cetz:0.3.2": draw, coordinate
|
||||||
#import "../util.typ"
|
#import "../util.typ"
|
||||||
|
|
||||||
/// Draws a group of elements
|
/// Draws a group of elements
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "gate.typ"
|
#import "gate.typ"
|
||||||
|
|
||||||
#let draw-shape(id, tl, tr, br, bl, fill, stroke) = {
|
#let draw-shape(id, tl, tr, br, bl, fill, stroke) = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "gate.typ"
|
#import "gate.typ"
|
||||||
|
|
||||||
#let draw-shape(id, tl, tr, br, bl, fill, stroke) = {
|
#let draw-shape(id, tl, tr, br, bl, fill, stroke) = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw, coordinate
|
#import "@preview/cetz:0.3.2": draw, coordinate
|
||||||
#import "../ports.typ": add-ports, add-port
|
#import "../ports.typ": add-ports, add-port
|
||||||
#import "../element.typ"
|
#import "../element.typ"
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "gate.typ"
|
#import "gate.typ"
|
||||||
|
|
||||||
#let draw-shape(id, tl, tr, br, bl, fill, stroke) = {
|
#let draw-shape(id, tl, tr, br, bl, fill, stroke) = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "gate.typ"
|
#import "gate.typ"
|
||||||
|
|
||||||
#let space = 10%
|
#let space = 10%
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "../util.typ"
|
#import "../util.typ"
|
||||||
#import "element.typ"
|
#import "element.typ"
|
||||||
#import "ports.typ": add-port
|
#import "ports.typ": add-port
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw
|
#import "@preview/cetz:0.3.2": draw
|
||||||
#import "../util.typ": rotate-anchor
|
#import "../util.typ": rotate-anchor
|
||||||
|
|
||||||
#let add-port(
|
#let add-port(
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#let version = version(0, 1, 0)
|
#let version = version(0, 2, 0)
|
||||||
|
|
||||||
#import "circuit.typ": circuit
|
#import "circuit.typ": circuit
|
||||||
#import "element.typ"
|
#import "element.typ"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#import "@preview/cetz:0.2.2": draw, coordinate
|
#import "@preview/cetz:0.3.2": draw, coordinate
|
||||||
#import "util.typ": opposite-anchor
|
#import "util.typ": opposite-anchor
|
||||||
|
|
||||||
/// List of valid wire styles
|
/// List of valid wire styles
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "circuiteria"
|
name = "circuiteria"
|
||||||
version = "0.1.0"
|
version = "0.2.0"
|
||||||
compiler = "0.11.0"
|
compiler = "0.13.0"
|
||||||
repository = "https://git.kb28.ch/HEL/circuiteria"
|
repository = "https://git.kb28.ch/HEL/circuiteria"
|
||||||
entrypoint = "src/lib.typ"
|
entrypoint = "src/lib.typ"
|
||||||
authors = [
|
authors = [
|
||||||
@ -11,4 +11,4 @@ categories = [ "visualization" ]
|
|||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
description = "Drawing block circuits with Typst made easy, using CeTZ"
|
description = "Drawing block circuits with Typst made easy, using CeTZ"
|
||||||
keywords = [ "circuit", "block", "draw" ]
|
keywords = [ "circuit", "block", "draw" ]
|
||||||
exclude = [ "gallery", "gallery.bash", "doc" ]
|
exclude = [ "gallery", "justfile", "doc" ]
|