From de114111f8b14881286218d3e318b46b37cbb386 Mon Sep 17 00:00:00 2001
From: John Whitington <john@coherentgraphics.co.uk>
Date: Wed, 19 Mar 2025 16:28:06 +0000
Subject: [PATCH] Plumb subformat through to -table-of-contents

---
 cpdfcommand.ml | 6 +++---
 cpdftoc.ml     | 2 +-
 cpdftoc.mli    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cpdfcommand.ml b/cpdfcommand.ml
index 508917f..f2770b6 100644
--- a/cpdfcommand.ml
+++ b/cpdfcommand.ml
@@ -1,10 +1,10 @@
 (* cpdf command line tools *)
 let demo = false
-let agpl = false
+let agpl = true
 let major_version = 2
 let minor_version = 8
 let minor_minor_version = 1
-let version_date = "(devel, 19th December 2024)"
+let version_date = "(devel, 19th March 2025)"
 
 open Pdfutil
 open Pdfio
@@ -4799,7 +4799,7 @@ let go () =
       let pdf =
         Cpdftoc.typeset_table_of_contents
           ~font:cpdffont ~fontsize:args.fontsize ~title:args.toc_title
-          ~bookmark:args.toc_bookmark ~dotleader:args.dot_leader ~process_struct_tree:args.process_struct_trees pdf
+          ~bookmark:args.toc_bookmark ~dotleader:args.dot_leader ~process_struct_tree:args.process_struct_trees ?subformat:args.subformat pdf
       in
         write_pdf false pdf
   | Some (Typeset filename) ->
diff --git a/cpdftoc.ml b/cpdftoc.ml
index 80c2be1..fc0211f 100644
--- a/cpdftoc.ml
+++ b/cpdftoc.ml
@@ -167,7 +167,7 @@ let ensure_minimal_struct_tree pdf =
 (* TODO Fix Cpdftype to take a box not a papersize/margins combo. Then we can remove all the CropBox/Mediabox complications here.
    Then copying the boxes directly from the first page of the document is ok, and we just prefer the cropbox. Failing file
    __PDFUA/decomp/08.pdf *)
-let typeset_table_of_contents ~font ~fontsize ~title ~bookmark ~dotleader ~process_struct_tree pdf =
+let typeset_table_of_contents ~font ~fontsize ~title ~bookmark ~dotleader ~process_struct_tree ?subformat pdf =
   let optional l = if process_struct_tree then l else [] in
   if process_struct_tree then ensure_minimal_struct_tree pdf;
   Hashtbl.clear width_table_cache;
diff --git a/cpdftoc.mli b/cpdftoc.mli
index 6ff4ecd..2c4d295 100644
--- a/cpdftoc.mli
+++ b/cpdftoc.mli
@@ -1,4 +1,4 @@
 (** Table of contents *)
 
 (** Typeset a table of contents and prepend to the document. *)
-val typeset_table_of_contents : font:Cpdfembed.cpdffont -> fontsize:float -> title:string -> bookmark:bool -> dotleader:bool -> process_struct_tree:bool -> Pdf.t -> Pdf.t
+val typeset_table_of_contents : font:Cpdfembed.cpdffont -> fontsize:float -> title:string -> bookmark:bool -> dotleader:bool -> process_struct_tree:bool -> ?subformat:Cpdfua.subformat -> Pdf.t -> Pdf.t