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

Fixed up font support for -no-embed-font

This commit is contained in:
John Whitington 2015-04-14 14:24:10 +01:00
parent bc09c9f89a
commit 7e14409945
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
cpdf.ml
View File

@ -1529,13 +1529,13 @@ let extract_widths_firstlast width_data =
map snd (List.sort compare (list_of_hashtbl width_data))) map snd (List.sort compare (list_of_hashtbl width_data)))
| _ -> raise (Failure "extract_widths_firstlast") | _ -> raise (Failure "extract_widths_firstlast")
let make_font fontname = let make_font embed fontname =
let font = unopt (Pdftext.standard_font_of_name ("/" ^ fontname)) in let font = unopt (Pdftext.standard_font_of_name ("/" ^ fontname)) in
let header, width_data, _ = Pdfstandard14.afm_data font in let header, width_data, _ = Pdfstandard14.afm_data font in
(* Print out the width data *) (* Print out the width data *)
Hashtbl.iter (*Hashtbl.iter
(Printf.printf "%i -> %i\n") (Printf.printf "%i -> %i\n")
width_data; width_data;*)
let firstchar, lastchar, widths = extract_widths_firstlast width_data in let firstchar, lastchar, widths = extract_widths_firstlast width_data in
let flags = Pdfstandard14.flags_of_standard_font font in let flags = Pdfstandard14.flags_of_standard_font font in
let fontbbox = extract_fontbbox header "FontBBox" in let fontbbox = extract_fontbbox header "FontBBox" in
@ -1556,18 +1556,28 @@ let make_font fontname =
("/CapHeight", capheight); ("/CapHeight", capheight);
("/StemV", Pdf.Integer stemv)] ("/StemV", Pdf.Integer stemv)]
in in
Pdf.Dictionary (* With -no-embed-font, we use the standard encoding, and just the
[("/Type", Pdf.Name "/Font"); * minimal stuff. Without -no-embed-font, we switch to WinAnsiEncoding,
("/Encoding", Pdf.Name "/WinAnsiEncoding"); * and fill out everything except the font file instead *)
("/Subtype", Pdf.Name "/Type1"); if embed then
("/BaseFont", Pdf.Name ("/" ^ fontname)); Pdf.Dictionary
("/FirstChar", Pdf.Integer firstchar); [("/Type", Pdf.Name "/Font");
("/LastChar", Pdf.Integer lastchar); ("/Subtype", Pdf.Name "/Type1");
("/Widths", Pdf.Array (map (fun x -> Pdf.Integer x) widths)); ("/BaseFont", Pdf.Name ("/" ^ fontname));
("/FontDescriptor", fontdescriptor)] ("/Encoding", Pdf.Name "/WinAnsiEncoding");
("/FirstChar", Pdf.Integer firstchar);
("/LastChar", Pdf.Integer lastchar);
("/Widths", Pdf.Array (map (fun x -> Pdf.Integer x) widths));
("/FontDescriptor", fontdescriptor)]
else
Pdf.Dictionary
[("/Type", Pdf.Name "/Font");
("/Subtype", Pdf.Name "/Type1");
("/Encoding", Pdf.Name "/WinAnsiEncoding");
("/BaseFont", Pdf.Name ("/" ^ fontname))]
let addtext let addtext
metrics lines linewidth outline fast colour fontname bates fontsize font metrics lines linewidth outline fast colour fontname embed bates fontsize font
underneath position hoffset voffset text pages orientation cropbox opacity underneath position hoffset voffset text pages orientation cropbox opacity
justification filename pdf justification filename pdf
= =
@ -1661,7 +1671,7 @@ let addtext
match font with match font with
| Some _ -> | Some _ ->
let newfontdict = let newfontdict =
Pdf.add_dict_entry fontdict unique_fontname (make_font fontname) Pdf.add_dict_entry fontdict unique_fontname (make_font embed fontname)
in in
Pdf.add_dict_entry resources' "/Font" newfontdict Pdf.add_dict_entry resources' "/Font" newfontdict
| None -> page.Pdfpage.resources | None -> page.Pdfpage.resources
@ -1774,8 +1784,10 @@ let
if orientation = Vertical then 0., -.(!voffset) else !voffset, 0. if orientation = Vertical then 0., -.(!voffset) else !voffset, 0.
in in
pdf := pdf :=
addtext metrics lines linewidth outline fast colour fontname bates fontsize font addtext metrics lines linewidth outline fast colour fontname
underneath position hoff voff line pages orientation cropbox opacity justification filename !pdf; embed bates fontsize font underneath position hoff voff line
pages orientation cropbox opacity justification filename
!pdf;
voffset := !voffset +. (linespacing *. fontsize)) voffset := !voffset +. (linespacing *. fontsize))
lines; lines;
ops_metrics := rev !ops_metrics; ops_metrics := rev !ops_metrics;

1
cpdfmanual.tex
View File

@ -1,3 +1,4 @@
%FIXME: Document -no-embed-font and encoding switch
\documentclass{book} \documentclass{book}
\usepackage{palatino} \usepackage{palatino}
\usepackage{microtype} \usepackage{microtype}