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

more

This commit is contained in:
John Whitington 2021-10-25 14:07:05 +01:00
parent fe495c77be
commit 6f462f2141
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cpdf.ml
View File

@ -2793,15 +2793,18 @@ let impose_transforms fx fy columns rtl btt center margin spacing linewidth medi
let len = ref len in let len = ref len in
let cent_extra_x = ref 0. in let cent_extra_x = ref 0. in
let cent_extra_y = ref 0. in let cent_extra_y = ref 0. in
let addtr row col px py = let addtr x y row col px py =
let ex, ey = let cex, cey =
(if rtl then ~-.(!cent_extra_x) else !cent_extra_x), (if btt then ~-.(!cent_extra_y) else !cent_extra_y) (if rtl then ~-.(!cent_extra_x) else !cent_extra_x), (if btt then ~-.(!cent_extra_y) else !cent_extra_y)
in in
let total_fit_extra_hspace = fit_extra_hspace *. (float_of_int col +. 1.) in let spacecol = if rtl then x - col - 1 else col in
let total_fit_extra_vspace = fit_extra_vspace *. (float_of_int row +. 1.) in let spacerow = if btt then y - row - 1 else row in
let total_fit_extra_hspace = fit_extra_hspace *. (float_of_int spacecol +. 1.) in
let total_fit_extra_vspace = fit_extra_vspace *. (float_of_int spacerow +. 1.) in
(*Printf.printf "col = %i, px = %f, ex = %f, fit_extra_hspace = %f, total_fit_extra_vspace = %f\n" col px cex fit_extra_hspace total_fit_extra_hspace;*)
trs := trs :=
Pdftransform.matrix_of_transform Pdftransform.matrix_of_transform
[Pdftransform.Translate (px +. ex +. total_fit_extra_hspace, py +. ey +. total_fit_extra_vspace)] [Pdftransform.Translate (px +. cex +. total_fit_extra_hspace, py +. cey +. total_fit_extra_vspace)]
::!trs ::!trs
in in
let x = int_of_float fx in let x = int_of_float fx in
@ -2815,7 +2818,7 @@ let impose_transforms fx fy columns rtl btt center margin spacing linewidth medi
if center && !len < y then if !cent_extra_y = 0. then cent_extra_y := ~-.(height *. float_of_int (y - !len)) /. 2.; if center && !len < y then if !cent_extra_y = 0. then cent_extra_y := ~-.(height *. float_of_int (y - !len)) /. 2.;
for row = y - 1 downto 0 do for row = y - 1 downto 0 do
let row, col = order row col in let row, col = order row col in
if !len > 0 then addtr row col (width *. float_of_int col) (height *. float_of_int row); if !len > 0 then addtr x y row col (width *. float_of_int col) (height *. float_of_int row);
len := !len - 1 len := !len - 1
done done
done done
@ -2829,7 +2832,7 @@ let impose_transforms fx fy columns rtl btt center margin spacing linewidth medi
let final_empty_cols = x - final_full_cols in let final_empty_cols = x - final_full_cols in
if center && !len <= final_full_cols then original_col + (x - 1 - 1 - (final_empty_cols / 2)) else original_col if center && !len <= final_full_cols then original_col + (x - 1 - 1 - (final_empty_cols / 2)) else original_col
in in
if !len > 0 then addtr row adjusted_col (width *. float_of_int col) (height *. float_of_int row); if !len > 0 then addtr x y row adjusted_col (width *. float_of_int col) (height *. float_of_int row);
len := !len - 1 len := !len - 1
done done
done; done;