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

Remove -create-pdf-ua kludges

This commit is contained in:
John Whitington 2024-09-30 13:01:31 +01:00
parent c9dfa1c95b
commit 52caf8eced
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cpdfcommand.ml
View File

@ -2667,10 +2667,10 @@ let specs =
Arg.Unit (setop CreatePDF), Arg.Unit (setop CreatePDF),
" Create a new PDF"); " Create a new PDF");
("-create-pdf-ua-1", ("-create-pdf-ua-1",
Arg.String (fun _ -> ()), (* Processed elsewhere *) Arg.String (fun s -> args.subformat <- Some Cpdfua.PDFUA1; args.title <- Some s; setop CreatePDF ()),
" Create a new PDF/UA-1 with the given title"); " Create a new PDF/UA-1 with the given title");
("-create-pdf-ua-2", ("-create-pdf-ua-2",
Arg.String (fun _ -> ()), (* Processed elsewhere *) Arg.String (fun s -> args.subformat <- Some Cpdfua.PDFUA1; args.title <- Some s; setop CreatePDF ()),
" Create a new PDF/UA-2 with the given title"); " Create a new PDF/UA-2 with the given title");
("-create-pdf-pages", ("-create-pdf-pages",
Arg.Int setcreatepdfpages, Arg.Int setcreatepdfpages,
@ -4694,15 +4694,6 @@ let expand_args argv =
let l = Array.to_list argv in let l = Array.to_list argv in
Array.of_list (expand_args_inner [] l) Array.of_list (expand_args_inner [] l)
let rec expand_recipes = function
| [] -> []
| "-create-pdf-ua-1"::title::t -> Cpdfua.cpdfua_args title @ expand_recipes t
| "-create-pdf-ua-2"::title::t -> Cpdfua.cpdfua2_args title @ expand_recipes t
| h::t -> h::expand_recipes t
let expand_recipes argv =
Array.of_list (expand_recipes (Array.to_list argv))
let gs_malformed_force fi fo = let gs_malformed_force fi fo =
if args.path_to_ghostscript = "" then begin if args.path_to_ghostscript = "" then begin
Pdfe.log "Please supply path to gs with -gs\n"; Pdfe.log "Please supply path to gs with -gs\n";
@ -4743,8 +4734,6 @@ let go_withargv argv =
if demo then if demo then
flprint "This demo functions normally, but is for evaluation only. https://www.coherentpdf.com/\n"; flprint "This demo functions normally, but is for evaluation only. https://www.coherentpdf.com/\n";
try try
(* Pre-expands recipes like -create-pdf-ua-1 *)
let argv = expand_recipes argv in
(* Pre-expand -args *) (* Pre-expand -args *)
let argv = expand_args argv in let argv = expand_args argv in
(* Split the arguments into sets either side of ANDs *) (* Split the arguments into sets either side of ANDs *)

8
cpdfua.ml
View File

@ -1615,6 +1615,10 @@ let cpdfua_args title =
"AND"; "-set-version"; "7"; "AND"; "-set-version"; "7";
"AND"; "-mark-as"; "PDF/UA-1"] "AND"; "-mark-as"; "PDF/UA-1"]
let create_cpdfua1 title pagesize pages =
let pdf = Cpdfcreate.blank_document_paper pagesize pages in
pdf
let cpdfua2_args title = let cpdfua2_args title =
[ "-create-pdf"; [ "-create-pdf";
"AND"; "-set-title"; title; "AND"; "-set-title"; title;
@ -1625,3 +1629,7 @@ let cpdfua2_args title =
"AND"; "-replace-obj"; "/Root/StructTreeRoot/Type={\"N\":\"/StructTreeRoot\"}"; "AND"; "-replace-obj"; "/Root/StructTreeRoot/Type={\"N\":\"/StructTreeRoot\"}";
"AND"; "-set-version"; "10"; "AND"; "-set-version"; "10";
"AND"; "-mark-as"; "PDF/UA-2"] "AND"; "-mark-as"; "PDF/UA-2"]
let create_cpdfua2 title pagesize pages =
let pdf = Cpdfcreate.blank_document_paper pagesize pages in
pdf

6
cpdfua.mli
View File

@ -30,6 +30,6 @@ val extract_struct_tree : Pdf.t -> Cpdfyojson.Safe.t
(** Reapply an edited JSON structure tree to its PDF. *) (** Reapply an edited JSON structure tree to its PDF. *)
val replace_struct_tree : Pdf.t -> Cpdfyojson.Safe.t -> unit val replace_struct_tree : Pdf.t -> Cpdfyojson.Safe.t -> unit
(** / **) val create_cpdfua1 : string -> Pdfpaper.t -> int -> Pdf.t
val cpdfua_args : string -> string list
val cpdfua2_args : string -> string list val create_cpdfua2 : string -> Pdfpaper.t -> int -> Pdf.t