hexapdf 0.10.0 → 0.11.0

data/lib/hexapdf/type/font_type0.rb

@@ -54,7 +54,7 @@ module HexaPDF
       define_field :Subtype, type: Symbol, required: true, default: :Type0
       define_field :BaseFont, type: Symbol, required: true
       define_field :Encoding, type: [Stream, Symbol], required: true
-      define_field :DescendantFonts, type: Array, required: true
+      define_field :DescendantFonts, type: PDFArray, required: true
 
       # Returns the CID font of this type 0 font.
       def descendant_font

data/lib/hexapdf/type/font_type3.rb

@@ -47,7 +47,7 @@ module HexaPDF
       define_field :Subtype,    type: Symbol, required: true, default: :Type3
       define_field :Name,       type: Symbol
       define_field :FontBBox,   type: Rectangle, required: true
-      define_field :FontMatrix, type: Array, required: true
+      define_field :FontMatrix, type: PDFArray, required: true
       define_field :CharProcs,  type: Dictionary, required: true
       define_field :Resources,  type: Dictionary, version: '1.2'
 

data/lib/hexapdf/type/form.rb

@@ -49,9 +49,9 @@ module HexaPDF
 
       define_field :Type,          type: Symbol,     default: type
       define_field :Subtype,       type: Symbol,     required: true, default: :Form
-      define_field :FormType,      type: Integer,    default: 1
+      define_field :FormType,      type: Integer,    default: 1, allowed_values: 1
       define_field :BBox,          type: Rectangle,  required: true
-      define_field :Matrix,        type: Array
+      define_field :Matrix,        type: PDFArray,   default: [1, 0, 0, 1, 0, 0]
       define_field :Resources,     type: :XXResources, version: '1.2'
       define_field :Group,         type: Dictionary, version: '1.4'
       define_field :Ref,           type: Dictionary, version: '1.4'

data/lib/hexapdf/type/graphics_state_parameter.rb

@@ -35,6 +35,7 @@
 #++
 
 require 'hexapdf/dictionary'
+require 'hexapdf/content/graphics_state'
 
 module HexaPDF
   module Type
@@ -55,23 +56,27 @@ module HexaPDF
       define_field :LC,            type: Integer, version: "1.3"
       define_field :LJ,            type: Integer, version: "1.3"
       define_field :ML,            type: Numeric, version: "1.3"
-      define_field :D,             type: Array, version: "1.3"
-      define_field :RI,            type: Symbol, version: "1.3"
+      define_field :D,             type: PDFArray, version: "1.3"
+      define_field :RI,            type: Symbol, version: "1.3",
+        allowed_values: [HexaPDF::Content::RenderingIntent::ABSOLUTE_COLORIMETRIC,
+                         HexaPDF::Content::RenderingIntent::RELATIVE_COLORIMETRIC,
+                         HexaPDF::Content::RenderingIntent::SATURATION,
+                         HexaPDF::Content::RenderingIntent::PERCEPTUAL]
       define_field :OP,            type: Boolean
       define_field :op,            type: Boolean, version: "1.3"
       define_field :OPM,           type: Integer, version: "1.3"
-      define_field :Font,          type: Array, version: "1.3"
+      define_field :Font,          type: PDFArray, version: "1.3"
       define_field :BG,            type: [Dictionary, Stream]
       define_field :BG2,           type: [Dictionary, Stream, Symbol], version: "1.3"
       define_field :UCR,           type: [Dictionary, Stream]
       define_field :UCR2,          type: [Dictionary, Stream, Symbol], version: "1.3"
-      define_field :TR,            type: [Dictionary, Stream, Array, Symbol]
-      define_field :TR2,           type: [Dictionary, Stream, Array, Symbol], version: "1.3"
+      define_field :TR,            type: [Dictionary, Stream, PDFArray, Symbol]
+      define_field :TR2,           type: [Dictionary, Stream, PDFArray, Symbol], version: "1.3"
       define_field :HT,            type: [Dictionary, Stream, Symbol]
       define_field :FL,            type: Numeric, version: "1.3"
       define_field :SM,            type: Numeric, version: "1.3"
       define_field :SA,            type: Boolean
-      define_field :BM,            type: [Symbol, Array], version: "1.4"
+      define_field :BM,            type: [Symbol, PDFArray], version: "1.4"
       define_field :SMask,         type: [Dictionary, Symbol], version: "1.4"
       define_field :CA,            type: Numeric, version: "1.4"
       define_field :ca,            type: Numeric, version: "1.4"

data/lib/hexapdf/type/icon_fit.rb

@@ -0,0 +1,58 @@
+# -*- encoding: utf-8; frozen_string_literal: true -*-
+#
+#--
+# This file is part of HexaPDF.
+#
+# HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
+# Copyright (C) 2014-2019 Thomas Leitner
+#
+# HexaPDF is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3 as
+# published by the Free Software Foundation with the addition of the
+# following permission added to Section 15 as permitted in Section 7(a):
+# FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
+# THOMAS LEITNER, THOMAS LEITNER DISCLAIMS THE WARRANTY OF NON
+# INFRINGEMENT OF THIRD PARTY RIGHTS.
+#
+# HexaPDF is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with HexaPDF. If not, see <http://www.gnu.org/licenses/>.
+#
+# The interactive user interfaces in modified source and object code
+# versions of HexaPDF must display Appropriate Legal Notices, as required
+# under Section 5 of the GNU Affero General Public License version 3.
+#
+# In accordance with Section 7(b) of the GNU Affero General Public
+# License, a covered work must retain the producer line in every PDF that
+# is created or manipulated using HexaPDF.
+#
+# If the GNU Affero General Public License doesn't fit your need,
+# commercial licenses are available at <https://gettalong.at/hexapdf/>.
+#++
+
+require 'hexapdf/type/annotation'
+
+module HexaPDF
+  module Type
+
+    # An IconFit dictionary specifies how an icon should be displayed inside an annotation
+    # rectangle.
+    #
+    # See: PDF1.7 s12.7.7.3.2
+    class IconFit < Annotation
+
+      define_type :XXIconFit
+
+      define_field :SW, type: Symbol,   default: :A, allowed_values: [:A, :B, :S, :N]
+      define_field :S,  type: Symbol,   default: :P, allowed_values: [:A, :P]
+      define_field :A,  type: PDFArray, default: [0.5, 0.5]
+      define_field :FB, type: Boolean,  default: false, version: '1.5'
+
+    end
+
+  end
+end

data/lib/hexapdf/type/image.rb

@@ -38,6 +38,7 @@ require 'zlib'
 require 'hexapdf/error'
 require 'hexapdf/stream'
 require 'hexapdf/image_loader'
+require 'hexapdf/content/graphics_state'
 
 module HexaPDF
   module Type
@@ -57,16 +58,20 @@ module HexaPDF
       define_field :Subtype,          type: Symbol,          required: true, default: :Image
       define_field :Width,            type: Integer,         required: true
       define_field :Height,           type: Integer,         required: true
-      define_field :ColorSpace,       type: [Symbol, Array]
+      define_field :ColorSpace,       type: [Symbol, PDFArray]
       define_field :BitsPerComponent, type: Integer
-      define_field :Intent,           type: Symbol,          version: '1.1'
+      define_field :Intent,           type: Symbol,          version: '1.1',
+        allowed_values: [HexaPDF::Content::RenderingIntent::ABSOLUTE_COLORIMETRIC,
+                         HexaPDF::Content::RenderingIntent::RELATIVE_COLORIMETRIC,
+                         HexaPDF::Content::RenderingIntent::SATURATION,
+                         HexaPDF::Content::RenderingIntent::PERCEPTUAL]
       define_field :ImageMask,        type: Boolean,         default: false
-      define_field :Mask,             type: [Stream, Array], version: '1.3'
-      define_field :Decode,           type: Array
+      define_field :Mask,             type: [Stream, PDFArray], version: '1.3'
+      define_field :Decode,           type: PDFArray
       define_field :Interpolate,      type: Boolean,         default: false
-      define_field :Alternates,       type: Array,           version: '1.3'
+      define_field :Alternates,       type: PDFArray,        version: '1.3'
       define_field :SMask,            type: Stream,          version: '1.4'
-      define_field :SMaskInData,      type: Integer,         version: '1.5'
+      define_field :SMaskInData,      type: Integer,         version: '1.5', allowed_values: [0, 1, 2]
       define_field :StructParent,     type: Integer,         version: '1.3'
       define_field :ID,               type: PDFByteString,   version: '1.3'
       define_field :OPI,              type: Dictionary,      version: '1.2'
@@ -244,13 +249,14 @@ module HexaPDF
           io << png_chunk('PLTE', palette)
         end
 
-        if self[:Mask].kind_of?(Array) && self[:Mask].each_slice(2).all? {|a, b| a == b } &&
+        if self[:Mask].kind_of?(PDFArray) && self[:Mask].each_slice(2).all? {|a, b| a == b } &&
             (color_type == ImageLoader::PNG::TRUECOLOR || color_type == ImageLoader::PNG::GREYSCALE)
           io << png_chunk('tRNS', self[:Mask].each_slice(2).map {|a, _| a }.pack('n*'))
         end
 
         filter, = *self[:Filter]
-        if filter == :FlateDecode && self[:DecodeParms] && self[:DecodeParms][:Predictor].to_i >= 10
+        decode_parms, = *self[:DecodeParms]
+        if filter == :FlateDecode && decode_parms && decode_parms[:Predictor].to_i >= 10
           data = stream_source
         else
           colors = (color_type == ImageLoader::PNG::INDEXED ? 1 : info.components)

data/lib/hexapdf/type/info.rb

@@ -57,7 +57,8 @@ module HexaPDF
       define_field :Producer,     type: String
       define_field :CreationDate, type: PDFDate
       define_field :ModDate,      type: PDFDate
-      define_field :Trapped,      type: Symbol, version: '1.3'
+      define_field :Trapped,      type: Symbol, version: '1.3',
+        allowed_values: [:True, :False, :Unknown]
 
       # Info dictionaries must always be indirect.
       def must_be_indirect?

data/lib/hexapdf/type/page.rb

@@ -133,14 +133,14 @@ module HexaPDF
       define_field :TrimBox,              type: Rectangle, version: '1.3'
       define_field :ArtBox,               type: Rectangle, version: '1.3'
       define_field :BoxColorInfo,         type: Dictionary, version: '1.4'
-      define_field :Contents,             type: [Stream, Array]
+      define_field :Contents,             type: [Stream, PDFArray]
       define_field :Rotate,               type: Integer, default: 0
       define_field :Group,                type: Dictionary, version: '1.4'
       define_field :Thumb,                type: Stream
-      define_field :B,                    type: Array, version: '1.1'
+      define_field :B,                    type: PDFArray, version: '1.1'
       define_field :Dur,                  type: Numeric, version: '1.1'
       define_field :Trans,                type: Dictionary, version: '1.1'
-      define_field :Annots,               type: Array
+      define_field :Annots,               type: PDFArray
       define_field :AA,                   type: Dictionary, version: '1.2'
       define_field :Metadata,             type: Stream, version: '1.4'
       define_field :PieceInfo,            type: Dictionary, version: '1.3'
@@ -152,7 +152,7 @@ module HexaPDF
       define_field :TemplateInstantiated, type: Symbol, version: '1.5'
       define_field :PresSteps,            type: Dictionary, version: '1.5'
       define_field :UserUnit,             type: Numeric, version: '1.6'
-      define_field :VP,                   type: Array, version: '1.6'
+      define_field :VP,                   type: PDFArray, version: '1.6'
 
       # Returns +true+ since page objects must always be indirect.
       def must_be_indirect?

data/lib/hexapdf/type/page_tree_node.rb

@@ -66,7 +66,7 @@ module HexaPDF
 
       define_field :Type,   type: Symbol, required: true, default: type
       define_field :Parent, type: Dictionary, indirect: true
-      define_field :Kids,   type: Array, required: true, default: []
+      define_field :Kids,   type: PDFArray, required: true, default: []
       define_field :Count,  type: Integer, required: true, default: 0
 
       # Inheritable page fields
@@ -96,7 +96,6 @@ module HexaPDF
         return nil if index < 0 || index >= self[:Count]
 
         self[:Kids].each do |kid|
-          kid = document.deref(kid)
           if kid.type == :Page
             if index == 0
               return kid
@@ -132,7 +131,6 @@ module HexaPDF
           page[:Resources] ||= {}
         else
           self[:Kids].each_with_index do |kid, kid_index|
-            kid = document.deref(kid)
             if index == 0
               self[:Kids].insert(kid_index, page)
               page[:Parent] = self
@@ -177,7 +175,7 @@ module HexaPDF
         return nil unless page && page[:Parent]
 
         parent = page[:Parent]
-        index = parent[:Kids].index {|kid| document.deref(kid).data == page.data }
+        index = parent[:Kids].index {|kid| kid.data == page.data }
 
         if index
           ancestors = [parent]
@@ -203,7 +201,6 @@ module HexaPDF
         return to_enum(__method__) unless block_given?
 
         self[:Kids].each do |kid|
-          kid = document.deref(kid)
           if kid.type == :Page
             yield(kid)
           else
@@ -222,7 +219,7 @@ module HexaPDF
         if box.kind_of?(Symbol)
           box = Page.media_box(box, orientation: config['page.default_media_orientation'])
         end
-        document.add(Type: :Page, MediaBox: box)
+        document.add({Type: :Page, MediaBox: box})
       end
 
       # Ensures that the /Count and /Parent fields of the whole page tree are set up correctly and
@@ -235,7 +232,6 @@ module HexaPDF
         validate_node = lambda do |node|
           count = 0
           node[:Kids].reject! do |kid|
-            kid = document.deref(kid)
             if !kid.kind_of?(HexaPDF::Object) || kid.null? ||
                 (kid.type != :Page && kid.type != :Pages)
               yield("Invalid object in page tree node", true)

data/lib/hexapdf/type/resources.rb

@@ -55,7 +55,7 @@ module HexaPDF
       define_field :Shading, type: Dictionary, version: '1.3'
       define_field :XObject, type: Dictionary
       define_field :Font, type: Dictionary
-      define_field :ProcSet, type: Array
+      define_field :ProcSet, type: PDFArray
       define_field :Properties, type: Dictionary, version: '1.2'
 
       # Returns the color space stored under the given name.

data/lib/hexapdf/type/trailer.rb

@@ -65,12 +65,12 @@ module HexaPDF
       define_field :Root,    type: :Catalog, indirect: true
       define_field :Encrypt, type: Dictionary
       define_field :Info,    type: :XXInfo, indirect: true
-      define_field :ID,      type: Array
+      define_field :ID,      type: PDFArray
       define_field :XRefStm, type: Integer, version: '1.5'
 
       # Returns the document's Catalog (see Type::Catalog), creating it if needed.
       def catalog
-        self[:Root] ||= document.add(Type: :Catalog)
+        self[:Root] ||= document.add({Type: :Catalog})
       end
 
       # Returns the document's information dictionary (see Type::Info), creating it if needed.
@@ -88,7 +88,7 @@ module HexaPDF
       # Updates the second part of the /ID field (the first part should always be the same for a
       # PDF file, the second part should change with each write).
       def update_id
-        if !value[:ID].kind_of?(Array)
+        if !self[:ID].kind_of?(PDFArray)
           set_random_id
         else
           value[:ID][1] = Digest::MD5.digest(rand.to_s)
@@ -112,7 +112,7 @@ module HexaPDF
 
         unless value[:Root]
           yield("A PDF document must have a Catalog dictionary", true)
-          value[:Root] = document.add(Type: :Catalog)
+          value[:Root] = document.add({Type: :Catalog})
           value[:Root].validate {|message, correctable| yield(message, correctable) }
         end
 

data/lib/hexapdf/type/viewer_preferences.rb

@@ -55,16 +55,19 @@ module HexaPDF
       define_field :FitWindow,             type: Boolean, default: false
       define_field :CenterWindow,          type: Boolean, default: false
       define_field :DisplayDocTitle,       type: Boolean, default: false, version: '1.4'
-      define_field :NonFullScreenPageMode, type: Symbol,  default: :UseNone
-      define_field :Direction,             type: Symbol,  default: :L2R, version: '1.3'
+      define_field :NonFullScreenPageMode, type: Symbol,  default: :UseNone,
+        allowed_values: [:UseNone, :UseOutlines, :UseThumbs, :UseOC]
+      define_field :Direction,             type: Symbol,  default: :L2R, version: '1.3',
+        allowed_values: [:L2R, :R2L]
       define_field :ViewArea,              type: Symbol,  default: :CropBox, version: '1.4'
       define_field :ViewClip,              type: Symbol,  default: :CropBox, version: '1.4'
       define_field :PrintArea,             type: Symbol,  default: :CropBox, version: '1.4'
       define_field :PrintClip,             type: Symbol,  default: :CropBox, version: '1.4'
       define_field :PrintScaling,          type: Symbol,  default: :AppDefault, version: '1.6'
-      define_field :Duplex,                type: Symbol,  version: '1.7'
+      define_field :Duplex,                type: Symbol,  version: '1.7',
+        allowed_values: [:Simplex, :DuplexFlipShortEdge, :DuplexFlipLongEdge]
       define_field :PickTrayByPDFSize,     type: Boolean, version: '1.7'
-      define_field :PrintPageRange,        type: Array,   version: '1.7'
+      define_field :PrintPageRange,        type: PDFArray, version: '1.7'
       define_field :NumCopies,             type: Integer, version: '1.7'
 
     end

data/lib/hexapdf/type/xref_stream.rb

@@ -74,10 +74,10 @@ module HexaPDF
                            version: '1.5'
       # Size is not required because it will be auto-filled before the object is written
       define_field :Size,  type: Integer, indirect: false
-      define_field :Index, type: Array, indirect: false
+      define_field :Index, type: PDFArray, indirect: false
       define_field :Prev,  type: Integer, indirect: false
       # W is not required because it will be auto-filled on #update_with_xref_section_and_trailer
-      define_field :W,     type: Array, indirect: false
+      define_field :W,     type: PDFArray, indirect: false
 
       # Returns an XRefSection that represents the content of this cross-reference stream.
       #

data/lib/hexapdf/utils/sorted_tree_node.rb

@@ -201,7 +201,7 @@ module HexaPDF
               index += 2
             end
           elsif node.key?(:Kids)
-            stack.concat(node[:Kids].reverse)
+            stack.concat(node[:Kids].reverse_each.to_a)
           end
         end
 

data/lib/hexapdf/version.rb

@@ -37,6 +37,6 @@
 module HexaPDF
 
   # The version of HexaPDF.
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 
 end

data/man/man1/hexapdf.1

@@ -15,23 +15,27 @@ Using the hexapdf application the following tasks can be performed with PDF file
 .sp
 .PD 0
 .IP \(bu 4
-Extracting embedded files (see the \fBfiles\fP command)
+Modifying an existing PDF file (see the \fBmodify\fP command)
 .IP \(bu 4
-Extracting images (see the \fBimages\fP command)
+Merging multiple PDF files into one (see the \fBmerge\fP command)
 .IP \(bu 4
-Showing general information of a PDF file (see the \fBinfo\fP command)
+Splitting a PDF file into individual pages (see the \fBsplit\fP command)
 .IP \(bu 4
-Inspecting the internal structure of a PDF file (see the \fBinspect\fP command)
+Optimizing the file size of a PDF file (see the \fBoptimize\fP command)
 .IP \(bu 4
-Merging multiple PDF files into one (see the \fBmerge\fP command)
+Watermarking/Stamping a PDF onto another one (see the \fBwatermark\fP command)
 .IP \(bu 4
-Modifying an existing PDF file (see the \fBmodify\fP command)
+Extracting embedded files (see the \fBfiles\fP command)
 .IP \(bu 4
-Optimizing the file size of a PDF file (see the \fBoptimize\fP command)
+Extracting images (see the \fBimages\fP command)
 .IP \(bu 4
-Splitting a PDF file into individual pages (see the \fBsplit\fP command)
+Converting images to PDF (see the \fBimage2pdf\fP command)
+.IP \(bu 4
+Showing general information of a PDF file (see the \fBinfo\fP command)
 .IP \(bu 4
 Batch execution of a command on multiple PDF files (see the \fBbatch\fP command)
+.IP \(bu 4
+Inspecting the internal structure of a PDF file (see the \fBinspect\fP command)
 .PD
 .P
 The application contains a built\-in \fBhelp\fP command that can be used to provide a quick reminder of a command\[u2019]s purpose and its options\.
@@ -247,6 +251,34 @@ The image type\. Either jpg (JPEG), jp2 (JPEG2000), ccitt (CCITT Group 3 or 4 Fa
 \fBwritable\fP
 Either true or false depending on whether hexapdf supports the image format\.
 .RE
+.SS "image2pdf"
+Synopsis: \fBiamge2pdf\fP [\fBOPTIONS\fP] \fIOUTPUT\fP [\fIIMAGES\fP\.\.\.]
+.P
+This command converts one or more images into a single PDF file, one image per page\. The various options allow setting a page size, scaling the images and defining margins\. Images are always centered on the pages\.
+.P
+Supported image formats are JPEG, PNG and PDF\. Images in PNG format may take longer to process due to the way they are stored inside a PDF\.
+.TP
+\fB\-p\fP \fIPAGE_SIZE\fP, \fB\-\-page\-size\fP \fIPAGE_SIZE\fP
+The PDF page size\. The default value of \fIauto\fP chooses the page size based on the image dimensions\. Either \fIauto\fP which chooses a size based on the image size or a valid page size like \fIA4\fP, \fIA4\-landscape\fP or \fI595x842\fP\&\. The \fI\-landscape\fP suffix can be added to any predefined page size\.
+.RS
+.P
+Common page sizes are \fIA4\fP, \fIA5\fP, \fIA3\fP, \fILetter\fP and \fILegal\fP\&\.
+.RE
+.TP
+\fB\-\-[no\-]auto\-rotate\fP
+If enabled (the default) pages are automatically rotated so that the pages and images always have the same orientation\. I\.e\. landscape\-oriented images go on landscape page, portrait\-oriented images on portrait pages\.
+.RS
+.P
+Note that pages won\[u2019]t be rotated if scaling is used and the image would fit into the requested page size\.
+.RE
+.TP
+\fB\-s\fP \fISCALE\fP, \fB\-\-scale\fP \fISCALE\fP
+Defines how the images should be scaled\. The default value of \fIfit\fP scales the images so that they optimally fit the pages\. Otherwise \fISCALE\fP is interpreted as the minimum number of pixels per inch (PPI) that the images should have\.
+.TP
+\fB\-m\fP \fIMARGINS\fP, \fB\-\-margins\fP \fIMARGINS\fP
+Defines the margins around the images\. The argument \fIMARGINS\fP can either be a single number specifying the margin on all four sides, or four numbers separated by commas (like \fB10,20,30,40\fP) specifying the top, right, bottom and left margins\. Default: \fI0\fP\&\.
+.P
+Additionally, the \fBOptimization Options\fP and \fBEncryption Options\fP can be used\.
 .SS "info"
 Synopsis: \fBinfo\fP [\fBOPTIONS\fP] \fIFILE\fP
 .P
@@ -395,6 +427,31 @@ If no \fIOUTPUT_SPEC\fP is given, files of the form \fIINPUT_0001\.pdf\fP, \fIIN
 The password to decrypt the \fIINPUT\fP\&\. Use \fB\-\fP for \fIPASSWORD\fP for reading it from standard input\.
 .P
 Additionally, the \fBOptimization Options\fP and \fBEncryption Options\fP can be used\.
+.SS "watermark"
+Synopsis: \fBwatermark\fP [\fBOPTIONS\fP] \fIINPUT\fP \fIOUTPUT\fP
+.P
+This command uses one ore more pages from a PDF file and applies them as background or stamp (depending on the \fB\-\-type\fP option) on another PDF file\. If multiple pages are selected from the watermark PDF, the \fB\-\-repeat\fP option can be used to specify how they should be applied\.
+.TP
+\fB\-w\fP \fIWATERMARK\fP, \fB\-\-watermark\-file\fP \fIWATERMARK\fP
+The PDF file that should be used for watermarking\.
+.TP
+\fB\-i\fP \fIPAGES\fP, \fB\-\-pages\fP \fIPAGES\fP
+The pages from the \fIWATERMARK\fP PDF that should be used\. The first \fIWATERMARK\fP page is applied to the first \fIINPUT\fP page, the second \fIWATERMARK\fP page to the second \fIINPUT\fP page and so on\. If there are fewer \fIWATERMARK\fP pages than \fIINPUT\fP pages, the \fB\-\-repeat\fP option comes into play\.
+.RS
+.P
+See the \fBPAGES SPECIFICATION\fP below for details on the allowed format of \fIPAGES\fP\&\. Default: \fI1\fP\&\.
+.RE
+.TP
+\fB\-r\fP \fIREPEAT_MODE\fP, \fB\-\-repeat\fP \fIREPEAT_MODE\fP
+Specifies how the \fIWATERMARK\fP pages should be repeated: \fBlast\fP (the default) will only repeat the last \fIWATERMARK\fP page whereas \fBall\fP will cyclically repeat all \fIWATERMARK\fP pages\.
+.TP
+\fB\-t\fP \fIWATERMARK_TYPE\fP, \fB\-\-type\fP \fIWATERMARK_TYPE\fP
+Specifies how the \fIWATERMARK\fP pages are applied to the \fIINPUT\fP pages: \fBbackground\fP (the default) applies them below the page contents and \fBstamp\fP applies them above the page contents\.
+.TP
+\fB\-p\fP \fIPASSWORD\fP, \fB\-\-password\fP \fIPASSWORD\fP
+The password to decrypt the \fIINPUT\fP\&\. Use \fB\-\fP for \fIPASSWORD\fP for reading it from standard input\.
+.P
+Additionally, the \fBOptimization Options\fP and \fBEncryption Options\fP can be used\.
 .SS "version"
 This command shows the version of the hexapdf application\. It is an alternative to using the global \fB\-\-version\fP option\.
 .SH "PAGES SPECIFICATION"
@@ -475,6 +532,14 @@ Optimization: Compress the \fBinput\.pdf\fP to get a smaller file size\.
 \fBhexapdf split input\.pdf out_%02d\.pdf\fP
 .P
 Split the \fBinput\.pdf\fP into individual pages, naming the output files \fBout_01\.pdf\fP, \fBout_02\.pdf\fP, and so on\.
+.SS "watermark"
+\fBhexapdf watermark \-w watermark\.pdf \-t stamp input\.pdf output\.pdf\fP
+.P
+Applies the first page of the \fBwatermark\.pdf\fP as stamp on \fBinput\.pdf\fP\&\.
+.P
+\fBhexapdf watermark \-w watermark\.pdf \-i 2\-5 \-r all input\.pdf output\.pdf\fP
+.P
+Cyclically applies the pages 2 to 5 of the \fBwatermark\.pdf\fP as background on \fBinput\.pdf\fP\&\.
 .SS "files"
 \fBhexapdf files input\.pdf\fP
 .br
@@ -487,6 +552,10 @@ Embedded files: The first command lists the embedded files in the \fBinput\.pdf\
 \fBhexapdf images input\.pdf \-e \-\-prefix images/image\fP
 .P
 Image info and extraction: The first command lists the images of the \fBinput\.pdf\fP, the second one then extracts the images into the subdirectory \fBimages\fP with the prefix \fBimage\fP\&\.
+.SS "image2pdf"
+\fBhexapdf image2pdf output\.pdf image1\.jpg image2\.pdf image3\.png\fP
+.P
+Create a PDF file \fBoutput\.pdf\fP containing three pages with one image per page and the image fitted to the page\.
 .SS "info"
 \fBhexapdf info input\.pdf\fP
 .P