Add embed text option

Author: LaurenzV

src/lib.rs

@@ -13,23 +13,23 @@ will still be turned into a vector graphic), so no quality is lost.
 This example reads an SVG file and writes the corresponding PDF back to the disk.
 
 ```
-# fn main() -> Result<(), Box<dyn std::error::Error>> {
-use svg2pdf::usvg::fontdb;
-use svg2pdf::Options;
-
-let input = "tests/svg/custom/integration/matplotlib/stairs.svg";
-let output = "target/stairs.pdf";
-
-let svg = std::fs::read_to_string(input)?;
-let options = svg2pdf::usvg::Options::default();
-let mut db = fontdb::Database::new();
-db.load_system_fonts();
-let tree = svg2pdf::usvg::Tree::from_str(&svg, &options, &db)?;
-
-let pdf = svg2pdf::to_pdf(&tree, Options::default(), &db);
-std::fs::write(output, pdf)?;
-# Ok(()) }
-```
+* # fn main() -> Result<(), Box<dyn std::error::Error>> {
+* use svg2pdf::usvg::fontdb;
+* use svg2pdf::ConversionOptions;
+*
+* let input = "tests/svg/custom/integration/matplotlib/stairs.svg";
+* let output = "target/stairs.pdf";
+*
+* let svg = std::fs::read_to_string(input)?;
+* let options = svg2pdf::usvg::Options::default();
+* let mut db = fontdb::Database::new();
+* db.load_system_fonts();
+* let tree = svg2pdf::usvg::Tree::from_str(&svg, &options, &db)?;
+*
+* let pdf = svg2pdf::to_pdf(&tree, Options::default(), &db);
+* std::fs::write(output, pdf)?;
+* # Ok(()) }
+* ```
 
 ## Supported features
 In general, a very large part of the SVG specification is supported, including
@@ -80,8 +80,8 @@ static GRAY_ICC_DEFLATED: Lazy<Vec<u8>> =
 pub struct Options {
     /// Whether the content streams should be compressed.
     ///
-    /// The smaller PDFs generated by this are generally more practical but it
-    /// increases runtime a bit.
+    /// The smaller PDFs generated by this are generally more practical, but it
+    /// might increase run-time a bit.
     ///
     /// _Default:_ `true`.
     pub compress: bool,
@@ -93,11 +93,22 @@ pub struct Options {
     ///
     /// _Default:_ 1
     pub raster_scale: f32,
+
+    /// Whether text should be embedded as actual selectable text inside
+    /// the PDF. If this option is disabled, text will be converted into paths
+    /// before rendering.
+    ///
+    /// _Default:_ `true`.
+    pub embed_text: bool,
 }
 
 impl Default for Options {
     fn default() -> Self {
-        Self { compress: false, raster_scale: 1.0 }
+        Self {
+            compress: false,
+            raster_scale: 1.0,
+            embed_text: true,
+        }
     }
 }
 

src/render/mod.rs

@@ -112,15 +112,19 @@ impl Render for Node {
             }
             #[cfg(feature = "text")]
             Node::Text(ref text) => {
-                text::render(text, chunk, content, ctx, rc, accumulated_transform);
-                // group::render(
-                //     text.flattened(),
-                //     chunk,
-                //     content,
-                //     ctx,
-                //     accumulated_transform,
-                //     None,
-                // );
+                if ctx.options.embed_text {
+                    text::render(text, chunk, content, ctx, rc, accumulated_transform);
+                } else {
+                    group::render(
+                        text.flattened(),
+                        chunk,
+                        content,
+                        ctx,
+                        accumulated_transform,
+                        None,
+                        rc,
+                    );
+                }
             }
             #[cfg(not(feature = "text"))]
             Node::Text(_) => {

src/util/context.rs

@@ -38,7 +38,9 @@ impl Context {
             sgray_ref: None,
         };
 
-        text::fill_fonts(tree.root(), &mut ctx, fontdb);
+        if options.embed_text {
+            text::fill_fonts(tree.root(), &mut ctx, fontdb);
+        }
 
         ctx
     }

tests/src/lib.rs

@@ -69,11 +69,16 @@ pub fn read_svg(svg_string: &str) -> Tree {
 
 /// Converts an image into a PDF and returns the PDF as well as a rendered version
 /// of it.
-pub fn convert_svg(svg_string: &str) -> (Vec<u8>, RgbaImage) {
-    let tree = read_svg(svg_string);
+pub fn convert_svg(svg_path: &Path) -> (Vec<u8>, RgbaImage) {
+    let svg = fs::read_to_string(svg_path).unwrap();
+    let tree = read_svg(&svg);
     let pdf = svg2pdf::to_pdf(
         &tree,
-        Options { raster_scale: 1.5, compress: true },
+        Options {
+            raster_scale: 1.5,
+            compress: true,
+            embed_text: true,
+        },
         &FONTDB.lock().unwrap(),
     );
     let image = render_pdf(pdf.as_slice());
@@ -169,7 +174,7 @@ pub fn run_test(test_name: &str) -> i32 {
     let ref_path = get_ref_path(test_name);
     let diff_path = get_diff_path(test_name);
 
-    let (_, actual_image) = convert_svg(&fs::read_to_string(svg_path).unwrap());
+    let (_, actual_image) = convert_svg(&svg_path);
 
     // Just as a convenience, if the test is supposed to run but there doesn't exist
     // a reference image yet, we create a new one. This allows us to conveniently generate