fenix/cpdf-source
1
0
Fork 0
mirror of https://github.com/johnwhitington/cpdf-source.git synced 2025-04-05 22:21:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Toward larger second subset

Browse Source
This commit is contained in:
John Whitington 2023-06-16 15:53:20 +01:00
parent a6adbe9b8e
commit 9f5e672317
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cpdftruetype.ml
View File

@ -311,15 +311,15 @@ let calculate_widths unitsPerEm encoding firstchar lastchar subset cmapdata hmtx
(lastchar - firstchar + 1) (lastchar - firstchar + 1)
(fun pos -> (fun pos ->
let code = pos + firstchar in let code = pos + firstchar in
(*if !dbg then*) Printf.printf "code %i --> " code; if !dbg then Printf.printf "code %i --> " code;
let code = unicode_codepoint_of_pdfcode encoding_table glyphlist_table code in let code = unicode_codepoint_of_pdfcode encoding_table glyphlist_table code in
(*if !dbg then*) Printf.printf "unicode %i --> " code; if !dbg then Printf.printf "unicode %i --> " code;
if subset <> [] && not (mem code subset) then 0 else if subset <> [] && not (mem code subset) then 0 else
try try
let glyphnum = Hashtbl.find cmapdata code in let glyphnum = Hashtbl.find cmapdata code in
(*if !dbg then*) Printf.printf "glyph number %i --> " glyphnum; if !dbg then Printf.printf "glyph number %i --> " glyphnum;
let width = hmtxdata.(glyphnum) in let width = hmtxdata.(glyphnum) in
(*if !dbg then*) Printf.printf "width %i\n" width; if !dbg then Printf.printf "width %i\n" width;
pdf_unit unitsPerEm width pdf_unit unitsPerEm width
with e -> if !dbg then Printf.printf "no width for %i\n" code; 0) with e -> if !dbg then Printf.printf "no width for %i\n" code; 0)
@ -329,9 +329,9 @@ let calculate_width_higher unitsPerEm firstchar lastchar subset cmapdata hmtxdat
(lastchar - firstchar + 1) (lastchar - firstchar + 1)
(fun pos -> (fun pos ->
let glyphnum = Hashtbl.find cmapdata subset.(pos) in let glyphnum = Hashtbl.find cmapdata subset.(pos) in
(*if !dbg then*) Printf.printf "glyph number %i --> " glyphnum; if !dbg then Printf.printf "glyph number %i --> " glyphnum;
let width = hmtxdata.(glyphnum) in let width = hmtxdata.(glyphnum) in
(*if !dbg then*) Printf.printf "width %i\n" width; if !dbg then Printf.printf "width %i\n" width;
pdf_unit unitsPerEm width) pdf_unit unitsPerEm width)
let calculate_maxwidth unitsPerEm hmtxdata = let calculate_maxwidth unitsPerEm hmtxdata =
@ -464,6 +464,10 @@ let write_font filename data =
output_string fh (Pdfio.string_of_bytes data); output_string fh (Pdfio.string_of_bytes data);
close_out fh close_out fh
let find_main encoding subset =
let encoding_table = Pdftext.table_of_encoding encoding in
List.partition (fun u -> try ignore (Hashtbl.find encoding_table u); true with Not_found -> false) subset
let parse ?(subset=[]) data encoding = let parse ?(subset=[]) data encoding =
if !dbg then if !dbg then
begin begin
@ -572,12 +576,14 @@ 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 = [hd subset] in (* N *) let subset_1, subset_2 = find_main encoding subset in
let subset_2 = tl subset in (* BACKWARDS E *)
(*if !dbg && subset <> [] then*) (*if !dbg && subset <> [] then*)
begin begin
Printf.printf "***********Chars for main WinAnsiEncoding subset: U+%04X\n" (hd subset_1); Printf.printf "***********Chars for main WinAnsiEncoding subset:\n";
Printf.printf "***********Chars for higher subset: U+%04X\n" (hd subset_2); iter (Printf.printf "U+%04X ") subset_1;
Printf.printf "\n***********Chars for higher subset:\n";
iter (Printf.printf "U+%04X ") subset_2;
Printf.printf "\n";
end; end;
let flags_1 = calculate_flags false italicangle in let flags_1 = calculate_flags false italicangle in
let flags_2 = calculate_flags true italicangle in let flags_2 = calculate_flags true italicangle in