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

Fix hmtx usage for monospaced fonts

This commit is contained in:
John Whitington 2023-07-05 16:22:16 +01:00
parent 8ab483542c
commit a63cbd66b8
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cpdftruetype.ml
View File

@ -245,9 +245,16 @@ let read_hhea_table b =
read_ushort b (* numOfLongHorMetrics *) read_ushort b (* numOfLongHorMetrics *)
let read_hmtx_table numOfLongHorMetrics b = let read_hmtx_table numOfLongHorMetrics b =
Printf.printf "**** numOfLongHorMetrics = %i\n" numOfLongHorMetrics;
let r =
Array.init Array.init
numOfLongHorMetrics numOfLongHorMetrics
(fun _ -> let r = read_ushort b in ignore (read_short b); r) (fun _ -> let r = read_ushort b in ignore (read_short b); r)
in
for x = 0 to numOfLongHorMetrics - 1 do
Printf.printf "longHorMetrics %i = %i\n" x r.(x)
done;
r
let write_loca_table subset cmap indexToLocFormat bs loca = let write_loca_table subset cmap indexToLocFormat bs loca =
let locnums = null_hash () in let locnums = null_hash () in
@ -360,7 +367,8 @@ let calculate_widths unitsPerEm encoding firstchar lastchar subset cmapdata hmtx
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 (* If it fails, we are a monospaced font. Pick the last hmtxdata entry. *)
let width = try hmtxdata.(glyphnum) with _ -> hmtxdata.(Array.length hmtxdata - 1) 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)
@ -372,7 +380,9 @@ let calculate_width_higher unitsPerEm firstchar lastchar subset cmapdata hmtxdat
(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 Printf.printf "hmtxdata length = %i\n" (Array.length hmtxdata);
(* If it fails, we are a monospaced font. Pick the last hmtxdata entry. *)
let width = try hmtxdata.(glyphnum) with _ -> hmtxdata.(Array.length hmtxdata - 1) 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)
@ -706,3 +716,7 @@ let parse ?(subset=[]) data encoding =
debug_t two; debug_t two;
write_font "two.ttf" two.subset_fontfile;*) write_font "two.ttf" two.subset_fontfile;*)
[one; two] [one; two]
let parse ?(subset=[]) data encoding =
try parse ~subset data encoding with
e -> raise (Cpdferror.error ("Failed to parse TrueType font: " ^ Printexc.to_string e))