From 060fbd0c83132e5f8d02f0745d7f1f5d27b1bfab Mon Sep 17 00:00:00 2001
From: John Whitington <john@coherentgraphics.co.uk>
Date: Mon, 20 Feb 2023 19:39:42 +0000
Subject: [PATCH] more

---
 cpdfannot.ml   | 7 +++----
 cpdfcommand.ml | 5 +++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cpdfannot.ml b/cpdfannot.ml
index d6227f6..8f467fc 100644
--- a/cpdfannot.ml
+++ b/cpdfannot.ml
@@ -98,14 +98,13 @@ let postprocess_json_pdf objnum_to_serial_map pdf obj =
             | Some s -> Pdf.add_dict_entry obj "/Parent" (Pdf.Integer s)
             | None -> Printf.eprintf "Warning: Cpdfannot.process_extra_object: could not find serial number\n"; obj
             end
-        | _ -> () 
-            (*(* If not a popup annotation, remove /Parent. It drags in lots of
+        | _ ->
+            (* If not a popup annotation, remove /Parent. It drags in lots of
                extra objects (the whole page tree!) with a widget
                annotation, and we are unlikely to be able to round-trip them
                anyway. One day, if we can match FDF properly, it might be
                possible, but not now. *)
-            Pdf.remove_dict_entry obj "/Parent"*)
-            
+            Pdf.remove_dict_entry obj "/Parent"
         end
       in
         begin match obj with
diff --git a/cpdfcommand.ml b/cpdfcommand.ml
index fa0c8a2..2a29830 100644
--- a/cpdfcommand.ml
+++ b/cpdfcommand.ml
@@ -3392,8 +3392,13 @@ let embed_font () =
   | FontToEmbed fontfile ->
       EmbedInfo {fontfile; fontname = args.fontname; encoding = args.fontencoding}
 
+let check_bookmarks_mistake () =
+  if args.merge_add_bookmarks_use_titles && not args.merge_add_bookmarks then
+    Printf.eprintf "Warning: -merge-add-bookmarks-use-titles is for use with -merge-add-bookmarks\n"
+
 (* Main function *)
 let go () =
+  check_bookmarks_mistake ();
   match args.op with
   | Some Version ->
       flprint