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

Towards real fontpacks

This commit is contained in:
John Whitington 2023-06-13 16:09:05 +01:00
parent 5ef679bc1a
commit 0c1d6719e0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpdfembed.ml
View File

@ -74,6 +74,7 @@ let make_single_font ~fontname ~encoding pdf f =
encoding}) encoding})
let make_fontpack_hashtable fs = let make_fontpack_hashtable fs =
Printf.printf "make_fontpack_hashtable\n";
let indexes = indx0 fs in let indexes = indx0 fs in
let table = null_hash () in let table = null_hash () in
iter2 iter2
@ -83,6 +84,7 @@ let make_fontpack_hashtable fs =
(fun u -> Hashtbl.add table u (i, unopt (charcode_extractor u))) (fun u -> Hashtbl.add table u (i, unopt (charcode_extractor u)))
subset) subset)
indexes fs; indexes fs;
Printf.printf "end of make_fontpack_hashtable\n";
table table
let embed_truetype pdf ~fontfile ~fontname ~codepoints ~encoding = let embed_truetype pdf ~fontfile ~fontname ~codepoints ~encoding =

17
cpdftruetype.ml
View File

@ -439,7 +439,7 @@ let _ =
Pdfe.logger := (fun s -> print_string s; flush stdout) Pdfe.logger := (fun s -> print_string s; flush stdout)
let parse ?(subset=[]) data encoding = let parse ?(subset=[]) data encoding =
(*if !dbg then*) if !dbg then
begin begin
Printf.printf "********Cpdftruetype.parse SUBSET is "; Printf.printf "********Cpdftruetype.parse SUBSET is ";
iter (Printf.printf "U+%04X ") subset; iter (Printf.printf "U+%04X ") subset;
@ -546,16 +546,16 @@ let parse ?(subset=[]) data encoding =
| (_, _, o, l)::_ -> o, l | (_, _, o, l)::_ -> o, l
| [] -> raise (Pdf.PDFError "No loca table found in TrueType font") | [] -> raise (Pdf.PDFError "No loca table found in TrueType font")
in in
let subset_1 = if subset = [] then [] else tl subset in let subset_1 = [hd subset] in (* N *)
let subset_2 = if subset = [] then [] else [hd subset] in let subset_2 = tl subset in (* BACKWARDS E *)
if !dbg && subset <> [] then (*if !dbg && subset <> [] then*)
begin begin
Printf.printf "***********Chars for experimental main WinAnsiEncoding set: %i %i\n" (hd subset_1) (hd (tl subset_1)); Printf.printf "***********Chars for main WinAnsiEncoding subset: U+%04X\n" (hd subset_1);
Printf.printf "***********Chars for experimental higher set: %i\n" (hd subset_2); Printf.printf "***********Chars for higher subset: U+%04X\n" (hd subset_2);
end; end;
let flags = calculate_flags italicangle in let flags = calculate_flags italicangle in
let firstchar_1, lastchar_1 = calculate_limits subset_1 in let firstchar_1, lastchar_1 = calculate_limits subset_1 in
let firstchar_2, lastchar_2 = (0, max 0 (length subset_2 - 1)) in let firstchar_2, lastchar_2 = (0, length subset_2 - 1) in
let numOfLongHorMetrics = let numOfLongHorMetrics =
match keep (function (t, _, _, _) -> string_of_tag t = "hhea") !tables with match keep (function (t, _, _, _) -> string_of_tag t = "hhea") !tables with
| (_, _, o, l)::_ -> let b = mk_b (i32toi o) in read_hhea_table b | (_, _, o, l)::_ -> let b = mk_b (i32toi o) in read_hhea_table b
@ -578,10 +578,12 @@ let parse ?(subset=[]) data encoding =
| (_, _, o, l)::_ -> o, l | (_, _, o, l)::_ -> o, l
| [] -> raise (Pdf.PDFError "No glyf table found in TrueType font") | [] -> raise (Pdf.PDFError "No glyf table found in TrueType font")
in in
Printf.printf "Calculate main subset\n";
let main_subset = let main_subset =
subset_font major minor !tables indexToLocFormat subset_1 subset_font major minor !tables indexToLocFormat subset_1
encoding !glyphcodes loca mk_b glyfoffset data encoding !glyphcodes loca mk_b glyfoffset data
in in
Printf.printf "Calculate higher subset\n";
let second_subset = let second_subset =
subset_font major minor !tables indexToLocFormat subset_2 subset_font major minor !tables indexToLocFormat subset_2
encoding !glyphcodes loca mk_b glyfoffset data encoding !glyphcodes loca mk_b glyfoffset data
@ -594,6 +596,7 @@ let parse ?(subset=[]) data encoding =
Hashtbl.add h 0 s; Hashtbl.add h 0 s;
Some h Some h
in in
Printf.printf "returning the font pack. Job done.\n";
[{flags; minx; miny; maxx; maxy; italicangle; ascent; descent; [{flags; minx; miny; maxx; maxy; italicangle; ascent; descent;
capheight; stemv; xheight; avgwidth; maxwidth; firstchar = firstchar_1; lastchar = lastchar_1; capheight; stemv; xheight; avgwidth; maxwidth; firstchar = firstchar_1; lastchar = lastchar_1;
widths = widths_1; subset_fontfile = main_subset; subset = subset_1; tounicode = None}] widths = widths_1; subset_fontfile = main_subset; subset = subset_1; tounicode = None}]