Implement first prototype of text embedding

Author: LaurenzV

Cargo.lock

@@ -25,9 +25,12 @@ oxipng = { version = "9", default-features = false, features = ["filetime", "par
 pdf-writer = "0.9"
 pdfium-render = "0.8.6"
 termcolor = "1.2"
-usvg = { version = "0.40", default-features = false, features = ["text"] }
+usvg = { path = "../resvg/crates/usvg", default-features = false, features = ["text"] }
 tiny-skia = "0.11.4"
-resvg = "0.40"
+owned_ttf_parser = "0.20.0"
+unicode-properties = "0.1.1"
+resvg = {path = "../resvg/crates/resvg"}
+subsetter = "0.1.1"
 
 [package]
 name = "svg2pdf"
@@ -49,11 +52,14 @@ image = ["dep:image"]
 filters = ["image", "dep:tiny-skia", "dep:resvg"]
 
 [dependencies]
+unicode-properties = { workspace = true }
 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 }

Cargo.toml

@@ -27,6 +27,7 @@ miniz_oxide = { workspace = true }
 pdf-writer = { workspace = true }
 svg2pdf = { workspace = true }
 termcolor = { workspace = true }
+ttf-parser = "0.20.0"
 usvg = { workspace = true }
 
 [features]

cli/Cargo.toml

@@ -37,7 +37,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() });
+    let pdf = svg2pdf::convert_tree(&tree, Options { dpi, ..Options::default() }, fontdb);
 
     std::fs::write(output, pdf).map_err(|_| "Failed to write PDF file")?;
 

cli/src/convert.rs

@@ -58,6 +58,7 @@ mod util;
 
 pub use usvg;
 
+use crate::render::text::write_font;
 use once_cell::sync::Lazy;
 use pdf_writer::{Chunk, Content, Filter, Finish, Pdf, Rect, Ref, TextStr};
 use usvg::{fontdb, Align, AspectRatio, NonZeroRect, Size, Transform, Tree, ViewBox};
@@ -154,7 +155,7 @@ pub fn convert_str(
         usvg_options.default_size = size;
     }
     let tree = Tree::from_str(src, &usvg_options, fontdb)?;
-    Ok(convert_tree(&tree, options))
+    Ok(convert_tree(&tree, options, fontdb.clone()))
 }
 
 /// Convert a [`usvg` tree](Tree) into a standalone PDF buffer.
@@ -182,9 +183,9 @@ pub fn convert_str(
 /// std::fs::write(output, pdf)?;
 /// # Ok(()) }
 /// ```
-pub fn convert_tree(tree: &Tree, options: Options) -> Vec<u8> {
+pub fn convert_tree(tree: &Tree, options: Options, fontdb: fontdb::Database) -> Vec<u8> {
     let pdf_size = pdf_size(tree, options);
-    let mut ctx = Context::new(tree, options, None);
+    let mut ctx = Context::new(tree, options, None, fontdb);
     let mut pdf = Pdf::new();
 
     let catalog_ref = ctx.alloc_ref();
@@ -229,6 +230,11 @@ pub fn convert_tree(tree: &Tree, options: Options) -> Vec<u8> {
     page.contents(content_ref);
     page.finish();
 
+    let font_ids = ctx.fonts.keys().copied().collect::<Vec<_>>();
+    for font_id in font_ids {
+        write_font(&mut pdf, &mut ctx, font_id).unwrap();
+    }
+
     write_color_spaces(&mut ctx, &mut pdf);
 
     let document_info_id = ctx.alloc_ref();
@@ -334,9 +340,10 @@ pub fn convert_tree_into(
     options: Options,
     chunk: &mut Chunk,
     start_ref: Ref,
+    fontdb: fontdb::Database,
 ) -> Ref {
     let pdf_size = pdf_size(tree, options);
-    let mut ctx = Context::new(tree, options, Some(start_ref.get()));
+    let mut ctx = Context::new(tree, options, Some(start_ref.get()), fontdb);
 
     let x_ref = ctx.alloc_ref();
     ctx.deferrer.push();

src/lib.rs

@@ -216,7 +216,8 @@ fn create_svg_image(
     let image_name = ctx.deferrer.add_x_object(image_ref);
     // convert_tree_into will automatically scale it in a way so that its dimensions are 1x1, like
     // regular ImageXObjects. So afterwards, we can just treat them the same.
-    let next_ref = convert_tree_into(tree, Options::default(), chunk, image_ref);
+    let next_ref =
+        convert_tree_into(tree, Options::default(), chunk, image_ref, ctx.fontdb.clone());
     ctx.deferrer.set_next_ref(next_ref.get());
     (image_name, tree.size())
 }

src/render/image.rs

@@ -14,6 +14,7 @@ pub mod image;
 pub mod mask;
 pub mod path;
 pub mod pattern;
+pub mod text;
 
 /// Write a tree into a stream. Assumes that the stream belongs to transparency group and has the
 /// right bounding boxes.
@@ -71,14 +72,15 @@ impl Render for Node {
                 log::warn!("Images have been disabled in this build of svg2pdf.")
             }
             Node::Text(ref text) => {
-                group::render(
-                    text.flattened(),
-                    chunk,
-                    content,
-                    ctx,
-                    accumulated_transform,
-                    None,
-                );
+                text::render(text, chunk, content, ctx, accumulated_transform);
+                // group::render(
+                //     text.flattened(),
+                //     chunk,
+                //     content,
+                //     ctx,
+                //     accumulated_transform,
+                //     None,
+                // );
             }
         }
     }