Refactor crate structure and clean up

Author: LaurenzV

CHANGELOG.md

@@ -6,6 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- Added support for text embedding.
+- The `convert_str` method has been removed. You should now always convert your SVG string into a `usvg` 
+ tree yourself.
+- The `convert_tree` method has been renamed into `to_pdf`, and now requires you to provide the fontdb
+ used for the `usvg` tree.
+- `convert_tree_into` has been renamed into `to_chunk` and now returns an independent chunk as well
+ as the object ID of the SVG.
+
+- TODO: The CLI options have been (temporarily) removed. They will be readded before the next release.
+- TODO: Add tests for CLI and svg options
+- TODO: Add CLI option to convert text to paths.
 
 ### Changed
 - Bumped resvg to v0.40.

Cargo.lock

@@ -25,12 +25,13 @@ oxipng = { version = "9", default-features = false, features = ["filetime", "par
 pdf-writer = "0.9"
 pdfium-render = "0.8.6"
 termcolor = "1.2"
-usvg = { path = "../resvg/crates/usvg", default-features = false, features = ["text"] }
+usvg = { git = "https://github.com/RazrFalcon/resvg", default-features = false, features = ["text"] }
 tiny-skia = "0.11.4"
-owned_ttf_parser = "0.20.0"
 unicode-properties = "0.1.1"
-resvg = {path = "../resvg/crates/resvg"}
+resvg = {git = "https://github.com/RazrFalcon/resvg"}
 subsetter = "0.1.1"
+ttf-parser = { version = "0.20.0" }
+siphasher = { version = "1.0.1"}
 
 [package]
 name = "svg2pdf"
@@ -57,9 +58,11 @@ miniz_oxide = { workspace = true }
 once_cell = { workspace = true }
 pdf-writer = { workspace = true }
 usvg = { workspace = true }
-owned_ttf_parser = { workspace = true }
 log = { workspace = true }
 image = { workspace = true, optional = true }
 tiny-skia = {workspace = true, optional = true }
 resvg = {workspace = true, optional = true }
 subsetter = { workspace = true }
+ttf-parser = { workspace = true }
+siphasher = { workspace = true }
+

Cargo.toml

@@ -4,14 +4,10 @@ use svg2pdf::Options;
 
 /// Execute a font listing command.
 pub fn _convert(command: ConvertCommand) -> Result<(), String> {
-    convert_(&command.input, command.output, command.dpi)
+    convert_(&command.input, command.output)
 }
 
-pub fn convert_(
-    input: &PathBuf,
-    output: Option<PathBuf>,
-    dpi: f32,
-) -> Result<(), String> {
+pub fn convert_(input: &PathBuf, output: Option<PathBuf>) -> Result<(), String> {
     if let Ok(()) = log::set_logger(&LOGGER) {
         log::set_max_level(log::LevelFilter::Warn);
     }
@@ -37,7 +33,7 @@ pub fn convert_(
     let tree =
         usvg::Tree::from_str(&svg, &options, &fontdb).map_err(|err| err.to_string())?;
 
-    let pdf = svg2pdf::convert_tree(&tree, Options { dpi, ..Options::default() }, fontdb);
+    let pdf = svg2pdf::to_pdf(&tree, Options::default(), fontdb);
 
     std::fs::write(output, pdf).map_err(|_| "Failed to write PDF file")?;
 

cli/src/convert.rs

@@ -22,7 +22,7 @@ fn run() -> Result<(), String> {
 
     // If an input argument was provided, convert the svg file to pdf.
     if let Some(input) = args.input {
-        return convert::convert_(&input, args.output, args.dpi);
+        return convert::convert_(&input, args.output);
     };
 
     // Otherwise execute the command provided if any.