Add secure option for saving, add more opts + cleanup

Author: fschutt

src/cmap.rs

@@ -1,7 +1,8 @@
 /// ToUnicode CMap parsing
-
 use std::collections::BTreeMap;
+
 use lopdf::{Dictionary, Document, Object};
+
 use crate::text::CMap;
 
 /// The mapping from a CID to one or more Unicode code points.
@@ -97,7 +98,7 @@ fn parse_hex_token(token: &str) -> Result<u32, String> {
         return Err("Hex token too short".into());
     }
     if token.starts_with('<') && token.ends_with('>') {
-        let inner = &token[1..token.len()-1];
+        let inner = &token[1..token.len() - 1];
         u32::from_str_radix(inner, 16)
             .map_err(|e| format!("Failed to parse hex token {}: {}", token, e))
     } else {
@@ -113,7 +114,7 @@ impl CMap for ToUnicodeCMap {
         let mut result = String::new();
         let mut i = 0;
         while i + 1 < bytes.len() {
-            let cid = u16::from_be_bytes([bytes[i], bytes[i+1]]) as u32;
+            let cid = u16::from_be_bytes([bytes[i], bytes[i + 1]]) as u32;
             if let Some(unis) = self.mappings.get(&cid) {
                 for &u in unis {
                     if let Some(ch) = std::char::from_u32(u) {
@@ -133,23 +134,26 @@ pub fn get_to_unicode_cmap_from_font(
     font_dict: &Dictionary,
     doc: &Document,
 ) -> Result<ToUnicodeCMap, String> {
-
-    let to_unicode_obj = font_dict.get(b"ToUnicode").ok()
-    .ok_or("No ToUnicode entry found")?;
+    let to_unicode_obj = font_dict
+        .get(b"ToUnicode")
+        .ok()
+        .ok_or("No ToUnicode entry found")?;
 
     let stream = match to_unicode_obj {
-        Object::Reference(r) => doc.get_object(*r)
+        Object::Reference(r) => doc
+            .get_object(*r)
             .and_then(|obj| obj.as_stream().map(|s| s.clone()))
             .map_err(|e| format!("Error getting ToUnicode stream: {}", e))?,
         Object::Stream(s) => s.clone(),
         _ => return Err("Unexpected type for ToUnicode entry".into()),
     };
 
-    let content = stream.decompressed_content()
+    let content = stream
+        .decompressed_content()
         .map_err(|e| format!("Decompress error: {}", e))?;
 
-    let cmap_str = String::from_utf8(content)
-        .map_err(|e| format!("UTF-8 conversion error: {}", e))?;
+    let cmap_str =
+        String::from_utf8(content).map_err(|e| format!("UTF-8 conversion error: {}", e))?;
 
     ToUnicodeCMap::parse(&cmap_str)
 }

src/color.rs

@@ -88,6 +88,40 @@ impl Color {
         }
     }
 
+    pub fn get_svg_id(&self) -> String {
+        match self {
+            Color::Rgb(rgb) => {
+                let r = (rgb.r * 255.0).round() as u8;
+                let g = (rgb.g * 255.0).round() as u8;
+                let b = (rgb.b * 255.0).round() as u8;
+                format!("rgb({}, {}, {})", r, g, b)
+            }
+            Color::Cmyk(cmyk) => {
+                let r = (1.0 - cmyk.c) * (1.0 - cmyk.k);
+                let g = (1.0 - cmyk.m) * (1.0 - cmyk.k);
+                let b = (1.0 - cmyk.y) * (1.0 - cmyk.k);
+                let r = (r * 255.0).round() as u8;
+                let g = (g * 255.0).round() as u8;
+                let b = (b * 255.0).round() as u8;
+                format!("rgb({}, {}, {})", r, g, b)
+            }
+            Color::Greyscale(gs) => {
+                let gray = (gs.percent * 255.0).round() as u8;
+                format!("rgb({}, {}, {})", gray, gray, gray)
+            }
+            Color::SpotColor(spot) => {
+                // SpotColor is treated the same as CMYK.
+                let r = (1.0 - spot.c) * (1.0 - spot.k);
+                let g = (1.0 - spot.m) * (1.0 - spot.k);
+                let b = (1.0 - spot.y) * (1.0 - spot.k);
+                let r = (r * 255.0).round() as u8;
+                let g = (g * 255.0).round() as u8;
+                let b = (b * 255.0).round() as u8;
+                format!("rgb({}, {}, {})", r, g, b)
+            }
+        }
+    }
+
     /// Returns if the color has an icc profile attached
     pub fn get_icc_profile(&self) -> Option<&Option<IccProfileId>> {
         match *self {

src/graphics.rs

@@ -359,6 +359,15 @@ impl LineDashPattern {
         .collect()
     }
 
+    pub fn get_svg_id(&self) -> String {
+        let dash_array = self.as_array();
+        dash_array
+            .iter()
+            .map(|num| num.to_string())
+            .collect::<Vec<_>>()
+            .join(",")
+    }
+
     /// Builds a `LineDashPattern` from a slice of up to 6 integers.
     ///
     /// - The array is interpreted in dash-gap pairs:
@@ -448,6 +457,13 @@ impl LineJoinStyle {
             LineJoinStyle::Bevel => 2,
         }
     }
+    pub fn to_svg_string(&self) -> &'static str {
+        match self {
+            LineJoinStyle::Miter => "miter",
+            LineJoinStyle::Round => "round",
+            LineJoinStyle::Bevel => "bevel",
+        }
+    }
 }
 
 /// The text rendering mode determines how a text is drawn
@@ -520,6 +536,14 @@ impl LineCapStyle {
             LineCapStyle::ProjectingSquare => 2,
         }
     }
+
+    pub fn get_svg_id(&self) -> &'static str {
+        match self {
+            LineCapStyle::Butt => "butt",
+            LineCapStyle::Round => "round",
+            LineCapStyle::ProjectingSquare => "square",
+        }
+    }
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]

src/lib.rs

@@ -6,8 +6,8 @@ use serde_derive::{Deserialize, Serialize};
 
 /// Link / bookmark annotation handling
 pub mod annotation;
-pub mod text;
 pub mod cmap;
+pub mod text;
 pub mod wasm;
 pub use annotation::*;
 /// PDF standard handling