more

Changes

@@ -7,8 +7,8 @@ o Embed TrueType fonts with -font-ttf for -add-text et al.
 o Embed the 14 standard fonts if requested
 o Add links to parts of text with -add-text as %URL[|].
 o Convert JPEGs and PNGs to PDFs with -jpeg and -png
-o Export fully, import, and thereby round-trip annotations via JSON
-o Show composition of PDF with -composition and -composition-json
+o Export, import, and thereby round-trip annotations via JSON
+o Show composition of PDF with -composition[-json]
 o Use page labels like <iii> and <A-2> in page specifications
 
 Extended features:

cpdfcommand.ml

@@ -2954,13 +2954,13 @@ and specs =
    ("-msheary", Arg.String setmshearx, " Shear the graphics matrix in Y");
    ("-xobj-bbox", Arg.String xobjbbox, " Specify the bounding box for xobjects");
    ("-xobj", Arg.String startxobj, " Begin saving a sequence of graphics operators");
-   ("-endxobj", Arg.Unit endxobj, " End saving a sequence of graphics operators");
+   ("-end-xobj", Arg.Unit endxobj, " End saving a sequence of graphics operators");
    ("-use", Arg.String usexobj, " Use a saved sequence of graphics operators");
    ("-draw-jpeg", Arg.String addjpeg, " Load a JPEG from file and name it");
    ("-draw-png", Arg.String addpng, " Load a PNG from file and name it");
    ("-image", Arg.String addimage, " Draw an image which has already been loaded");
-   ("-opacity", Arg.Float addopacity, " Set opacity");
-   ("-sopacity", Arg.Float addsopacity, " Set stroke opacity");
+   ("-fill-opacity", Arg.Float addopacity, " Set opacity");
+   ("-stroke-opacity", Arg.Float addsopacity, " Set stroke opacity");
    ("-bt", Arg.Unit addbt, " Begin text");
    ("-et", Arg.Unit addet, " End text");
    ("-text", Arg.String addtext, " Draw text ");

cpdfdraw.ml

@@ -6,9 +6,6 @@ type colspec =
  | Grey of float
  | CYMK of float * float * float * float
 
-type image =
-  JPEG
-
 type drawops =
   | Rect of float * float * float * float
   | Bezier of float * float * float * float * float * float
@@ -196,7 +193,12 @@ let read_resource pdf n p =
   | Some (Pdf.Dictionary d) -> d
   | _ -> []
 
+(* FIXME *)
+let minimum_resource_number pdf range =
+  100
+
 let draw_single ~filename ~bates ~batespad fast range pdf drawops =
+  res.num <- minimum_resource_number pdf range;
   let endpage = Pdfpage.endpage pdf in
   let pages = Pdfpage.pages_of_pagetree pdf in
   let ss =

cpdfdraw.mli

@@ -4,9 +4,6 @@ type colspec =
  | Grey of float
  | CYMK of float * float * float * float
 
-type image =
-  JPEG
-
 type drawops =
   | Rect of float * float * float * float
   | Bezier of float * float * float * float * float * float