Reorganize workspace

Author: laurmaedje

Cargo.lock

@@ -1,6 +1,5 @@
 [workspace]
-members = ["crates/*", "tests"]
-default-members = ["crates/svg2pdf-cli"]
+members = ["cli", "tests"]
 resolver = "2"
 
 [workspace.package]
@@ -11,3 +10,49 @@ repository = "https://github.com/typst/svg2pdf"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 
+[workspace.dependencies]
+svg2pdf = { path = "." }
+clap = { version = "4.4.2", features = ["derive"] }
+clap_complete = "4.4.3"
+clap_mangen = "0.2.14"
+fontdb = "0.15"
+image = { version = "0.24", default-features = false, features = ["jpeg", "png", "gif"] }
+indicatif = "0.17.5"
+lazy_static = "1.4.0"
+miniz_oxide = "0.7"
+once_cell = "1.18.0"
+oxipng = { version = "9", default-features = false, features = ["filetime", "parallel", "zopfli"] }
+pdf-writer = "0.9"
+pdfium-render = "0.8.6"
+regex = "1.8.4"
+termcolor = "1.2"
+usvg = { version = "0.36", default-features = false }
+walkdir = "2.3.3"
+
+[package]
+name = "svg2pdf"
+description = "Convert SVG files to PDFs."
+categories = ["encoding", "graphics", "multimedia"]
+keywords = ["svg", "pdf", "vector-graphics", "conversion"]
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+
+[lib]
+bench = false
+
+[features]
+default = ["image"]
+image = ["dep:image"]
+
+[dependencies]
+miniz_oxide = { workspace = true }
+once_cell = { workspace = true }
+pdf-writer = { workspace = true }
+usvg = { workspace = true }
+image = { workspace = true, optional = true }
+
+[dev-dependencies]
+usvg = { workspace = true, features = ["text", "system-fonts"] }

Cargo.toml

@@ -1,6 +1,6 @@
 ================================================================================
 The Creative Commons Zero v1.0 Universal License applies to:
-* The ICC profiles found in `crates/svg2pdf/src/icc/*`
+* The ICC profiles found in `src/icc/*`
 
 ================================================================================
 
@@ -560,7 +560,7 @@ Creative Commons may be contacted at creativecommons.org.
 The Mozilla Public License Version 2.0 applies to:
 
 * The `image_rect`, `fit_view_box` and `calc_node_bbox` functions in `src/util/helper.rs`
-and parts of the 'draw_path' method in 'src/render/path.rs'
+  and parts of the 'draw_path' method in 'src/render/path.rs'
   in the resvg repository (https://github.com/RazrFalcon/resvg)
 
 Mozilla Public License Version 2.0
@@ -1059,4 +1059,4 @@ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
 DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+OTHER DEALINGS IN THE FONT SOFTWARE.

NOTICE

@@ -31,7 +31,8 @@ std::fs::write("target/time_series.pdf", pdf)?;
 
 ## CLI
 
-This crate also contains a command line interface. Install it by running the command below:
+This crate also contains a command line interface. Install it by running the
+command below:
 
 ```bash
 cargo install svg2pdf-cli

README.md

@@ -0,0 +1,34 @@
+[package]
+name = "svg2pdf-cli"
+description = "The command line interface for svg2pdf."
+categories = ["encoding", "graphics", "multimedia", "command-line-utilities"]
+keywords = ["svg2pdf", "cli"]
+build = "build.rs"
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+
+[[bin]]
+name = "svg2pdf"
+path = "src/main.rs"
+test = false
+doctest = false
+bench = false
+doc = false
+
+[dependencies]
+clap = { workspace = true }
+fontdb = { workspace = true }
+image = { workspace = true }
+miniz_oxide = { workspace = true }
+pdf-writer = { workspace = true }
+svg2pdf = { workspace = true }
+termcolor = { workspace = true }
+usvg = { workspace = true, features = ["text"] }
+
+[build-dependencies]
+clap = { workspace = true, features = ["string"] }
+clap_complete = { workspace = true }
+clap_mangen = { workspace = true }

cli/Cargo.toml

@@ -3,11 +3,10 @@ use std::path::Path;
 use std::process;
 
 use clap::Parser;
+use svg2pdf::Options;
 use termcolor::{ColorChoice, ColorSpec, StandardStream, WriteColor};
 use usvg::{TreeParsing, TreeTextToPath};
 
-use svg2pdf::Options;
-
 mod args;
 
 fn main() {

crates/svg2pdf-cli/build.rs cli/build.rs

@@ -243,7 +243,7 @@ pub fn convert_tree(tree: &Tree, options: Options) -> Vec<u8> {
 /// ```
 /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
 /// use svg2pdf;
-/// use pdf_writer::{Content, Finish, Name, PdfWriter, Rect, Ref, Str};
+/// use pdf_writer::{Content, Finish, Name, Pdf, Rect, Ref, Str};
 /// use usvg::TreeParsing;
 ///
 /// // Allocate the indirect reference IDs and names.

crates/svg2pdf-cli/src/args.rs cli/src/args.rs

@@ -28,16 +28,16 @@ path = "src/typst.rs"
 test = false
 
 [dependencies]
-fontdb = "0.15"
-svg2pdf = { path = "../crates/svg2pdf" }
-usvg = "0.36.0"
-pdfium-render = "0.8.6"
-walkdir = "2.3.3"
-lazy_static = "1.4.0"
-pdf-writer = "0.9"
-image = "0.24"
-indicatif = "0.17.5"
-oxipng = { version = "8.0.0", default-features = false, features = ["filetime", "parallel", "zopfli"] }
-clap = { version = "4.3.4", features = ["derive"] }
-termcolor = "1.2.0"
-regex = "1.8.4"
+fontdb = { workspace = true }
+svg2pdf = { workspace = true }
+usvg = { workspace = true }
+pdfium-render = { workspace = true }
+walkdir = { workspace = true }
+lazy_static = { workspace = true }
+pdf-writer = { workspace = true }
+image = { workspace = true }
+indicatif = { workspace = true }
+oxipng = { workspace = true }
+clap = { workspace = true }
+termcolor = { workspace = true }
+regex = { workspace = true }

crates/svg2pdf-cli/src/main.rs cli/src/main.rs

@@ -164,8 +164,8 @@ pub fn save_image(image: &RgbaImage, path: &Path) {
     image.save_with_format(path, image::ImageFormat::Png).unwrap();
 
     oxipng::optimize(
-        &InFile::Path(PathBuf::from(path)),
-        &OutFile::Path(Some(PathBuf::from(path))),
+        &InFile::Path(path.into()),
+        &OutFile::from_path(path.into()),
         &oxipng::Options::max_compression(),
     )
     .unwrap();