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

Began work on expressions in coordinates and page sizes (i.e PW/2 + 6cm)

This commit is contained in:
John Whitington 2016-07-18 20:00:10 +01:00
parent 5b72334a9e
commit 08801a2fd9
1 changed files with 159 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
cpdfcommand.ml
View File

@ -279,7 +279,6 @@ type input =
input_kind * string * string * string * bool ref * int option input_kind * string * string * string * bool ref * int option
(* input kind, range, user_pw, owner_pw, was_decrypted_with_owner, revision *) (* input kind, range, user_pw, owner_pw, was_decrypted_with_owner, revision *)
type output_method = type output_method =
| NoOutputSpecified | NoOutputSpecified
| Stdout | Stdout
@ -301,8 +300,8 @@ type args =
mutable chunksize : int; mutable chunksize : int;
mutable linearize : bool; mutable linearize : bool;
mutable keeplinearize : bool; mutable keeplinearize : bool;
mutable rectangle : float * float * float * float; mutable rectangle : string;
mutable coord : float * float; mutable coord : string;
mutable duration : float option; mutable duration : float option;
mutable transition : string option; mutable transition : string option;
mutable horizontal : bool; mutable horizontal : bool;
@ -384,8 +383,8 @@ let args =
chunksize = 1; chunksize = 1;
linearize = false; linearize = false;
keeplinearize = false; keeplinearize = false;
rectangle = 0., 0., 0., 0.; rectangle = "0 0 0 0";
coord = 0., 0.; coord = "0 0";
duration = None; duration = None;
transition = None; transition = None;
horizontal = true; horizontal = true;
@ -467,8 +466,8 @@ let reset_arguments () =
args.chunksize <- 1; args.chunksize <- 1;
args.linearize <- false; args.linearize <- false;
args.keeplinearize <- false; args.keeplinearize <- false;
args.rectangle <- 0., 0., 0., 0.; args.rectangle <- "0 0 0 0";
args.coord <- 0., 0.; args.coord <- "0 0";
args.duration <- None; args.duration <- None;
args.transition <- None; args.transition <- None;
args.horizontal <- true; args.horizontal <- true;
@ -739,83 +738,160 @@ let points_of_papersize p =
let c = Pdfunits.convert 0. unit Pdfunits.PdfPoint in let c = Pdfunits.convert 0. unit Pdfunits.PdfPoint in
c w, c h c w, c h
let rec parse_units_again numbers papersize more = let firstpage pdf =
let w, h = points_of_papersize papersize in List.hd (Pdfpage.pages_of_pagetree pdf)
parse_units (h::w::numbers) more
and parse_units numbers = function let cropbox pdf page =
match Pdf.lookup_direct pdf "/CropBox" page.Pdfpage.rest with
| Some pdfobject -> Pdf.direct pdf pdfobject
| None -> page.Pdfpage.mediabox
let width box =
let minx, miny, maxx, maxy = Pdf.parse_rectangle box in
maxx -. minx
let height box =
let minx, miny, maxx, maxy = Pdf.parse_rectangle box in
maxy -. miny
let minx box =
let minx, miny, maxx, maxy = Pdf.parse_rectangle box in
minx
let miny box =
let minx, miny, maxx, maxy = Pdf.parse_rectangle box in
miny
let maxx box =
let minx, miny, maxx, maxy = Pdf.parse_rectangle box in
maxx
let maxy box =
let minx, miny, maxx, maxy = Pdf.parse_rectangle box in
maxy
let find_page_width pdf page = width page.Pdfpage.mediabox
let find_page_height pdf page = height page.Pdfpage.mediabox
let find_page_crop_width pdf page = width (cropbox pdf page)
let find_page_crop_height pdf page = height (cropbox pdf page)
let find_page_minx pdf page = minx page.Pdfpage.mediabox
let find_page_miny pdf page = miny page.Pdfpage.mediabox
let find_page_maxx pdf page = maxx page.Pdfpage.mediabox
let find_page_maxy pdf page = maxy page.Pdfpage.mediabox
let find_page_crop_minx pdf page = minx (cropbox pdf page)
let find_page_crop_miny pdf page = miny (cropbox pdf page)
let find_page_crop_maxx pdf page = maxx (cropbox pdf page)
let find_page_crop_maxy pdf page = maxy (cropbox pdf page)
let rec parse_units_again pdf numbers papersize more =
let w, h = points_of_papersize papersize in
parse_units pdf (h::w::numbers) more
and parse_units pdf numbers = function
| Pdfgenlex.LexName "a10portrait"::more -> | Pdfgenlex.LexName "a10portrait"::more ->
parse_units_again numbers Pdfpaper.a10 more parse_units_again pdf numbers Pdfpaper.a10 more
| Pdfgenlex.LexName "a9portrait"::more -> | Pdfgenlex.LexName "a9portrait"::more ->
parse_units_again numbers Pdfpaper.a9 more parse_units_again pdf numbers Pdfpaper.a9 more
| Pdfgenlex.LexName "a8portrait"::more -> | Pdfgenlex.LexName "a8portrait"::more ->
parse_units_again numbers Pdfpaper.a8 more parse_units_again pdf numbers Pdfpaper.a8 more
| Pdfgenlex.LexName "a7portrait"::more -> | Pdfgenlex.LexName "a7portrait"::more ->
parse_units_again numbers Pdfpaper.a7 more parse_units_again pdf numbers Pdfpaper.a7 more
| Pdfgenlex.LexName "a6portrait"::more -> | Pdfgenlex.LexName "a6portrait"::more ->
parse_units_again numbers Pdfpaper.a6 more parse_units_again pdf numbers Pdfpaper.a6 more
| Pdfgenlex.LexName "a5portrait"::more -> | Pdfgenlex.LexName "a5portrait"::more ->
parse_units_again numbers Pdfpaper.a5 more parse_units_again pdf numbers Pdfpaper.a5 more
| Pdfgenlex.LexName "a4portrait"::more -> | Pdfgenlex.LexName "a4portrait"::more ->
parse_units_again numbers Pdfpaper.a4 more parse_units_again pdf numbers Pdfpaper.a4 more
| Pdfgenlex.LexName "a3portrait"::more -> | Pdfgenlex.LexName "a3portrait"::more ->
parse_units_again numbers Pdfpaper.a3 more parse_units_again pdf numbers Pdfpaper.a3 more
| Pdfgenlex.LexName "a2portrait"::more -> | Pdfgenlex.LexName "a2portrait"::more ->
parse_units_again numbers Pdfpaper.a2 more parse_units_again pdf numbers Pdfpaper.a2 more
| Pdfgenlex.LexName "a1portrait"::more -> | Pdfgenlex.LexName "a1portrait"::more ->
parse_units_again numbers Pdfpaper.a1 more parse_units_again pdf numbers Pdfpaper.a1 more
| Pdfgenlex.LexName "a0portrait"::more -> | Pdfgenlex.LexName "a0portrait"::more ->
parse_units_again numbers Pdfpaper.a0 more parse_units_again pdf numbers Pdfpaper.a0 more
| Pdfgenlex.LexName "a10landscape"::more -> | Pdfgenlex.LexName "a10landscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.a10) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.a10) more
| Pdfgenlex.LexName "a9landscape"::more -> | Pdfgenlex.LexName "a9landscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.a9) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.a9) more
| Pdfgenlex.LexName "a8landscape"::more -> | Pdfgenlex.LexName "a8landscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.a8) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.a8) more
| Pdfgenlex.LexName "a7landscape"::more -> | Pdfgenlex.LexName "a7landscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.a7) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.a7) more
| Pdfgenlex.LexName "a6landscape"::more -> | Pdfgenlex.LexName "a6landscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.a6) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.a6) more
| Pdfgenlex.LexName "a5landscape"::more -> | Pdfgenlex.LexName "a5landscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.a5) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.a5) more
| Pdfgenlex.LexName "a4landscape"::more -> | Pdfgenlex.LexName "a4landscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.a4) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.a4) more
| Pdfgenlex.LexName "a3landscape"::more -> | Pdfgenlex.LexName "a3landscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.a3) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.a3) more
| Pdfgenlex.LexName "a2landscape"::more -> | Pdfgenlex.LexName "a2landscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.a2) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.a2) more
| Pdfgenlex.LexName "a1landscape"::more -> | Pdfgenlex.LexName "a1landscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.a1) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.a1) more
| Pdfgenlex.LexName "a0landscape"::more -> | Pdfgenlex.LexName "a0landscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.a0) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.a0) more
| Pdfgenlex.LexName "uslegalportrait"::more -> | Pdfgenlex.LexName "uslegalportrait"::more ->
parse_units_again numbers Pdfpaper.uslegal more parse_units_again pdf numbers Pdfpaper.uslegal more
| Pdfgenlex.LexName "usletterportrait"::more -> | Pdfgenlex.LexName "usletterportrait"::more ->
parse_units_again numbers Pdfpaper.usletter more parse_units_again pdf numbers Pdfpaper.usletter more
| Pdfgenlex.LexName "uslegallandscape"::more -> | Pdfgenlex.LexName "uslegallandscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.uslegal) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.uslegal) more
| Pdfgenlex.LexName "usletterlandscape"::more -> | Pdfgenlex.LexName "usletterlandscape"::more ->
parse_units_again numbers (Pdfpaper.landscape Pdfpaper.usletter) more parse_units_again pdf numbers (Pdfpaper.landscape Pdfpaper.usletter) more
| Pdfgenlex.LexInt x::Pdfgenlex.LexName "mm"::more -> | Pdfgenlex.LexInt x::Pdfgenlex.LexName "mm"::more ->
parse_units ((mm <| float_of_int x)::numbers) more parse_units pdf ((mm <| float_of_int x)::numbers) more
| Pdfgenlex.LexReal x::Pdfgenlex.LexName "mm"::more -> | Pdfgenlex.LexReal x::Pdfgenlex.LexName "mm"::more ->
parse_units (mm x::numbers) more parse_units pdf (mm x::numbers) more
| Pdfgenlex.LexInt x::Pdfgenlex.LexName "cm"::more -> | Pdfgenlex.LexInt x::Pdfgenlex.LexName "cm"::more ->
parse_units ((cm <| float_of_int x)::numbers) more parse_units pdf ((cm <| float_of_int x)::numbers) more
| Pdfgenlex.LexReal x::Pdfgenlex.LexName "cm"::more -> | Pdfgenlex.LexReal x::Pdfgenlex.LexName "cm"::more ->
parse_units (cm x::numbers) more parse_units pdf (cm x::numbers) more
| Pdfgenlex.LexInt x::Pdfgenlex.LexName "in"::more -> | Pdfgenlex.LexInt x::Pdfgenlex.LexName "in"::more ->
parse_units ((inch <| float_of_int x)::numbers) more parse_units pdf ((inch <| float_of_int x)::numbers) more
| Pdfgenlex.LexReal x::Pdfgenlex.LexName "in"::more -> | Pdfgenlex.LexReal x::Pdfgenlex.LexName "in"::more ->
parse_units (inch x::numbers) more parse_units pdf (inch x::numbers) more
| Pdfgenlex.LexName "PW"::more ->
parse_units pdf ((find_page_width pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexName "PH"::more ->
parse_units pdf ((find_page_height pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexName "CW"::more ->
parse_units pdf ((find_page_crop_width pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexName "CH"::more ->
parse_units pdf ((find_page_crop_height pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexName "PMINX"::more ->
parse_units pdf ((find_page_minx pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexName "PMINY"::more ->
parse_units pdf ((find_page_miny pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexName "PMAXX"::more ->
parse_units pdf ((find_page_maxx pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexName "PMAXY"::more ->
parse_units pdf ((find_page_maxy pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexName "CMINX"::more ->
parse_units pdf ((find_page_crop_minx pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexName "CMINY"::more ->
parse_units pdf ((find_page_crop_miny pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexName "CMAXX"::more ->
parse_units pdf ((find_page_crop_maxx pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexName "CMAXY"::more ->
parse_units pdf ((find_page_crop_maxy pdf (firstpage pdf))::numbers) more
| Pdfgenlex.LexInt x::more -> | Pdfgenlex.LexInt x::more ->
parse_units (float_of_int x::numbers) more parse_units pdf (float_of_int x::numbers) more
| Pdfgenlex.LexReal x::more -> | Pdfgenlex.LexReal x::more ->
parse_units (x::numbers) more parse_units pdf (x::numbers) more
| Pdfgenlex.LexName "pt"::more -> | Pdfgenlex.LexName "pt"::more ->
parse_units numbers more parse_units pdf numbers more
| Pdfgenlex.LexName "["::more ->
(* The beginning of a mathematical expression for one number *)
let n, rest = parse_expression more in
parse_units pdf (n::numbers) rest
| _ -> rev numbers | _ -> rev numbers
(* Parse a mathematical expression such as 1 + 2 * %PW *)
and parse_expression lexemes =
(0.0, [])
let rec space_units_inner = function let rec space_units_inner = function
| [] -> [] | [] -> []
| 'm'::'m'::t -> ' '::'m'::'m'::' '::space_units_inner t | 'm'::'m'::t -> ' '::'m'::'m'::' '::space_units_inner t
@ -827,28 +903,28 @@ let rec space_units_inner = function
let space_units s = let space_units s =
implode (space_units_inner (explode s)) implode (space_units_inner (explode s))
let parse_units_string s = let parse_units_string pdf s =
parse_units [] (Pdfgenlex.lex_string <| space_units s) parse_units pdf [] (Pdfgenlex.lex_string <| space_units s)
let parse_rectangle s = let parse_rectangle pdf s =
try try
match parse_units_string s with match parse_units_string pdf s with
| [x; y; w; h] -> x, y, w, h | [x; y; w; h] -> x, y, w, h
| _ -> error "Bad rectangle specification" | _ -> error "Bad rectangle specification"
with with
_ -> error "Bad rectangle specification" _ -> error "Bad rectangle specification"
let parse_coordinate s = let parse_coordinate pdf s =
try try
match parse_units_string s with match parse_units_string pdf s with
| [dx; dy] -> dx, dy | [dx; dy] -> dx, dy
| _ -> error "Bad coordinate specification" | _ -> error "Bad coordinate specification"
with with
_ -> error "Bad coordinate specification" _ -> error "Bad coordinate specification"
let parse_single_number s = let parse_single_number pdf s =
try try
match parse_units_string s with match parse_units_string pdf s with
| [x] -> x | [x] -> x
| _ -> error "Bad number Argument" | _ -> error "Bad number Argument"
with with
@ -857,15 +933,15 @@ let parse_single_number s =
(* Setting operations *) (* Setting operations *)
let setcrop s = let setcrop s =
setop Crop (); setop Crop ();
args.rectangle <- parse_rectangle s args.rectangle <- s
let setmediabox s = let setmediabox s =
setop MediaBox (); setop MediaBox ();
args.rectangle <- parse_rectangle s args.rectangle <- s
let setrectangle s = let setrectangle s =
setop AddRectangle (); setop AddRectangle ();
args.coord <- parse_coordinate s args.coord <- s
let setrotate i = let setrotate i =
if i = 0 || i = 90 || i = 180 || i = 270 if i = 0 || i = 90 || i = 180 || i = 270
@ -917,6 +993,8 @@ let displaydoctitle b =
try setop (DisplayDocTitle (bool_of_string b)) () with try setop (DisplayDocTitle (bool_of_string b)) () with
_ -> failwith "DisplayDocTitle: must use true or false" _ -> failwith "DisplayDocTitle: must use true or false"
let empty = Pdf.empty ()
let setsplitbookmarks i = setop (SplitOnBookmarks i) () let setsplitbookmarks i = setop (SplitOnBookmarks i) ()
let setstdout () = args.out <- Stdout let setstdout () = args.out <- Stdout
let setstdin () = args.inputs <- [StdIn, "all", "", "", ref false, None] let setstdin () = args.inputs <- [StdIn, "all", "", "", ref false, None]
@ -931,21 +1009,21 @@ let setdirection i =
| _ -> error "Bad direction" | _ -> error "Bad direction"
let seteffectduration f = args.effect_duration <- f let seteffectduration f = args.effect_duration <- f
let setcopyid s = setop (CopyId s) () let setcopyid s = setop (CopyId s) ()
let setthinlines s = setop (ThinLines (parse_single_number s)) () let setthinlines s = setop (ThinLines (parse_single_number empty s)) ()
let setcopyannotations s = setop (CopyAnnotations s) () let setcopyannotations s = setop (CopyAnnotations s) ()
let setshift s = let setshift s =
setop Shift (); setop Shift ();
args.coord <- parse_coordinate s args.coord <- s
let setscale s = let setscale s =
setop Scale (); setop Scale ();
args.coord <- parse_coordinate s args.coord <- s
let setscaletofit s = let setscaletofit s =
setop ScaleToFit (); setop ScaleToFit ();
args.coord <- parse_coordinate s args.coord <- s
let setattachfile s = let setattachfile s =
match args.op with match args.op with
@ -1009,47 +1087,47 @@ let setcombinepages f =
setop (CombinePages f) () setop (CombinePages f) ()
let setposcenter s = let setposcenter s =
let x, y = parse_coordinate s in let x, y = parse_coordinate empty s in
args.position <- Cpdf.PosCentre (x, y) args.position <- Cpdf.PosCentre (x, y)
let setposleft s = let setposleft s =
let x, y = parse_coordinate s in let x, y = parse_coordinate empty s in
args.position <- Cpdf.PosLeft (x, y) args.position <- Cpdf.PosLeft (x, y)
let setposright s = let setposright s =
let x, y = parse_coordinate s in let x, y = parse_coordinate empty s in
args.position <- Cpdf.PosRight (x, y) args.position <- Cpdf.PosRight (x, y)
let settop n = let settop n =
args.position <- Cpdf.Top (parse_single_number n); args.position <- Cpdf.Top (parse_single_number empty n);
args.justification <- Cpdf.CentreJustify args.justification <- Cpdf.CentreJustify
let settopleft n = let settopleft n =
args.position <- Cpdf.TopLeft (parse_single_number n); args.position <- Cpdf.TopLeft (parse_single_number empty n);
args.justification <- Cpdf.LeftJustify args.justification <- Cpdf.LeftJustify
let settopright n = let settopright n =
args.position <- Cpdf.TopRight (parse_single_number n); args.position <- Cpdf.TopRight (parse_single_number empty n);
args.justification <- Cpdf.RightJustify args.justification <- Cpdf.RightJustify
let setleft n = let setleft n =
args.position <- Cpdf.Left (parse_single_number n); args.position <- Cpdf.Left (parse_single_number empty n);
args.justification <- Cpdf.LeftJustify args.justification <- Cpdf.LeftJustify
let setbottomleft n = let setbottomleft n =
args.position <- Cpdf.BottomLeft (parse_single_number n); args.position <- Cpdf.BottomLeft (parse_single_number empty n);
args.justification <- Cpdf.LeftJustify args.justification <- Cpdf.LeftJustify
let setbottom n = let setbottom n =
args.position <- Cpdf.Bottom (parse_single_number n); args.position <- Cpdf.Bottom (parse_single_number empty n);
args.justification <- Cpdf.CentreJustify args.justification <- Cpdf.CentreJustify
let setbottomright n = let setbottomright n =
args.position <- Cpdf.BottomRight (parse_single_number n); args.position <- Cpdf.BottomRight (parse_single_number empty n);
args.justification <- Cpdf.RightJustify args.justification <- Cpdf.RightJustify
let setright n = let setright n =
args.position <- Cpdf.Right (parse_single_number n); args.position <- Cpdf.Right (parse_single_number empty n);
args.justification <- Cpdf.RightJustify args.justification <- Cpdf.RightJustify
let setdiagonal n = let setdiagonal n =
@ -3140,8 +3218,8 @@ let go () =
| Some Crop -> | Some Crop ->
begin match args.inputs, args.out with begin match args.inputs, args.out with
| (_, pagespec, _, _, _, _)::_, _ -> | (_, pagespec, _, _, _, _)::_, _ ->
let x, y, w, h = args.rectangle in
let pdf = get_single_pdf (Some Crop) false in let pdf = get_single_pdf (Some Crop) false in
let x, y, w, h = parse_rectangle pdf args.rectangle in
let range = parse_pagespec pdf pagespec in let range = parse_pagespec pdf pagespec in
let pdf = Cpdf.crop_pdf x y w h pdf range in let pdf = Cpdf.crop_pdf x y w h pdf range in
write_pdf false pdf write_pdf false pdf
@ -3151,8 +3229,8 @@ let go () =
| Some MediaBox -> | Some MediaBox ->
begin match args.inputs, args.out with begin match args.inputs, args.out with
| (_, pagespec, _, _, _, _)::_, _ -> | (_, pagespec, _, _, _, _)::_, _ ->
let x, y, w, h = args.rectangle in
let pdf = get_single_pdf (Some MediaBox) false in let pdf = get_single_pdf (Some MediaBox) false in
let x, y, w, h = parse_rectangle pdf args.rectangle in
let range = parse_pagespec pdf pagespec in let range = parse_pagespec pdf pagespec in
let pdf = Cpdf.set_mediabox x y w h pdf range in let pdf = Cpdf.set_mediabox x y w h pdf range in
write_pdf false pdf write_pdf false pdf
@ -3443,19 +3521,19 @@ let go () =
| Some Shift -> | Some Shift ->
let pdf = get_single_pdf args.op false in let pdf = get_single_pdf args.op false in
let range = parse_pagespec pdf (get_pagespec ()) in let range = parse_pagespec pdf (get_pagespec ()) in
begin match args.coord with (dx, dy) -> begin match parse_coordinate pdf args.coord with (dx, dy) ->
write_pdf false (Cpdf.shift_pdf ~fast:args.fast dx dy pdf range) write_pdf false (Cpdf.shift_pdf ~fast:args.fast dx dy pdf range)
end end
| Some Scale -> | Some Scale ->
let pdf = get_single_pdf args.op false in let pdf = get_single_pdf args.op false in
let range = parse_pagespec pdf (get_pagespec ()) in let range = parse_pagespec pdf (get_pagespec ()) in
begin match args.coord with (sx, sy) -> begin match parse_coordinate pdf args.coord with (sx, sy) ->
write_pdf false (Cpdf.scale_pdf ~fast:args.fast sx sy pdf range) write_pdf false (Cpdf.scale_pdf ~fast:args.fast sx sy pdf range)
end end
| Some ScaleToFit -> | Some ScaleToFit ->
let pdf = get_single_pdf args.op false in let pdf = get_single_pdf args.op false in
let range = parse_pagespec pdf (get_pagespec ()) in let range = parse_pagespec pdf (get_pagespec ()) in
let x, y = args.coord let x, y = parse_coordinate pdf args.coord
and scale = args.scale in and scale = args.scale in
write_pdf false (Cpdf.scale_to_fit_pdf ~fast:args.fast scale x y args.op pdf range) write_pdf false (Cpdf.scale_to_fit_pdf ~fast:args.fast scale x y args.op pdf range)
| Some (ScaleContents scale) -> | Some (ScaleContents scale) ->
@ -3548,7 +3626,8 @@ let go () =
let range = parse_pagespec pdf (get_pagespec ()) in let range = parse_pagespec pdf (get_pagespec ()) in
write_pdf false write_pdf false
(addrectangle (addrectangle
args.coord args.color args.position args.relative_to_cropbox args.underneath range pdf) (parse_coordinate pdf args.coord)
args.color args.position args.relative_to_cropbox args.underneath range pdf)
| Some (AddBookmarks file) -> | Some (AddBookmarks file) ->
write_pdf false write_pdf false
(Cpdf.add_bookmarks true (Pdfio.input_of_channel (open_in_bin file)) (Cpdf.add_bookmarks true (Pdfio.input_of_channel (open_in_bin file))