From ad5a235c61b9711d0916371e14fb9a53a65c9445 Mon Sep 17 00:00:00 2001
From: John Whitington <john@coherentgraphics.co.uk>
Date: Sun, 5 Dec 2021 16:25:50 -0800
Subject: [PATCH] more

---
 cpdfcommand.ml | 38 ++++++++++++++++++++++++++++++--------
 cpdfmanual.tex |  2 +-
 cpdftype.ml    |  3 ++-
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/cpdfcommand.ml b/cpdfcommand.ml
index 35bd400..ed9eda6 100644
--- a/cpdfcommand.ml
+++ b/cpdfcommand.ml
@@ -2971,12 +2971,17 @@ let typeset_table_of_contents ~font pdf =
   let f = (Pdftext.StandardFont (font, Pdftext.WinAnsiEncoding), args.fontsize) in
   let big = (Pdftext.StandardFont (font, Pdftext.WinAnsiEncoding), args.fontsize *. 2.) in
   let firstpage = hd (Pdfpage.pages_of_pagetree pdf) in
-  let firstpage_papersize =
-    let width, height =
+  let firstpage_papersize, pmaxx, pmaxy =
+    let width, height, xmax, ymax =
       match Pdf.parse_rectangle firstpage.Pdfpage.mediabox with
-        xmin, ymin, xmax, ymax -> (xmax -. xmin, ymax -. ymin)
+        xmin, ymin, xmax, ymax -> xmax -. xmin, ymax -. ymin, xmax, ymax
     in
-      Pdfpaper.make Pdfunits.PdfPoint width height
+      Pdfpaper.make Pdfunits.PdfPoint width height, xmax, ymax
+  in
+  let firstpage_cropbox =
+    match Pdf.lookup_direct pdf "/CropBox" firstpage.Pdfpage.rest with
+    | Some r -> Some (Pdf.parse_rectangle r)
+    | None -> None
   in
   let labels = Pdfpagelabels.read pdf in
   let lines =
@@ -3004,10 +3009,27 @@ let typeset_table_of_contents ~font pdf =
           (fun l -> [Cpdftype.Text l; Cpdftype.NewLine])
           (split_toc_title [] (explode args.toc_title)))
     in
-    Cpdftype.typeset 50. 50. 50. 50. firstpage_papersize pdf
-      ([Cpdftype.Font big] @ title @
-        [Cpdftype.VGlue {glen = args.fontsize *. 2.; gstretch = 0.};
-         Cpdftype.Font f] @ flatten lines)
+    let lm, rm, tm, bm =
+      match firstpage_cropbox with
+      | None -> (50., 50., 50., 50.)
+      | Some (cminx, cminy, cmaxx, cmaxy) ->
+          (cminx +. 50., (pmaxx -. cmaxx) +. 50., cminy +. 50., (pmaxy -. cmaxy) +. 50.)
+    in
+      Cpdftype.typeset lm rm tm bm firstpage_papersize pdf
+        ([Cpdftype.Font big] @ title @
+          [Cpdftype.VGlue {glen = args.fontsize *. 2.; gstretch = 0.};
+           Cpdftype.Font f] @ flatten lines)
+  in
+  let toc_pages =
+    match firstpage_cropbox with
+    | Some (a, b, c, d) ->
+        let rect =
+          Pdf.Array [Pdf.Real a; Pdf.Real b; Pdf.Real c; Pdf.Real d]
+        in
+          map
+            (fun p -> {p with Pdfpage.rest = Pdf.add_dict_entry p.Pdfpage.rest "/CropBox" rect})
+            toc_pages
+    | None -> toc_pages
   in
   let original_pages = Pdfpage.pages_of_pagetree pdf in
   let toc_pages_len = length toc_pages in
diff --git a/cpdfmanual.tex b/cpdfmanual.tex
index a76f165..9a60e33 100644
--- a/cpdfmanual.tex
+++ b/cpdfmanual.tex
@@ -9,7 +9,7 @@
 %Document -print-font-table
 %Document NOT and DUP page ranges
 %Document new colourspaces for -add-text -add-rectangle
-%Document -table-of-contents, -table-of-contents-title (inc. newlines), -font
+%Document -table-of-contents, -table-of-contents-title (inc. newlines), -font. Mention -upright.
 %Document -typeset
 \documentclass{book}
 % Edit here to produce cpdfmanual.pdf, cpdflibmanual.pdf, pycpdfmanual.pdf etc.
diff --git a/cpdftype.ml b/cpdftype.ml
index 48e7963..5eec7dd 100644
--- a/cpdftype.ml
+++ b/cpdftype.ml
@@ -139,7 +139,7 @@ let paginate tmargin bmargin papersize i =
   let o = ref [] in
   let s = initial_state () in
   s.ypos <- tmargin;
-  let max_ypos = height -. tmargin -. bmargin in
+  let max_ypos = height -. bmargin in
   let rec process = function
    | VGlue {glen} as glue ->
        s.ypos <- s.ypos +. glen;
@@ -174,6 +174,7 @@ let make_annotations annots =
    dictionaries. New page only
    creates a page when that page has content. *)
 let typeset lmargin rmargin tmargin bmargin papersize pdf i =
+  Printf.printf "l = %f, r = %f, b = %f, t = %f\n" lmargin rmargin tmargin bmargin;
   let debug = false in
   if debug then (print_endline "***input:\n\n"; print_endline (to_string i));
   let i = layout lmargin rmargin papersize i in