Reorganise the repo (#129)

* move source files to src/ * fix manual and remove package dir
cetz-package · Aug 14, 2023 · 1dd907a · 1dd907a
1 parent a7ac25f
commit 1dd907a
Show file tree

Hide file tree

Showing 47 changed files with 77 additions and 106 deletions.
diff --git a/manual.pdf b/manual.pdf
diff --git a/manual.typ b/manual.typ
@@ -1,5 +1,5 @@
-#import "lib.typ"
-#import "styles.typ"
+#import "src/lib.typ"
+#import "src/styles.typ"
 #import "@preview/tidy:0.1.0"
 #import lib: *
 
@@ -247,7 +247,7 @@ circle((0.5, -2.5), radius: 0.5, fill: green)
 ```
 
 == Elements
-#let draw-module = tidy.parse-module(read("draw.typ"), name: "Draw")
+#let draw-module = tidy.parse-module(read("src/draw.typ"), name: "Draw")
 
 #show-module-fn(draw-module, "line")
 ```example
@@ -746,7 +746,7 @@ for-each-anchor("my-rect", (name) => {
 = Libraries
 
 == Tree
-#let tree-module = tidy.parse-module(read("tree.typ"), name: "Tree")
+#let tree-module = tidy.parse-module(read("src/tree.typ"), name: "Tree")
 
 With the tree library, CeTZ provides a simple tree layout algorithm.
 
@@ -784,7 +784,7 @@ current node, all following items are direct children of that node.
 The node itselfes can be of type `content` or `dictionary` with a key `content`.
 
 == Plot
-#let plot-module = tidy.parse-module(read("lib/plot.typ"), name: "Plot")
+#let plot-module = tidy.parse-module(read("src/lib/plot.typ"), name: "Plot")
 
 The library `plot` of CeTZ allows plotting 2D data as linechart.
 
@@ -856,7 +856,7 @@ Axis names to be used for styling:
 #raw(repr(axes.default-style-schoolbook))
 
 == Chart
-#let chart-module = tidy.parse-module(read("lib/chart.typ"), name: "Chart")
+#let chart-module = tidy.parse-module(read("src/lib/chart.typ"), name: "Chart")
 
 With the `chart` library it is easy to draw charts.
 
@@ -937,7 +937,7 @@ styled the same way, see @plot.style.
 #raw(repr(chart.columnchart-default-style))
 
 == Palette <palette>
-#let palette-module = tidy.parse-module(read("lib/palette.typ"), name: "Palette")
+#let palette-module = tidy.parse-module(read("src/lib/palette.typ"), name: "Palette")
 
 A palette is a function that returns a style for an index.
 The palette library provides some predefined palettes.

diff --git a/scripts/package b/scripts/package
@@ -5,38 +5,11 @@ PKG_PREFIX="cetz"
 
 # List of all files that get packaged
 files=(
-  canvas.typ
-  cmd.typ
-  draw.typ
-  util.typ
-  path-util.typ
-  vector.typ
-  matrix.typ
-  bezier.typ
-  intersection.typ
-  coordinate.typ
-  styles.typ
-  tree.typ
-  lib/axes.typ
-  lib/plot.typ
-  lib/chart.typ
-  lib/palette.typ
-  lib.typ
+  src/
+  gallery/
   typst.toml
   LICENSE
   README.md
-  gallery/3d-chart.typ
-  gallery/3d-chart.png
-  gallery/pie-chart.typ
-  gallery/pie-chart.png
-  gallery/karls-picture.typ
-  gallery/karls-picture.png
-  gallery/plot.typ
-  gallery/plot.png
-  gallery/barchart.typ
-  gallery/barchart.png
-  gallery/tree.typ
-  gallery/tree.png
   manual.typ
   manual.pdf
 )
@@ -83,7 +56,7 @@ TMP="$(mktemp -d)"
 
 for f in "${files[@]}"; do
   mkdir -p "$TMP/$(dirname "$f")" 2>/dev/null
-  cp "$SOURCE/$f" "$TMP/$f"
+  cp "$SOURCE/$f" "$TMP/$f" -r
 done
 
 TARGET="${TARGET:?}/${PKG_PREFIX:?}/${VERSION:?}"

diff --git a/bezier.typ → src/bezier.typ b/bezier.typ → src/bezier.typ
diff --git a/canvas.typ → src/canvas.typ b/canvas.typ → src/canvas.typ
diff --git a/cmd.typ → src/cmd.typ b/cmd.typ → src/cmd.typ
diff --git a/coordinate.typ → src/coordinate.typ b/coordinate.typ → src/coordinate.typ
diff --git a/draw.typ → src/draw.typ b/draw.typ → src/draw.typ
diff --git a/intersection.typ → src/intersection.typ b/intersection.typ → src/intersection.typ
diff --git a/lib.typ → src/lib.typ b/lib.typ → src/lib.typ
diff --git a/lib/axes.typ → src/lib/axes.typ b/lib/axes.typ → src/lib/axes.typ
diff --git a/lib/chart.typ → src/lib/chart.typ b/lib/chart.typ → src/lib/chart.typ
diff --git a/lib/palette.typ → src/lib/palette.typ b/lib/palette.typ → src/lib/palette.typ
diff --git a/lib/plot.typ → src/lib/plot.typ b/lib/plot.typ → src/lib/plot.typ
diff --git a/matrix.typ → src/matrix.typ b/matrix.typ → src/matrix.typ
diff --git a/path-util.typ → src/path-util.typ b/path-util.typ → src/path-util.typ
diff --git a/styles.typ → src/styles.typ b/styles.typ → src/styles.typ
diff --git a/tree.typ → src/tree.typ b/tree.typ → src/tree.typ
diff --git a/util.typ → src/util.typ b/util.typ → src/util.typ
diff --git a/vector.typ → src/vector.typ b/vector.typ → src/vector.typ
diff --git a/tests/anchor-on-path/test.typ b/tests/anchor-on-path/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/lib.typ": *
 
 #box(stroke: 2pt + red, canvas({
-    import "../../draw.typ": *
+    import draw: *
 
     let place-along = (path) => {
       let name = "obj"

diff --git a/tests/arc/test.typ b/tests/arc/test.typ
@@ -1,5 +1,5 @@
 #set page(width: auto, height: auto)
-#import "../../lib.typ": *
+#import "../../src/lib.typ": *
 
 #box(stroke: 2pt + red, canvas(length: 1cm, {
   import draw: *

diff --git a/tests/arrows/test.typ b/tests/arrows/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/lib.typ": *
 
 #box(stroke: 2pt + red, canvas({
-    import "../../draw.typ": *
+    import draw: *
 
     let next(mark) = {
         line((), (rel: (1, 0)), mark: mark)

diff --git a/tests/axes/test.typ b/tests/axes/test.typ
@@ -1,9 +1,9 @@
 #set page(width: auto, height: auto)
-#import "../../lib.typ": *
+#import "../../src/lib.typ": *
 
 // Schoolbook Axis Styling
 #box(stroke: 2pt + red, canvas({
-  import "../../draw.typ": *
+  import draw: *
 
   set-style(axes: (stroke: blue))
   set-style(axes: (padding: .75))
@@ -18,7 +18,7 @@
 
 // Scientific Axis Styling
 #box(stroke: 2pt + red, canvas({
-  import "../../draw.typ": *
+  import draw: *
 
   set-style(axes: (stroke: blue))
   set-style(axes: (left: (tick: (stroke: green + 2pt))))
@@ -37,7 +37,7 @@
 
 // Custom Tick Format
 #box(stroke: 2pt + red, canvas({
-  import "../../draw.typ": *
+  import draw: *
 
   axes.scientific(size: (6, 1),
     bottom: axes.axis(min: -2*calc.pi, max: 2*calc.pi, ticks: (

diff --git a/tests/bezier-through/test.typ b/tests/bezier-through/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/lib.typ": *
 
 #block(stroke: 2pt + red, canvas(length: .5cm, {
-  import "../../draw.typ": *
+  import draw: *
 
   let curve-through(a, b, c) = {
     group(name: "g", {
@@ -22,7 +22,7 @@
 }))
 
 #block(stroke: 2pt + red, canvas(length: .5cm, {
-  import "../../draw.typ": *
+  import draw: *
 
   merge-path(close: true, {
     bezier-through((-1, 0), (-calc.cos(45deg), calc.sin(45deg)), (0, 1))

diff --git a/tests/bounds/test.typ b/tests/bounds/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/canvas.typ": *
 
 #box(stroke: 2pt + red, canvas({
-  import "../../draw.typ": *
+  import draw: *
 
   group(name: "g", {
     rotate(37deg)

diff --git a/tests/chart/test.typ b/tests/chart/test.typ
@@ -1,6 +1,5 @@
 #set page(width: auto, height: auto)
-#import "../../lib.typ"
-#import lib: *
+#import "../../src/lib.typ": *
 
 #let data0 = (
   ([1], 1),

diff --git a/tests/circle-through/test.typ b/tests/circle-through/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/lib.typ": *
 
 #box(stroke: 2pt + red, canvas(length: .5cm, {
-    import "../../draw.typ": *
+    import draw: *
 
     let (a, b, c) = ((0,0), (2,-.5), (1,1))
     line(a, b, c, close: true, stroke: gray)

diff --git a/tests/circle/test.typ b/tests/circle/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/lib.typ": *
 
 #box(stroke: 2pt + red, canvas(length: .5cm, {
-    import "../../draw.typ": *
+    import draw: *
 
     set-style(radius: (4, .5), stroke: none)
     for r in range(0, 6) {

diff --git a/tests/cube/test.typ b/tests/cube/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/lib.typ": *
 
 #box(stroke: 2pt + red, canvas({
-    import "../../draw.typ": *
+    import draw: *
 
     line((0, 0, 1), (1, 0, 1), (1, 1, 1), (0, 1, 1), close: true)
     line((0, 0, 1), (0, 0, 0))

diff --git a/tests/grid/test.typ b/tests/grid/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/lib.typ": *
 
 #box(stroke: 2pt + red, canvas({
-    import "../../draw.typ": *
+    import draw: *
 
     grid((0,0), (1,1), step: .1)
 

diff --git a/tests/image/test.typ b/tests/image/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/lib.typ": *
 
 #box(stroke: 2pt + red, canvas({
-    import "../../draw.typ": *
+    import draw: *
 
     content((0,0), image("image.png", width: 2cm),
             anchor: "top-left", name: "i")

diff --git a/tests/intersection/test.typ b/tests/intersection/test.typ
@@ -1,5 +1,5 @@
 #set page(width: auto, height: auto)
-#import "../../lib.typ": *
+#import "../../src/lib.typ": *
 
 #let test(body) = canvas(length: 1cm, {
   import draw: *

diff --git a/tests/local-anchor/test.typ b/tests/local-anchor/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/lib.typ": *
 
 #box(stroke: 2pt + red, canvas({
-    import "../../draw.typ": *
+    import draw: *
 
     circle((0,0), radius: 0.5)
     arc((0, 1), start: -90deg, stop: 90deg, name: "c", anchor: "start")

diff --git a/tests/marks/test.typ b/tests/marks/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/lib.typ": *
 
 #box(stroke: 2pt + red, canvas({
-    import "../../draw.typ": *
+    import draw: *
 
     place-marks(line((0, 0), (1, 0)),
       fill: green,

diff --git a/tests/merge/test.typ b/tests/merge/test.typ
@@ -1,8 +1,8 @@
 #set page(width: auto, height: auto)
-#import "../../canvas.typ": *
+#import "../../src/lib.typ": *
 
 #box(stroke: 2pt + red, canvas({
-    import "../../draw.typ": *
+    import draw: *
 
     // Merge lines
     fill(red)