Reorganize directory structure, update to sauron 0.43.40.6.2

71 files changed, 10 insertions, 10 deletions

diff --git a/.gitignore b/.gitignore
index e00d578..c52bbf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-target
+target/
 *.sw*
 *.bk
 Cargo.lock
diff --git a/.scripts/publish.sh b/.scripts/publish.sh
index 6aaebfd..e244951 100755
--- a/.scripts/publish.sh
+++ b/.scripts/publish.sh
@@ -5,6 +5,6 @@
 #
 
 set -ev
-cd svgbob && cargo publish && cd - && \
-echo "sleeping for 10s" && sleep 10 &&\
-cd svgbob_cli && cargo publish && cd - 
+cd packages/svgbob && cargo publish && cd - && \
+echo "sleeping" && sleep 20 &&\
+cd packages/cli && cargo publish && cd - 
diff --git a/Cargo.toml b/Cargo.toml
index d13c62f..3e3d545 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
-    "svgbob",
-    "svgbob_cli",
+    "packages/svgbob",
+    "packages/cli",
 ]
 
 [patch.crates-io]
diff --git a/svgbob_cli/Cargo.toml b/packages/cli/Cargo.toml
index f12a7b1..6d3ae53 100644
--- a/svgbob_cli/Cargo.toml
+++ b/packages/cli/Cargo.toml
@@ -1,7 +1,7 @@
 
 [package]
 name = "svgbob_cli"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Jovansonlee Cesar <ivanceras@gmail.com>"]
 description = "Transform your ascii diagrams into happy little SVG"
 repository = "https://github.com/ivanceras/svgbob"
diff --git a/svgbob_cli/screenshots/ascii_art.svg b/packages/cli/screenshots/ascii_art.svg
index a531a52..a531a52 100644
--- a/svgbob_cli/screenshots/ascii_art.svg
+++ b/packages/cli/screenshots/ascii_art.svg
diff --git a/svgbob_cli/screenshots/comic.svg b/packages/cli/screenshots/comic.svg
index 8359379..8359379 100644
--- a/svgbob_cli/screenshots/comic.svg
+++ b/packages/cli/screenshots/comic.svg
diff --git a/svgbob_cli/screenshots/image.svg b/packages/cli/screenshots/image.svg
index 7c1efb2..7c1efb2 100644
--- a/svgbob_cli/screenshots/image.svg
+++ b/packages/cli/screenshots/image.svg
diff --git a/svgbob_cli/screenshots/memes.svg b/packages/cli/screenshots/memes.svg
index df182fe..df182fe 100644
--- a/svgbob_cli/screenshots/memes.svg
+++ b/packages/cli/screenshots/memes.svg
diff --git a/svgbob_cli/screenshots/memes2.svg b/packages/cli/screenshots/memes2.svg
index 4d114da..4d114da 100644
--- a/svgbob_cli/screenshots/memes2.svg
+++ b/packages/cli/screenshots/memes2.svg
diff --git a/svgbob_cli/screenshots/memes3.svg b/packages/cli/screenshots/memes3.svg
index 792ba70..792ba70 100644
--- a/svgbob_cli/screenshots/memes3.svg
+++ b/packages/cli/screenshots/memes3.svg
diff --git a/svgbob_cli/src/main.rs b/packages/cli/src/main.rs
index 0773354..0773354 100644
--- a/svgbob_cli/src/main.rs
+++ b/packages/cli/src/main.rs
diff --git a/svgbob/Behavior.md b/packages/svgbob/Behavior.md
index 4b001eb..4b001eb 100644
--- a/svgbob/Behavior.md
+++ b/packages/svgbob/Behavior.md
diff --git a/svgbob/Cargo.toml b/packages/svgbob/Cargo.toml
index 9fc1130..a81790c 100644
--- a/svgbob/Cargo.toml
+++ b/packages/svgbob/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "svgbob"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Jovansonlee Cesar <ivanceras@gmail.com>"]
 edition = "2018"
 description = "Transform your ascii diagrams into happy little SVG"
@@ -13,8 +13,8 @@ license = "Apache-2.0"
 nalgebra = "0.29"
 parry2d = "0.7"
 lazy_static = "1.3.0"
-#sauron = { version = "0.43", default-features = false}
-sauron = { version = "0.43", default-features = false, path = "../../sauron"}
+sauron = { version = "0.43.4", default-features = false}
+#sauron = { version = "0.43", default-features = false, path = "../../../sauron"}
 unicode-width = "0.1.5"
 itertools = "0.8.0"
 pom = { version = "3.1.0" }
diff --git a/svgbob/concepts.md b/packages/svgbob/concepts.md
index f550968..f550968 100644
--- a/svgbob/concepts.md
+++ b/packages/svgbob/concepts.md
diff --git a/svgbob/examples/circles.rs b/packages/svgbob/examples/circles.rs
index 95f5ce8..95f5ce8 100644
--- a/svgbob/examples/circles.rs
+++ b/packages/svgbob/examples/circles.rs
diff --git a/svgbob/examples/circuits.rs b/packages/svgbob/examples/circuits.rs
index c94fe60..c94fe60 100644
--- a/svgbob/examples/circuits.rs
+++ b/packages/svgbob/examples/circuits.rs
diff --git a/svgbob/examples/demo.rs b/packages/svgbob/examples/demo.rs
index 5c8a8b8..5c8a8b8 100644
--- a/svgbob/examples/demo.rs
+++ b/packages/svgbob/examples/demo.rs
diff --git a/svgbob/examples/example.rs b/packages/svgbob/examples/example.rs
index ad4a3c4..ad4a3c4 100644
--- a/svgbob/examples/example.rs
+++ b/packages/svgbob/examples/example.rs
diff --git a/svgbob/examples/long.rs b/packages/svgbob/examples/long.rs
index a2901ac..a2901ac 100644
--- a/svgbob/examples/long.rs
+++ b/packages/svgbob/examples/long.rs
diff --git a/svgbob/examples/merge.rs b/packages/svgbob/examples/merge.rs
index 766b262..766b262 100644
--- a/svgbob/examples/merge.rs
+++ b/packages/svgbob/examples/merge.rs
diff --git a/svgbob/examples/simple.rs b/packages/svgbob/examples/simple.rs
index 4418e38..4418e38 100644
--- a/svgbob/examples/simple.rs
+++ b/packages/svgbob/examples/simple.rs
diff --git a/svgbob/run_circles.sh b/packages/svgbob/run_circles.sh
index d09eb23..d09eb23 100755
--- a/svgbob/run_circles.sh
+++ b/packages/svgbob/run_circles.sh
diff --git a/svgbob/run_demo.sh b/packages/svgbob/run_demo.sh
index aa6dbd1..aa6dbd1 100755
--- a/svgbob/run_demo.sh
+++ b/packages/svgbob/run_demo.sh
diff --git a/svgbob/run_example.sh b/packages/svgbob/run_example.sh
index 8556916..8556916 100755
--- a/svgbob/run_example.sh
+++ b/packages/svgbob/run_example.sh
diff --git a/svgbob/run_long.sh b/packages/svgbob/run_long.sh
index b6d8c7f..b6d8c7f 100755
--- a/svgbob/run_long.sh
+++ b/packages/svgbob/run_long.sh
diff --git a/svgbob/run_merge.sh b/packages/svgbob/run_merge.sh
index c837cbc..c837cbc 100755
--- a/svgbob/run_merge.sh
+++ b/packages/svgbob/run_merge.sh
diff --git a/svgbob/run_simple.sh b/packages/svgbob/run_simple.sh
index 9a77a9a..9a77a9a 100755
--- a/svgbob/run_simple.sh
+++ b/packages/svgbob/run_simple.sh
diff --git a/svgbob/rustfmt.toml b/packages/svgbob/rustfmt.toml
index 503ede8..503ede8 100644
--- a/svgbob/rustfmt.toml
+++ b/packages/svgbob/rustfmt.toml
diff --git a/svgbob/spec.md b/packages/svgbob/spec.md
index b1f5c5c..b1f5c5c 100644
--- a/svgbob/spec.md
+++ b/packages/svgbob/spec.md
diff --git a/svgbob/src/buffer.rs b/packages/svgbob/src/buffer.rs
index 867bd3c..867bd3c 100644
--- a/svgbob/src/buffer.rs
+++ b/packages/svgbob/src/buffer.rs
diff --git a/svgbob/src/buffer/cell_buffer.rs b/packages/svgbob/src/buffer/cell_buffer.rs
index c1f4421..c1f4421 100644
--- a/svgbob/src/buffer/cell_buffer.rs
+++ b/packages/svgbob/src/buffer/cell_buffer.rs
diff --git a/svgbob/src/buffer/cell_buffer/cell.rs b/packages/svgbob/src/buffer/cell_buffer/cell.rs
index e2fa1ca..e2fa1ca 100644
--- a/svgbob/src/buffer/cell_buffer/cell.rs
+++ b/packages/svgbob/src/buffer/cell_buffer/cell.rs
diff --git a/svgbob/src/buffer/cell_buffer/cell/cell_grid.rs b/packages/svgbob/src/buffer/cell_buffer/cell/cell_grid.rs
index 0e6f25a..0e6f25a 100644
--- a/svgbob/src/buffer/cell_buffer/cell/cell_grid.rs
+++ b/packages/svgbob/src/buffer/cell_buffer/cell/cell_grid.rs
diff --git a/svgbob/src/buffer/cell_buffer/contacts.rs b/packages/svgbob/src/buffer/cell_buffer/contacts.rs
index 9fe2c11..9fe2c11 100644
--- a/svgbob/src/buffer/cell_buffer/contacts.rs
+++ b/packages/svgbob/src/buffer/cell_buffer/contacts.rs
diff --git a/svgbob/src/buffer/cell_buffer/endorse.rs b/packages/svgbob/src/buffer/cell_buffer/endorse.rs
index 5d6e42f..5d6e42f 100644
--- a/svgbob/src/buffer/cell_buffer/endorse.rs
+++ b/packages/svgbob/src/buffer/cell_buffer/endorse.rs
diff --git a/svgbob/src/buffer/cell_buffer/settings.rs b/packages/svgbob/src/buffer/cell_buffer/settings.rs
index de4cb40..de4cb40 100644
--- a/svgbob/src/buffer/cell_buffer/settings.rs
+++ b/packages/svgbob/src/buffer/cell_buffer/settings.rs
diff --git a/svgbob/src/buffer/cell_buffer/span.rs b/packages/svgbob/src/buffer/cell_buffer/span.rs
index f3ca416..f3ca416 100644
--- a/svgbob/src/buffer/cell_buffer/span.rs
+++ b/packages/svgbob/src/buffer/cell_buffer/span.rs
diff --git a/svgbob/src/buffer/cell_buffer/span/test_span.rs b/packages/svgbob/src/buffer/cell_buffer/span/test_span.rs
index 7833e2e..7833e2e 100644
--- a/svgbob/src/buffer/cell_buffer/span/test_span.rs
+++ b/packages/svgbob/src/buffer/cell_buffer/span/test_span.rs
diff --git a/svgbob/src/buffer/fragment_buffer.rs b/packages/svgbob/src/buffer/fragment_buffer.rs
index a550b0f..a550b0f 100644
--- a/svgbob/src/buffer/fragment_buffer.rs
+++ b/packages/svgbob/src/buffer/fragment_buffer.rs
diff --git a/svgbob/src/buffer/fragment_buffer/direction.rs b/packages/svgbob/src/buffer/fragment_buffer/direction.rs
index 4325db1..4325db1 100644
--- a/svgbob/src/buffer/fragment_buffer/direction.rs
+++ b/packages/svgbob/src/buffer/fragment_buffer/direction.rs
diff --git a/svgbob/src/buffer/fragment_buffer/fragment.rs b/packages/svgbob/src/buffer/fragment_buffer/fragment.rs
index 2080f5f..2080f5f 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment.rs
+++ b/packages/svgbob/src/buffer/fragment_buffer/fragment.rs
diff --git a/svgbob/src/buffer/fragment_buffer/fragment/arc.rs b/packages/svgbob/src/buffer/fragment_buffer/fragment/arc.rs
index dd9c81b..dd9c81b 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment/arc.rs
+++ b/packages/svgbob/src/buffer/fragment_buffer/fragment/arc.rs
diff --git a/svgbob/src/buffer/fragment_buffer/fragment/circle.rs b/packages/svgbob/src/buffer/fragment_buffer/fragment/circle.rs
index b49c38c..b49c38c 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment/circle.rs
+++ b/packages/svgbob/src/buffer/fragment_buffer/fragment/circle.rs
diff --git a/svgbob/src/buffer/fragment_buffer/fragment/line.rs b/packages/svgbob/src/buffer/fragment_buffer/fragment/line.rs
index d113e40..d113e40 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment/line.rs
+++ b/packages/svgbob/src/buffer/fragment_buffer/fragment/line.rs
diff --git a/svgbob/src/buffer/fragment_buffer/fragment/marker_line.rs b/packages/svgbob/src/buffer/fragment_buffer/fragment/marker_line.rs
index e52f965..e52f965 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment/marker_line.rs
+++ b/packages/svgbob/src/buffer/fragment_buffer/fragment/marker_line.rs
diff --git a/svgbob/src/buffer/fragment_buffer/fragment/polygon.rs b/packages/svgbob/src/buffer/fragment_buffer/fragment/polygon.rs
index 6ec42b9..6ec42b9 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment/polygon.rs
+++ b/packages/svgbob/src/buffer/fragment_buffer/fragment/polygon.rs
diff --git a/svgbob/src/buffer/fragment_buffer/fragment/rect.rs b/packages/svgbob/src/buffer/fragment_buffer/fragment/rect.rs
index 2942991..2942991 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment/rect.rs
+++ b/packages/svgbob/src/buffer/fragment_buffer/fragment/rect.rs
diff --git a/svgbob/src/buffer/fragment_buffer/fragment/text.rs b/packages/svgbob/src/buffer/fragment_buffer/fragment/text.rs
index b2a444a..b2a444a 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment/text.rs
+++ b/packages/svgbob/src/buffer/fragment_buffer/fragment/text.rs
diff --git a/svgbob/src/buffer/fragment_buffer/fragment_tree.rs b/packages/svgbob/src/buffer/fragment_buffer/fragment_tree.rs
index 714beba..714beba 100644
--- a/svgbob/src/buffer/fragment_buffer/fragment_tree.rs
+++ b/packages/svgbob/src/buffer/fragment_buffer/fragment_tree.rs
diff --git a/svgbob/src/buffer/property_buffer.rs b/packages/svgbob/src/buffer/property_buffer.rs
index 8d9551f..8d9551f 100644
--- a/svgbob/src/buffer/property_buffer.rs
+++ b/packages/svgbob/src/buffer/property_buffer.rs
diff --git a/svgbob/src/buffer/property_buffer/property.rs b/packages/svgbob/src/buffer/property_buffer/property.rs
index 20d5a35..20d5a35 100644
--- a/svgbob/src/buffer/property_buffer/property.rs
+++ b/packages/svgbob/src/buffer/property_buffer/property.rs
diff --git a/svgbob/src/buffer/s