fenix
/
cpdf-source
mirror of https://github.com/johnwhitington/cpdf-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy up debug

This commit is contained in:
John Whitington 2023-07-17 14:13:24 +01:00
parent 1db9310884
commit e257c1c62b
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpdfcommand.ml
View File

@ -2048,7 +2048,7 @@ let addsopacity f =
let embed_font_inner font = let embed_font_inner font =
match font with match font with
| StandardFont f -> | StandardFont f ->
Printf.printf "embed_font: StandardFont\n"; (* Printf.printf "embed_font: StandardFont\n";*)
begin match args.embedstd14 with begin match args.embedstd14 with
| Some dirname -> | Some dirname ->
begin try begin try
@ -2067,7 +2067,7 @@ let embed_font_inner font =
| OtherFont f -> | OtherFont f ->
ExistingNamedFont ExistingNamedFont
| EmbeddedFont name -> | EmbeddedFont name ->
Printf.printf "embed_font: TTF\n"; (*Printf.printf "embed_font: TTF\n";*)
try try
let fontname, font = Hashtbl.find ttfs name in let fontname, font = Hashtbl.find ttfs name in
args.fontname <- fontname; args.fontname <- fontname;

26
cpdfdraw.ml
View File

@ -146,13 +146,13 @@ let process_specials pdf endpage filename bates batespad num page s =
let runs_of_utf8 s = let runs_of_utf8 s =
let identifier, fontpack = (res ()).current_fontpack in let identifier, fontpack = (res ()).current_fontpack in
Printf.printf "runs_of_utf8: %s\n" identifier; (*Printf.printf "runs_of_utf8: %s\n" identifier;*)
let codepoints = Pdftext.codepoints_of_utf8 s in let codepoints = Pdftext.codepoints_of_utf8 s in
Printf.printf "%i codepoints\n" (length codepoints); (*Printf.printf "%i codepoints\n" (length codepoints);*)
let triples = option_map (Cpdfembed.get_char fontpack) codepoints in let triples = option_map (Cpdfembed.get_char fontpack) codepoints in
Printf.printf "%i triples\n" (length triples); (*Printf.printf "%i triples\n" (length triples);*)
let collated = Cpdfembed.collate_runs triples in let collated = Cpdfembed.collate_runs triples in
Printf.printf "Collated of length %i\n" (length collated); (*Printf.printf "Collated of length %i\n" (length collated);*)
flatten flatten
(map (map
(fun l -> (fun l ->
@ -252,22 +252,22 @@ let rec ops_of_drawop dryrun pdf endpage filename bates batespad num page = func
| Opacity v -> [Pdfops.Op_gs (extgstate "/ca" v)] | Opacity v -> [Pdfops.Op_gs (extgstate "/ca" v)]
| SOpacity v -> [Pdfops.Op_gs (extgstate "/CA" v)] | SOpacity v -> [Pdfops.Op_gs (extgstate "/CA" v)]
| FontPack (identifier, cpdffont, codepoints) -> | FontPack (identifier, cpdffont, codepoints) ->
Printf.printf "FontPack op: %s\n" identifier; (*Printf.printf "FontPack op: %s\n" identifier;*)
let fontpack = let fontpack =
match Hashtbl.find fontpacks identifier with match Hashtbl.find fontpacks identifier with
| (fontpack, _) -> | (fontpack, _) ->
Printf.printf "Cpdfdraw FontPack op: using existing fontpack %s\n" identifier; (*Printf.printf "Cpdfdraw FontPack op: using existing fontpack %s\n" identifier;*)
fontpack fontpack
| exception Not_found -> | exception Not_found ->
Printf.printf "Cpdfdraw FontPack op: storing new fontpack %s\n" identifier; (*Printf.printf "Cpdfdraw FontPack op: storing new fontpack %s\n" identifier;*)
let fontpack = let fontpack =
match cpdffont with match cpdffont with
| PreMadeFontPack fp -> | PreMadeFontPack fp ->
Printf.printf "it's a pre-made font pack\n"; (*Printf.printf "it's a pre-made font pack\n"; *)
fp fp
| EmbedInfo {fontfile; fontname; encoding} -> | EmbedInfo {fontfile; fontname; encoding} ->
let codepoints = map fst (list_of_hashtbl codepoints) in let codepoints = map fst (list_of_hashtbl codepoints) in
Printf.printf "%i codepoints to embed\n" (length codepoints); (*Printf.printf "%i codepoints to embed\n" (length codepoints);*)
if codepoints = [] then default_fontpack else if codepoints = [] then default_fontpack else
Cpdfembed.embed_truetype pdf ~fontfile ~fontname ~codepoints ~encoding Cpdfembed.embed_truetype pdf ~fontfile ~fontname ~codepoints ~encoding
| ExistingNamedFont -> | ExistingNamedFont ->
@ -283,7 +283,7 @@ let rec ops_of_drawop dryrun pdf endpage filename bates batespad num page = func
Not_found -> Not_found ->
let o = if dryrun then 0 else Pdftext.write_font pdf font in let o = if dryrun then 0 else Pdftext.write_font pdf font in
let n = fresh_name "/F" in let n = fresh_name "/F" in
Printf.printf "Adding font %s as %s\n" identifier n; (*Printf.printf "Adding font %s as %s\n" identifier n;*)
Hashtbl.replace (res ()).fonts font (n, o); Hashtbl.replace (res ()).fonts font (n, o);
n) n)
(fst fontpack) (fst fontpack)
@ -291,7 +291,7 @@ let rec ops_of_drawop dryrun pdf endpage filename bates batespad num page = func
(res ()).page_names <- ns @ (res ()).page_names; (res ()).page_names <- ns @ (res ()).page_names;
[] []
| Font (identifier, size) -> | Font (identifier, size) ->
Printf.printf "Cpdfdraw Font op: Changing to stored font %s\n" identifier; (*Printf.printf "Cpdfdraw Font op: Changing to stored font %s\n" identifier;*)
let fontpack, codepoints = Hashtbl.find fontpacks identifier in let fontpack, codepoints = Hashtbl.find fontpacks identifier in
(res ()).current_fontpack <- (identifier, fontpack); (res ()).current_fontpack <- (identifier, fontpack);
if dryrun then (res ()).current_fontpack_codepoints <- codepoints; if dryrun then (res ()).current_fontpack_codepoints <- codepoints;
@ -388,7 +388,7 @@ let draw_single ~fast ~underneath ~filename ~bates ~batespad fast range pdf draw
ignore (ops_of_drawops true pdf endpage filename bates batespad 0 (hd pages) drawops); ignore (ops_of_drawops true pdf endpage filename bates batespad 0 (hd pages) drawops);
restore_whole_stack r; restore_whole_stack r;
Hashtbl.clear fontpacks; Hashtbl.clear fontpacks;
Printf.printf "--------------------------\n"; (*Printf.printf "--------------------------\n";*)
Some (ops_of_drawops false pdf endpage filename bates batespad 0 (hd pages) drawops) Some (ops_of_drawops false pdf endpage filename bates batespad 0 (hd pages) drawops)
end end
in in
@ -422,7 +422,7 @@ let draw_single ~fast ~underneath ~filename ~bates ~batespad fast range pdf draw
Pdfpage.change_pages true pdf pages Pdfpage.change_pages true pdf pages
let draw ?(fast=false) ?(underneath=false) ~filename ~bates ~batespad fast range pdf drawops = let draw ?(fast=false) ?(underneath=false) ~filename ~bates ~batespad fast range pdf drawops =
Printf.printf "%s\n" (string_of_drawops drawops); (*Printf.printf "%s\n" (string_of_drawops drawops); *)
resstack := [empty_res ()]; resstack := [empty_res ()];
Hashtbl.clear fontpacks; Hashtbl.clear fontpacks;
(res ()).time <- Cpdfstrftime.current_time (); (res ()).time <- Cpdfstrftime.current_time ();