From 35e91e78dbb0f5887890632fe9999bfb2cf18a67 Mon Sep 17 00:00:00 2001 From: John Whitington Date: Wed, 6 May 2020 17:00:55 +0100 Subject: [PATCH] Added -squeeze-no-pagedata, -squeeze-no-recompress --- cpdf.ml | 18 ++++++++++++------ cpdf.mli | 2 +- cpdfcommand.ml | 22 +++++++++++++++++----- cpdfmanual.tex | 2 ++ 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/cpdf.ml b/cpdf.ml index 8f9410f..850a5e6 100644 --- a/cpdf.ml +++ b/cpdf.ml @@ -289,7 +289,7 @@ let squeeze_all_content_streams pdf = pdf (* We run squeeze enough times for the number of objects to not change *) -let squeeze ?logto pdf = +let squeeze ?logto ?(pagedata=true) ?(recompress=true) pdf = let log x = match logto with None -> print_string x; flush stdout @@ -307,11 +307,17 @@ let squeeze ?logto pdf = n := Pdf.objcard pdf; log (Printf.sprintf "Squeezing... Down to %i objects\n" (Pdf.objcard pdf)); done; - log (Printf.sprintf "Squeezing page data and xobjects\n"); - squeeze_all_content_streams pdf; - log (Printf.sprintf "Recompressing document\n"); - Pdfcodec.flate_level := 9; - ignore (recompress_pdf pdf) + if pagedata then + begin + log (Printf.sprintf "Squeezing page data and xobjects\n"); + squeeze_all_content_streams pdf; + end; + if recompress then + begin + log (Printf.sprintf "Recompressing document\n"); + Pdfcodec.flate_level := 9; + ignore (recompress_pdf pdf) + end with e -> raise diff --git a/cpdf.mli b/cpdf.mli index 34217cc..d8f2a71 100644 --- a/cpdf.mli +++ b/cpdf.mli @@ -425,7 +425,7 @@ val blackfills : float * float * float -> int list -> Pdf.t -> Pdf.t val draft : string option -> bool -> int list -> Pdf.t -> Pdf.t (** Squeeze a PDF *) -val squeeze : ?logto:string -> Pdf.t -> unit +val squeeze : ?logto:string -> ?pagedata:bool -> ?recompress:bool -> Pdf.t -> unit (**/**) diff --git a/cpdfcommand.ml b/cpdfcommand.ml index 9252b67..53d0101 100644 --- a/cpdfcommand.ml +++ b/cpdfcommand.ml @@ -3,7 +3,7 @@ let demo = false let noncomp = false let major_version = 2 let minor_version = 4 -let version_date = "(devel, 30th January 2020)" +let version_date = "(devel, 6th May 2020)" open Pdfutil open Pdfio @@ -427,6 +427,8 @@ type args = mutable labelstartval : int; mutable labelsprogress : bool; mutable squeeze : bool; + mutable squeeze_recompress : bool; + mutable squeeze_pagedata: bool; mutable original_filename : string; mutable was_encrypted : bool; mutable cpdflin : string option; @@ -527,6 +529,8 @@ let args = labelstartval = 1; labelsprogress = false; squeeze = false; + squeeze_recompress = true; + squeeze_pagedata = true; original_filename = ""; was_encrypted = false; cpdflin = None; @@ -642,7 +646,7 @@ let reset_arguments () = (* Do not reset original_filename or cpdflin or was_encrypted or * was_decrypted_with_owner or recrypt or producer or creator or * path_to_ghostscript or gs_malformed or gs_quiet, since we want these to work across - * ANDs. Or squeeze: a little odd, but we want it to happen on eventual output. *) + * ANDs. Or squeeze options: a little odd, but we want it to happen on eventual output. *) let get_pagespec () = match args.inputs with @@ -1490,6 +1494,12 @@ let setocgrenamefrom s = let setocgrenameto s = args.ocgrenameto <- s +let setsqueezepagedata () = + args.squeeze_pagedata <- false + +let setsqueezerecompress () = + args.squeeze_recompress <- false + let whingemalformed () = prerr_string "Command line must be of exactly the form\ncpdf -gs -gs-malformed-force -o \n"; exit 1 @@ -2119,6 +2129,8 @@ and specs = ("-gs-quiet", Arg.Unit setgsquiet, " Make gs go into quiet mode"); ("-squeeze", Arg.Unit setsqueeze, " Squeeze"); ("-squeeze-log-to", Arg.String setsqueezelogto, " Squeeze log location"); + ("-squeeze-no-pagedata", Arg.Unit setsqueezepagedata, " Don't recompress pages"); + ("-squeeze-no-recompress", Arg.Unit setsqueezerecompress, " Don't recompress streams"); (* Just for error reporting *) ("-gs-malformed-force", Arg.Unit whingemalformed, ""); (* These items are not documented yet, but will be soon *) @@ -2513,7 +2525,7 @@ let write_pdf ?(encryption = None) ?(is_decompress=false) mk_id pdf = if not is_decompress then begin ignore (Cpdf.recompress_pdf pdf); - if args.squeeze then Cpdf.squeeze ?logto:!logto pdf; + if args.squeeze then Cpdf.squeeze ~pagedata:args.squeeze_pagedata ~recompress:args.squeeze_recompress ?logto:!logto pdf; end; Pdf.remove_unreferenced pdf; really_write_pdf ~is_decompress mk_id pdf outname @@ -2529,7 +2541,7 @@ let write_pdf ?(encryption = None) ?(is_decompress=false) mk_id pdf = if not is_decompress then begin ignore (Cpdf.recompress_pdf pdf); - if args.squeeze then Cpdf.squeeze ?logto:!logto pdf; + if args.squeeze then Cpdf.squeeze ~pagedata:args.squeeze_pagedata ~recompress:args.squeeze_recompress ?logto:!logto pdf; Pdf.remove_unreferenced pdf end; really_write_pdf ~encryption ~is_decompress mk_id pdf temp; @@ -2651,7 +2663,7 @@ let fast_write_split_pdfs (stem original_filename) startpage endpage in Pdf.remove_unreferenced pdf; - if sq then Cpdf.squeeze ?logto:!logto pdf; + if sq then Cpdf.squeeze ~pagedata:args.squeeze_pagedata ~recompress:args.squeeze_recompress ?logto:!logto pdf; really_write_pdf ~encryption:enc (not (enc = None)) pdf name) (indx pagenums) pagenums diff --git a/cpdfmanual.tex b/cpdfmanual.tex index 741281b..446fcca 100644 --- a/cpdfmanual.tex +++ b/cpdfmanual.tex @@ -1,5 +1,7 @@ %Document \n in bookmark files %Document -labels-progress +%Document -open-at-page-{fit} now take pagespec not just number +%Document -squeeze-no-recompress -squeeze-no-pagedata \documentclass{book} \usepackage{palatino} \usepackage{microtype}