From 52caf8eced7d7b81e5d241a520a0711367e882a5 Mon Sep 17 00:00:00 2001
From: John Whitington <john@coherentgraphics.co.uk>
Date: Mon, 30 Sep 2024 13:01:31 +0100
Subject: [PATCH] Remove -create-pdf-ua kludges

---
 cpdfcommand.ml | 15 ++-------------
 cpdfua.ml      |  8 ++++++++
 cpdfua.mli     |  6 +++---
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/cpdfcommand.ml b/cpdfcommand.ml
index c1f16a4..1933387 100644
--- a/cpdfcommand.ml
+++ b/cpdfcommand.ml
@@ -2667,10 +2667,10 @@ let specs =
     Arg.Unit (setop CreatePDF),
     " Create a new PDF");
    ("-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-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-pdf-pages",
     Arg.Int setcreatepdfpages,
@@ -4694,15 +4694,6 @@ let expand_args argv =
   let l = Array.to_list argv in
     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 =
   if args.path_to_ghostscript = "" then begin
     Pdfe.log "Please supply path to gs with -gs\n";
@@ -4743,8 +4734,6 @@ let go_withargv argv =
   if demo then
     flprint "This demo functions normally, but is for evaluation only. https://www.coherentpdf.com/\n";
   try
-    (* Pre-expands recipes like -create-pdf-ua-1 *)
-    let argv = expand_recipes argv in
     (* Pre-expand -args *)
     let argv = expand_args argv in
     (* Split the arguments into sets either side of ANDs *)
diff --git a/cpdfua.ml b/cpdfua.ml
index 0dff577..a285fcf 100644
--- a/cpdfua.ml
+++ b/cpdfua.ml
@@ -1615,6 +1615,10 @@ let cpdfua_args title =
    "AND"; "-set-version"; "7";
    "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 =
   [       "-create-pdf";
    "AND"; "-set-title"; title;
@@ -1625,3 +1629,7 @@ let cpdfua2_args title =
    "AND"; "-replace-obj"; "/Root/StructTreeRoot/Type={\"N\":\"/StructTreeRoot\"}";
    "AND"; "-set-version"; "10";
    "AND"; "-mark-as"; "PDF/UA-2"]
+
+let create_cpdfua2 title pagesize pages =
+  let pdf = Cpdfcreate.blank_document_paper pagesize pages in
+    pdf
diff --git a/cpdfua.mli b/cpdfua.mli
index 623c094..3a4c758 100644
--- a/cpdfua.mli
+++ b/cpdfua.mli
@@ -30,6 +30,6 @@ val extract_struct_tree : Pdf.t -> Cpdfyojson.Safe.t
 (** Reapply an edited JSON structure tree to its PDF. *)
 val replace_struct_tree : Pdf.t -> Cpdfyojson.Safe.t -> unit
 
-(** / **)
-val cpdfua_args : string -> string list
-val cpdfua2_args : string -> string list
+val create_cpdfua1 : string -> Pdfpaper.t -> int -> Pdf.t
+
+val create_cpdfua2 : string -> Pdfpaper.t -> int -> Pdf.t