Merge pull request #225 from martin-kolarik/fix-of-duplicate-remapping

Fix of duplicate remapping for codepoints, cleanup, many temporary allocations removed

Author: fschutt

src/font.rs

@@ -614,6 +614,8 @@ impl ParsedFont {
             map.insert(sp, ' ');
         }
 
+        map.insert(0, '\0');
+
         map
     }
 
@@ -651,7 +653,7 @@ impl ParsedFont {
     }
 
     /// Generates a new font file from the used glyph IDs
-    pub fn subset(&self, glyph_ids: &[(u16, char)]) -> Result<SubsetFont, String> {
+    pub fn subset(&self, glyph_ids: &BTreeMap<u16, char>) -> Result<SubsetFont, String> {
         let glyph_mapping = glyph_ids
             .iter()
             .enumerate()
@@ -669,11 +671,9 @@ impl ParsedFont {
             .map_err(|e| e.to_string())?;
 
         // https://docs.rs/allsorts/latest/allsorts/subset/fn.subset.html
-        // Glyph id 0, corresponding to the .notdef glyph must always be present.
-        let mut ids = vec![0];
-        for glyph_id in glyph_ids {
-            ids.push(glyph_id.0);
-        }
+        // Glyph id 0, corresponding to the .notdef glyph is always present,
+        // because it is returned from get_used_glyphs_ids.
+        let ids: Vec<_> = glyph_ids.keys().copied().collect();
 
         let font = allsorts_subset_browser::subset::subset(&provider, &ids, &SubsetProfile::Web)
             .map_err(|e| e.to_string())?;
@@ -685,41 +685,30 @@ impl ParsedFont {
     }
 
     /// Replace this function in the ParsedFont implementation
-    pub(crate) fn generate_cid_to_unicode_map(
+    pub(crate) fn generate_cmap_string(
         &self,
         font_id: &FontId,
-        glyph_ids: &BTreeMap<u16, char>,
+        gid_to_cid_map: &[(u16, u16)],
     ) -> String {
         // Convert the glyph_ids map to a ToUnicodeCMap structure
-        let mut mappings: BTreeMap<u32, Vec<u32>> = BTreeMap::new();
-        for (&glyph_id, &unicode) in glyph_ids {
-            mappings.insert(glyph_id as u32, vec![unicode as u32]);
-        }
+        let mappings = gid_to_cid_map
+            .iter()
+            .map(|&(gid, cp)| (gid as u32, vec![cp as u32]))
+            .collect();
 
         // Create the CMap and generate its string representation
         let cmap = ToUnicodeCMap { mappings };
         cmap.to_cmap_string(&font_id.0)
     }
 
-    pub(crate) fn generate_cid_to_gid(
-        &self,
-        glyph_ids: &BTreeMap<u16, char>,
-    ) -> BTreeMap<u16, u16> {
-        let mut mappings: BTreeMap<u16, u16> = BTreeMap::new();
-
-        for (&glyph_id, _) in glyph_ids {
-            let cid = self.index_to_cid(glyph_id + 1).unwrap();
-
-            mappings.insert(glyph_id, cid);
-        }
-
-        mappings
+    pub(crate) fn generate_gid_to_cid_map(&self, glyph_ids: &[u16]) -> Vec<(u16, u16)> {
+        glyph_ids
+            .iter()
+            .filter_map(|gid| self.index_to_cid(*gid).map(|cid| (*gid, cid)))
+            .collect()
     }
 
-    pub(crate) fn get_normalized_widths_ttf(
-        &self,
-        glyph_ids: &BTreeMap<u16, char>,
-    ) -> Vec<lopdf::Object> {
+    pub(crate) fn get_normalized_widths_ttf(&self, glyph_ids: &[u16]) -> Vec<lopdf::Object> {
         let mut widths_list = Vec::new();
         let mut current_low_gid = 0;
         let mut current_high_gid = 0;
@@ -728,16 +717,16 @@ impl ParsedFont {
         // scale the font width so that it sort-of fits into an 1000 unit square
         let percentage_font_scaling = 1000.0 / (self.font_metrics.units_per_em as f32);
 
-        for gid in glyph_ids.keys() {
-            let width = match self.get_glyph_width_internal(*gid) {
+        for &gid in glyph_ids {
+            let width = match self.get_glyph_width_internal(gid) {
                 Some(s) => s,
                 None => match self.get_space_width() {
                     Some(w) => w,
                     None => 0,
                 },
             };
 
-            if *gid == current_high_gid {
+            if gid == current_high_gid {
                 // subsequent GID
                 current_width_vec.push(Integer((width as f32 * percentage_font_scaling) as i64));
                 current_high_gid += 1;
@@ -747,7 +736,7 @@ impl ParsedFont {
                 widths_list.push(Array(std::mem::take(&mut current_width_vec)));
 
                 current_width_vec.push(Integer((width as f32 * percentage_font_scaling) as i64));
-                current_low_gid = *gid;
+                current_low_gid = gid;
                 current_high_gid = gid + 1;
             }
         }
@@ -757,32 +746,19 @@ impl ParsedFont {
         widths_list.push(Array(std::mem::take(&mut current_width_vec)));
 
         widths_list
-        /*
-        let mut cmap = glyph_ids.iter()
-        .filter_map(|(glyph_id, c)| {
-            let (glyph_width, glyph_height) = self.get_glyph_size(*glyph_id)?;
-            let k = *glyph_id as u32;
-            let v = (*c as u32, glyph_width.abs() as u32, glyph_height.abs() as u32);
-            Some((k, v))
-        }).collect::<BTreeMap<_, _>>();
-
-        cmap.insert(0, (0, 1000, 1000));
-
-        widths.push((*glyph_id, width));
-        */
     }
 
     pub(crate) fn get_normalized_widths_cff(
         &self,
-        cid_to_gid: &BTreeMap<u16, u16>,
+        gid_to_cid_map: &[(u16, u16)],
     ) -> Vec<lopdf::Object> {
         let mut widths_list = Vec::new();
 
         // scale the font width so that it sort-of fits into an 1000 unit square
         let percentage_font_scaling = 1000.0 / (self.font_metrics.units_per_em as f32);
 
-        for (gid, cid) in cid_to_gid {
-            let width = match self.get_glyph_width_internal(*gid + 1) {
+        for &(gid, cid) in gid_to_cid_map {
+            let width = match self.get_glyph_width_internal(gid) {
                 Some(s) => s,
                 None => match self.get_space_width() {
                     Some(w) => w,
@@ -792,8 +768,8 @@ impl ParsedFont {
 
             let width = (width as f32 * percentage_font_scaling) as i64;
 
-            widths_list.push(Integer(*cid as i64));
-            widths_list.push(Integer(*cid as i64));
+            widths_list.push(Integer(cid as i64));
+            widths_list.push(Integer(cid as i64));
             widths_list.push(Integer(width));
         }
 

src/render.rs

@@ -526,7 +526,7 @@ fn render_to_svg_internal(
         for (font_id, font) in fonts.iter() {
             svg.push_str(&format!(
                 r#"@font-face {{ font-family: "{}"; src: url("data:font/otf;charset=utf-8;base64,{}"); }}"#,
-                font_id.0, base64::prelude::BASE64_STANDARD.encode(&font.subset_font.bytes),
+                font_id.0, base64::prelude::BASE64_STANDARD.encode(&font.subset.bytes),
             ));
         }
         svg.push_str("</style>\n");