Renamed packages

vsvg-core -> vsvg
vsvg -> vsvg-cli

.cargo/config.toml

@@ -0,0 +1,2 @@
+[alias]
+vsvg = "run --package vsvg-cli --bin vsvg --"

Cargo.toml

@@ -2,7 +2,7 @@
 
 members = [
     "vsvg",
-    "vsvg-core",
+    "vsvg-cli",
     "vsvg-viewer",
     "vsvg-multi",
 ]

vsvg-cli/Cargo.toml

@@ -0,0 +1,38 @@
+[package]
+name = "vsvg-cli"
+description = "An experimental SVG viewer for plotter users."
+authors = ["Antoine Beyeler"]
+version = "0.1.0-alpha.0"
+edition = "2021"
+readme = "../README.md"
+homepage = "https://github.com/abey79/vsvg"
+license = "MIT"
+
+[[bin]]
+name = "vsvg"
+path = "src/main.rs"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+egui.workspace = true
+eframe.workspace = true
+serde.workspace = true
+kurbo.workspace = true
+rand.workspace = true
+rand_chacha.workspace = true
+tracing-subscriber = "0.3.16"
+clap = { version = "4.1.6", features = ["cargo"]}
+vsvg = { path = "../vsvg", features = ["egui"] }
+vsvg-viewer = { path = "../vsvg-viewer"}
+dhat = { version = "0.3.2", optional = true } # for heap profiling
+
+
+
+# for dhat-heap!!
+#[profile.release]
+#debug = 1
+
+[features]
+dhat-heap = ["dhat"]    # if you are doing heap profiling
+dhat-ad-hoc = []  # if you are doing ad hoc profiling

vsvg/src/cli.rs → vsvg-cli/src/cli.rs

@@ -5,7 +5,7 @@ use std::error::Error;
 use std::fmt::{Debug, Display, Formatter};
 
 use std::path::PathBuf;
-use vsvg_core::{Document, DrawState, LayerID};
+use vsvg::{Document, DrawState, LayerID};
 
 /// A trait for types that can be used as command line arguments.
 trait CommandArg: Clone + Into<CommandValue> + Send + Sync + Debug + 'static {}

vsvg/src/commands.rs → vsvg-cli/src/commands.rs

@@ -1,7 +1,7 @@
 use crate::cli::{CommandDesc, CommandValue};
 use clap::{arg, value_parser, Arg, Id};
 use std::collections::HashMap;
-use vsvg_core::{DocumentTrait, IndexBuilder, Transforms};
+use vsvg::{DocumentTrait, IndexBuilder, Transforms};
 
 // https://stackoverflow.com/a/38361018/229511
 macro_rules! count_items {
@@ -78,7 +78,7 @@ macro_rules! command_decl {
         command_impl!($arg, String, String, $(|$state, $($x),+| $action),+)
     };
     ($arg:expr, LayerID, $(|$state:ident, $($x:ident),+| $action:expr),+) => {
-        command_impl!($arg, vsvg_core::LayerID, LayerID, $(|$state, $($x),+| $action),+)
+        command_impl!($arg, vsvg::LayerID, LayerID, $(|$state, $($x),+| $action),+)
     };
 }
 

vsvg/src/main.rs → vsvg-cli/src/main.rs

@@ -8,7 +8,7 @@ use std::io::Read;
 use std::path::PathBuf;
 
 use crate::cli::State;
-use vsvg_core::Document;
+use vsvg::Document;
 
 #[cfg(feature = "dhat-heap")]
 #[global_allocator]

vsvg-viewer/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 
 [dependencies]
-vsvg-core = { path = "../vsvg-core" }
+vsvg = { path = "../vsvg" }
 kurbo.workspace = true
 egui.workspace = true
 eframe.workspace = true

vsvg-viewer/src/document_widget.rs

@@ -2,7 +2,7 @@ use crate::engine::{DisplayMode, DocumentData, Engine, ViewerOptions};
 use eframe::egui_wgpu;
 use egui::{Pos2, Rect, Sense, Ui};
 use std::sync::{Arc, Mutex};
-use vsvg_core::{DocumentTrait, LayerTrait};
+use vsvg::{DocumentTrait, LayerTrait};
 
 /// Widget to display a [`vsvg_core::Document`] in a egui application.
 ///

vsvg-viewer/src/engine.rs

@@ -3,7 +3,7 @@ use eframe::egui_wgpu::RenderState;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 
-use vsvg_core::{
+use vsvg::{
     Color, Document, DocumentTrait, FlattenedDocument, LayerID, LayerTrait, PathTrait, Point,
 };
 use wgpu::util::DeviceExt;

vsvg-viewer/src/lib.rs

@@ -13,7 +13,7 @@ use crate::engine::DocumentData;
 use crate::viewer::Viewer;
 use std::error::Error;
 use std::sync::Arc;
-use vsvg_core::Document;
+use vsvg::Document;
 
 /// Show a document in a window.
 #[allow(clippy::missing_panics_doc)]

vsvg-viewer/src/painters.rs

@@ -1,6 +1,6 @@
 use crate::engine::Engine;
 use std::mem;
-use vsvg_core::{FlattenedPath, PathTrait, Point};
+use vsvg::{FlattenedPath, PathTrait, Point};
 use wgpu::util::DeviceExt;
 use wgpu::{
     include_wgsl, vertex_attr_array, Buffer, ColorTargetState, Device, PrimitiveTopology,

vsvg/Cargo.toml

@@ -1,34 +1,38 @@
 [package]
 name = "vsvg"
-description = "An experimental SVG viewer for plotter users."
+description = "Rust prototype of vpype-core V2"
 authors = ["Antoine Beyeler"]
 version = "0.1.0-alpha.0"
 edition = "2021"
-readme = "../README.md"
-homepage = "https://github.com/abey79/vsvg"
-license = "MIT"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-egui.workspace = true
-eframe.workspace = true
-serde.workspace = true
 kurbo.workspace = true
-rand.workspace = true
-rand_chacha.workspace = true
-tracing-subscriber = "0.3.16"
-clap = { version = "4.1.6", features = ["cargo"]}
-vsvg-core = { path = "../vsvg-core", features = ["egui"] }
-vsvg-viewer = { path = "../vsvg-viewer"}
-dhat = { version = "0.3.2", optional = true } # for heap profiling
-
+usvg = "0.29.0"
+rosvgtree = "0.1.0"
+rctree = "*"  # Let usvg decide on the version
+svg = "0.13.1"
+rayon = "1.6.1"
+arrayvec = "0.7.2"
+lyon_geom = "1.0.4"
+regex = "1.7.1"
+lazy_static = "1.4.0"
+indexmap = {version = "1.9.2", features = ["rayon"]}
+kdtree = "0.7.0"
+bitvec = "1.0.1"
+time = {version="0.3.20", features = ["formatting"]}
 
+# optional dependencies, mainly for Point interop.
+egui = { workspace=true, optional = true }
+glam = { version="0", optional = true }
+bevy = { version="0", optional = true, default-features = false }
 
-# for dhat-heap!!
-#[profile.release]
-#debug = 1
+[dev-dependencies]
+approx = "0.5.1"
+criterion = "0.4.0"
+rand.workspace = true
+rand_chacha.workspace = true
 
-[features]
-dhat-heap = ["dhat"]    # if you are doing heap profiling
-dhat-ad-hoc = []  # if you are doing ad hoc profiling
+[[bench]]
+name = "bench_path_index"
+harness = false

vsvg-core/src/lib.rs → vsvg/src/lib.rs

@@ -1,4 +1,4 @@
-//! `vsvg-core` is a library crate to manipulate vector graphics, with a focus on SVG and
+//! `vsvg` is a library crate to manipulate vector graphics, with a focus on SVG and
 //! pen-plotter applications. It's inspired upon [`vpype`](https://github.com/abey79/vpype), the
 //! Swiss-Army-knife command-line tool for plotter vector graphics.
 //!