From ebd407598a59d04a4972ca638c5c98b6e2d9d84f Mon Sep 17 00:00:00 2001
From: John Whitington <john@coherentgraphics.co.uk>
Date: Thu, 22 Jun 2023 13:50:30 +0100
Subject: [PATCH] Continued assualt on Mt. Truetype

---
 cpdftexttopdf.ml |  2 +-
 cpdftruetype.ml  | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/cpdftexttopdf.ml b/cpdftexttopdf.ml
index 64c9d33..bd59c6f 100644
--- a/cpdftexttopdf.ml
+++ b/cpdftexttopdf.ml
@@ -10,7 +10,7 @@ let rec of_utf8_with_newlines fontpack fontsize t =
       (fun u ->
          match Cpdfembed.get_char fontpack u with
          | Some (c, n, f) ->
-             Printf.printf "Charcode %i, font number %i\n" c n;
+             (*Printf.printf "Charcode %i, font number %i\n" c n;*)
              begin if n <> !currfont then
                begin
                  if !currtext <> [] then items := Cpdftype.Text (rev !currtext)::!items;
diff --git a/cpdftruetype.ml b/cpdftruetype.ml
index 880cf91..e3259ad 100644
--- a/cpdftruetype.ml
+++ b/cpdftruetype.ml
@@ -2,7 +2,7 @@
 open Pdfutil
 open Pdfio
 
-let dbg = ref true
+let dbg = ref false
 
 type t =
   {flags : int;
@@ -26,17 +26,22 @@ type t =
    tounicode : (int, string) Hashtbl.t option}
 
 let debug_t t =
-  Printf.printf "firstchar: %i\n" t.firstchar;
-  Printf.printf "lastchar: %i\n" t.lastchar;
-  Printf.printf "widths:"; Array.iter (Printf.printf " %i") t.widths; Printf.printf "\n";
-  Printf.printf "fontfile of length %i\n" (Pdfio.bytes_size t.subset_fontfile);
-  Printf.printf "subset:"; iter (Printf.printf " U+%04X") t.subset; Printf.printf "\n";
-  Printf.printf "tounicode:";
-  begin match t.tounicode with
-  | None -> Printf.printf "None";
-  | Some table -> Hashtbl.iter (fun k v -> Printf.printf "%i --> %s\n" k v) table
-  end;
-  Printf.printf "\n"
+  let hex u =
+    let b = Buffer.create 32 in
+    String.iter (fun x -> Buffer.add_string b (Printf.sprintf "%02X" (int_of_char x))) u;
+    Buffer.contents b
+  in
+    Printf.printf "firstchar: %i\n" t.firstchar;
+    Printf.printf "lastchar: %i\n" t.lastchar;
+    Printf.printf "widths:"; Array.iter (Printf.printf " %i") t.widths; Printf.printf "\n";
+    Printf.printf "fontfile of length %i\n" (Pdfio.bytes_size t.subset_fontfile);
+    Printf.printf "subset:"; iter (Printf.printf " U+%04X") t.subset; Printf.printf "\n";
+    Printf.printf "tounicode:\n";
+    begin match t.tounicode with
+    | None -> Printf.printf "None";
+    | Some table -> iter (fun (k, v) -> Printf.printf "%i --> U+%s\n" k (hex v)) (sort compare (list_of_hashtbl table))
+    end;
+    Printf.printf "\n"
 
 let required_tables =
   ["head"; "hhea"; "loca"; "cmap"; "maxp"; "cvt "; "glyf"; "prep"; "hmtx"; "fpgm"]