hexapdf 0.47.0 → 1.0.1

data/lib/hexapdf/task/merge_acro_form.rb

@@ -0,0 +1,164 @@
+# -*- 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-2024 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/serializer'
+
+module HexaPDF
+  module Task
+
+    # Task for merging an AcroForm from one PDF into another.
+    #
+    # It takes care of
+    #
+    # * adding the fields to the main Type::AcroForm::Form dictionary,
+    # * adjusting the field names so that they are unique,
+    # * and merging the properties of the main AcroForm dictionary itself and adjusting field
+    #   information appropriately.
+    #
+    # Note that the pages with the fields need to be imported already.
+    #
+    # The steps for using this task are:
+    #
+    # 1. Import the pages into the target document and add all imported pages to an array
+    # 2. Call this task using the created array of pages.
+    #
+    # Example:
+    #
+    #   pages = doc.pages.map {|page| target.pages.add(target.import(page)) }
+    #   target.task(:merge_acro_form, source: doc, pages: pages)
+    module MergeAcroForm
+
+      # Performs the necessary steps to merge the AcroForm fields from the +source+ into the target
+      # document +doc+.
+      #
+      # +source+::
+      #     Specifies the source PDF document the information from which should be merged into the
+      #     target document.
+      #
+      # +pages+::
+      #     An array of pages that were imported from +source+ and contain the widgets of the fields
+      #     that should be merged.
+      def self.call(doc, source:, pages:)
+        return unless source.acro_form
+
+        acro_form = doc.acro_form(create: true)
+
+        # Determine a unique name for root field and create root field
+        import_name = 'merged_' +
+                      (acro_form.root_fields.select {|field| field[:T] =~ /\Amerged_\d+\z/ }.
+                        map {|field| field[:T][/\d+/].to_i }.sort.last || 0).succ.to_s
+        root_field = doc.add({T: import_name, Kids: []})
+        acro_form.root_fields << root_field
+
+        # Merge the main AcroForm dictionary
+        font_name_mapping = merge_form_dictionary(acro_form, source.acro_form, root_field)
+        font_name_re = font_name_mapping.keys.map {|name| Regexp.escape(name) }.join('|')
+        root_field[:DA] && root_field[:DA].sub!(font_name_re, font_name_mapping)
+
+        # Process all field widgets of the given pages
+        process_calculate_actions = false
+        signature_field_seen = false
+        pages.each do |page|
+          page.each_annotation do |widget|
+            next unless widget[:Subtype] == :Widget
+            field = widget.form_field
+
+            # Correct the font name in the default appearance string
+            widget[:DA] && widget[:DA].sub!(font_name_re, font_name_mapping)
+            field[:DA] && field[:DA].sub!(font_name_re, font_name_mapping)
+
+            process_calculate_actions = true if field[:AA]&.[](:C)
+            signature_field_seen = true if field.field_type == :Sig
+
+            # Add to the root field
+            field = field[:Parent] while field[:Parent]
+            if field != root_field
+              field[:Parent] = root_field
+              root_field[:Kids] << field
+            end
+          end
+        end
+
+        # Update calculation JavaScript actions with changed field names
+        fix_calculate_actions(acro_form, source.acro_form, import_name) if process_calculate_actions
+
+        # Update signature flags if necessary
+        if signature_field_seen && source.acro_form.signature_flag?(:signatures_exist)
+          acro_form.signature_flag(:signatures_exist)
+        end
+      end
+
+      # Merges the AcroForm +source_form+ into the +target_form+ and returns a mapping of old font
+      # names to new ones.
+      def self.merge_form_dictionary(target_form, source_form, root_field)
+        target_resources = target_form.default_resources
+        font_name_mapping = {}
+        serializer = HexaPDF::Serializer.new
+
+        source_form.default_resources[:Font].each do |font_name, value|
+          new_name = target_resources.add_font(target_form.document.import(value))
+          font_name_mapping[serializer.serialize(font_name)] = serializer.serialize(new_name)
+        end
+
+        root_field[:DA] = target_form.document.import(source_form[:DA])
+        root_field[:Q] = target_form.document.import(source_form[:Q])
+
+        font_name_mapping
+      end
+
+      # Fixes the calculate actions listed in the /CO entry of the main AcroForm dictionary to use
+      # the new names of the fields.
+      def self.fix_calculate_actions(acro_form, source_form, import_name)
+        if source_form[:CO]
+          acro_form[:CO] ||= []
+          acro_form[:CO].value.concat(acro_form.document.import(source_form[:CO]).value)
+          acro_form[:CO].each do |field|
+            next unless (action = field[:AA]&.[](:C))
+            action[:JS].gsub!(/"(.*?)"/) do |match|
+              if source_form.field_by_name($1)
+                "\"#{import_name}.#{$1}\""
+              else
+                match
+              end
+            end
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/hexapdf/task.rb

@@ -65,6 +65,7 @@ module HexaPDF
     autoload(:Optimize, 'hexapdf/task/optimize')
     autoload(:Dereference, 'hexapdf/task/dereference')
     autoload(:PDFA, 'hexapdf/task/pdfa')
+    autoload(:MergeAcroForm, 'hexapdf/task/merge_acro_form')
 
   end
 

data/lib/hexapdf/tokenizer.rb

@@ -144,6 +144,8 @@ module HexaPDF
       elsif byte == 93 # ]
         @ss.pos += 1
         TOKEN_ARRAY_END
+      elsif byte == 41 # )
+        raise HexaPDF::MalformedPDFError.new("Delimiter ')' found at invalid position", pos: pos)
       elsif byte == 123 || byte == 125 # { }
         Token.new(@ss.get_byte)
       elsif byte == 37 # %

data/lib/hexapdf/type/acro_form/form.rb

@@ -81,6 +81,7 @@ module HexaPDF
         define_field :CO,              type: PDFArray, version: '1.3'
         define_field :DR,              type: :XXResources
         define_field :DA,              type: String
+        define_field :Q,               type: Integer
         define_field :XFA,             type: [Stream, PDFArray], version: '1.5'
 
         bit_field(:signature_flags, {signatures_exist: 0, append_only: 1},
@@ -182,29 +183,18 @@ module HexaPDF
         # The optional keyword arguments allow setting often used properties of the field:
         #
         # +font+::
-        #     The font that should be used for the text of the field. If +font_size+, +font_options+
-        #     or +font_color+ is specified but +font+ isn't, the font Helvetica is used.
-        #
-        #     If no font is set on the text field, the default font properties of the AcroForm form
-        #     are used. Note that field specific or form specific font properties have to be
-        #     set. Otherwise there might be problems when creating a visual appearance with other
-        #     PDF libraries/viewers.
-        #
-        #     If HexaPDF is used to create a visual appearance of the field value and neither field
-        #     specific nor form specific font properties are available, the configuration option
-        #     'acro_form.fallback_default_appearance' defines whether and which field specific font
-        #     properties are set and used.
+        #     The font that should be used for the text of the field. If not specified, it
+        #     defaults to Helvetica.
         #
         # +font_options+::
-        #     A hash with font options like :variant that should be used.
+        #     A hash with font options like :variant that should be used. If not specified, it
+        #     defaults to the empty hash.
         #
         # +font_size+::
-        #     The font size that should be used. If +font+, +font_options+ or +font_color+ is
-        #     specified but +font_size+ isn't, font size defaults to 0 (= auto-sizing).
+        #     The font size that should be used. If not specified, it defaults to 0 (= auto-sizing).
         #
         # +font_color+::
-        #     The font color that should be used. If +font+, +font_options+ or +font_size+ is
-        #     specified but +font_color+ isn't, font color defaults to 0 (i.e. black).
+        #     The font color that should be used. If not specified, it defaults to 0 (i.e. black).
         #
         # +align+::
         #     The alignment of the text, either :left, :center or :right.
@@ -445,8 +435,7 @@ module HexaPDF
 
         # Returns the dictionary containing the default resources for form field appearance streams.
         def default_resources
-          self[:DR] ||= document.wrap({ProcSet: [:PDF, :Text, :ImageB, :ImageC, :ImageI]},
-                                      type: :XXResources)
+          self[:DR] ||= document.wrap({}, type: :XXResources)
         end
 
         # Sets the global default appearance string using the provided values or the default values
@@ -532,7 +521,7 @@ module HexaPDF
             field = Field.wrap(document, field)
             next unless field && (calculation_action = field[:AA]&.[](:C))
             result = JavaScriptActions.calculate(self, calculation_action)
-            field.form_field.field_value = result if result
+            field.field_value = result if result
           end
         end
 
@@ -566,13 +555,11 @@ module HexaPDF
         # Applies the given variable field properties to the field.
         def apply_variable_text_properties(field, font: nil, font_options: nil, font_size: nil,
                                            font_color: nil, align: nil)
-          if font || font_options || font_size || font_color
-            field.set_default_appearance_string(font: font || 'Helvetica',
-                                                font_options: font_options || {},
-                                                font_size: font_size || 0,
-                                                font_color: font_color || 0)
-          end
-          field.text_alignment(align) if align
+          field.set_default_appearance_string(font: font || 'Helvetica',
+                                              font_options: font_options || {},
+                                              font_size: font_size || 0,
+                                              font_color: font_color || 0)
+          field.text_alignment(align || :left)
         end
 
         def perform_validation # :nodoc:

data/lib/hexapdf/type/acro_form/signature_field.rb

@@ -62,8 +62,10 @@ module HexaPDF
 
           define_field :Type,   type: Symbol, default: type
           define_field :Action, type: Symbol, required: true,
-            allowed_values: [:All, :Include, :Exclude]
+                       allowed_values: [:All, :Include, :Exclude]
           define_field :Fields, type: PDFArray
+          define_field :P, type: Numeric, version: '2.0',
+                       allowed_values: [1, 2, 3]
 
           private
 
@@ -83,8 +85,8 @@ module HexaPDF
         # If a flag is set it means that the associated entry is a required constraint. Otherwise it
         # is optional.
         #
-        # The available flags are: filter, sub_filter, v, reasons, legal_attestation, add_rev_info
-        # and digest_method.
+        # The available flags are: filter, sub_filter, v, reasons, legal_attestation, add_rev_info,
+        # digest_method, lock_document and appearance_filter.
         #
         # See: PDF2.0 s12.7.5.5
         class SeedValueDictionary < Dictionary
@@ -98,13 +100,16 @@ module HexaPDF
           define_field :Filter,           type: Symbol
           define_field :SubFilter,        type: PDFArray
           define_field :DigestMethod,     type: PDFArray, version: '1.7'
-          define_field :V,                type: Float
+          define_field :V,                type: Integer
           define_field :Cert,             type: :SVCert
           define_field :Reasons,          type: PDFArray
           define_field :MDP,              type: Dictionary, version: '1.6'
           define_field :TimeStamp,        type: Dictionary, version: '1.6'
           define_field :LegalAttestation, type: PDFArray, version: '1.6'
           define_field :AddRevInfo,       type: Boolean, version: '1.7'
+          define_field :LockDocument,     type: Symbol, version: '2.0',
+                       allowed_values: [:true, :false, :auto]
+          define_field :AppearanceFilter, type: String, version: '2.0'
 
           ##
           # :method: flags
@@ -130,7 +135,8 @@ module HexaPDF
           # all prior flags will be cleared.
           #
           bit_field(:flags, {filter: 0, sub_filter: 1, v: 2, reasons: 3, legal_attestation: 4,
-                             add_rev_info: 5, digest_method: 6},
+                             add_rev_info: 5, digest_method: 6, lock_document: 7,
+                             appearance_filter: 8},
                     lister: "flags", getter: "flagged?", setter: "flag", unsetter: "unflag",
                     value_getter: "self[:Ff]", value_setter: "self[:Ff]")
 
@@ -155,12 +161,16 @@ module HexaPDF
           define_field :Type,      type: Symbol, default: type
           define_field :Ff,        type: Integer, default: 0
           define_field :Subject,   type: PDFArray
+          define_field :SignaturePolicyOID, type: String, version: '2.0'
+          define_field :SignaturePolicyHashValue, type: String, version: '2.0'
+          define_field :SignaturePolicyHashAlgorithm, type: Symbol, version: '2.0'
+          define_field :SignaturePolicyCommitmentType, type: PDFArray, version: '2.0'
           define_field :SubjectDN, type: PDFArray, version: '1.7'
           define_field :KeyUsage,  type: PDFArray, version: '1.7'
           define_field :Issuer,    type: PDFArray
           define_field :OID,       type: PDFArray
           define_field :URL,       type: String
-          define_field :URLType,   type: Symbol, default: :Browser
+          define_field :URLType,   type: Symbol, default: :Browser, version: '1.7'
 
           ##
           # :method: flags

data/lib/hexapdf/type/acro_form/variable_text_field.rb

@@ -51,7 +51,7 @@ module HexaPDF
       # See: PDF2.0 s12.7.4.3
       class VariableTextField < Field
 
-        define_field :DA, type: String
+        define_field :DA, type: PDFByteString
         define_field :Q, type: Integer, default: 0, allowed_values: [0, 1, 2]
         define_field :DS, type: String, version: '1.5'
         define_field :RV, type: [String, Stream], version: '1.5'

data/lib/hexapdf/type/actions/go_to.rb

@@ -47,6 +47,7 @@ module HexaPDF
 
         define_field :S, type: Symbol, required: true, default: :GoTo
         define_field :D, type: [Symbol, PDFByteString, PDFArray], required: true
+        define_field :SD, type: PDFArray, version: '2.0'
 
       end
 

data/lib/hexapdf/type/actions/go_to_r.rb

@@ -48,6 +48,7 @@ module HexaPDF
         define_field :S,         type: Symbol, required: true, default: :GoToR
         define_field :F,         type: :Filespec, required: true
         define_field :D,         type: [Symbol, PDFByteString, PDFArray], required: true
+        define_field :SD,        type: PDFArray, version: '2.0'
         define_field :NewWindow, type: Boolean, version: '1.2'
 
       end

data/lib/hexapdf/type/actions/launch.rb

@@ -60,13 +60,17 @@ module HexaPDF
         define_field :S,         type: Symbol, required: true, default: :Launch
         define_field :F,         type: :Filespec
         define_field :Win,       type: :XXLaunchActionWinParameters
+        define_field :Mac,       type: ::Object, version: '2.0'
+        define_field :Unix,      type: ::Object, version: '2.0'
         define_field :NewWindow, type: Boolean, version: '1.2'
 
         private
 
         def perform_validation #:nodoc:
           super
-          yield("A Launch action needs a target") unless key?(:F) || key?(:Win)
+          unless key?(:Win) || key?(:Mac) || key?(:Unix) || key?(:F)
+            yield("Launch action key /F required if /Win, /Mac and /Unix are absent")
+          end
         end
 
       end

data/lib/hexapdf/type/annotation.rb

@@ -123,7 +123,7 @@ module HexaPDF
       define_field :Contents,     type: String
       define_field :P,            type: Dictionary, version: '1.3'
       define_field :NM,           type: String, version: '1.4'
-      define_field :M,            type: PDFDate, version: '1.1'
+      define_field :M,            type: [PDFDate, String], version: '1.1'
       define_field :F,            type: Integer, default: 0, version: '1.1'
       define_field :AP,           type: :XXAppearanceDictionary, version: '1.2'
       define_field :AS,           type: Symbol, version: '1.2'
@@ -131,6 +131,11 @@ module HexaPDF
       define_field :C,            type: PDFArray, version: '1.1'
       define_field :StructParent, type: Integer, version: '1.3'
       define_field :OC,           type: Dictionary, version: '1.5'
+      define_field :AF,           type: PDFArray, version: '2.0'
+      define_field :ca,           type: Numeric, default: 1.0, version: '2.0'
+      define_field :CA,           type: Numeric, default: 1.0, version: '2.0'
+      define_field :BM,           type: Symbol, version: '2.0'
+      define_field :Lang,         type: String, version: '2.0'
 
       ##
       # :method: flags

data/lib/hexapdf/type/annotations/markup_annotation.rb

@@ -46,6 +46,19 @@ module HexaPDF
       # See: PDF2.0 s12.5.6.2, HexaPDF::Type::Annotation
       class MarkupAnnotation < Annotation
 
+        # External data dictionary used by some markup annotation types.
+        #
+        # See: PDF2.0 s12.5.6.2
+        class ExData < Dictionary
+
+          define_type :ExData
+
+          define_field :Type,    type: Symbol, required: true, default: type
+          define_field :Subtype, type: Symbol, required: true,
+                       allowed_values: [:Markup3D, :'3DM', :MarkupGeo]
+
+        end
+
         define_field :T,            type: String, version: '1.1'
         define_field :Popup,        type: :Annot, version: '1.3'
         define_field :CA,           type: Numeric, default: 1.0, version: '1.4'
@@ -56,7 +69,7 @@ module HexaPDF
         define_field :RT,           type: Symbol, default: :R, allowed_values: [:R, :Group],
                                     version: '1.6'
         define_field :IT,           type: Symbol, version: '1.6'
-        define_field :ExData,       type: Dictionary, version: '1.7'
+        define_field :ExData,       type: :ExData, version: '1.7'
 
         private
 

data/lib/hexapdf/type/catalog.rb

@@ -84,6 +84,9 @@ module HexaPDF
       define_field :Requirements,      type: PDFArray,   version: '1.7'
       define_field :Collection,        type: Dictionary, version: '1.7'
       define_field :NeedsRendering,    type: Boolean,    version: '1.7'
+      define_field :DSS,               type: Dictionary, version: '2.0'
+      define_field :AF,                type: PDFArray,   version: '2.0'
+      define_field :DPartRoot,         type: Dictionary, version: '2.0'
 
       # Returns +true+ since catalog objects must always be indirect.
       def must_be_indirect?

data/lib/hexapdf/type/cid_font.rb

@@ -61,13 +61,16 @@ module HexaPDF
 
       DEFAULT_WIDTH = 1000 # :nodoc:
 
+      define_field :Subtype,         type: Symbol, required: true,
+                   allowed_values: [:CIDFontType0, :CIDFontType2]
       define_field :BaseFont,        type: Symbol, required: true
       define_field :CIDSystemInfo,   type: :XXCIDSystemInfo, required: true
-      define_field :FontDescriptor,  type: :FontDescriptor, indirect: true, required: true
+      define_field :FontDescriptor,  type: :FontDescriptor, required: true
       define_field :DW,              type: Integer, default: DEFAULT_WIDTH
       define_field :W,               type: PDFArray
       define_field :DW2,             type: PDFArray, default: [880, -1100]
       define_field :W2,              type: PDFArray
+      define_field :CIDToGIDMap,     type: [Symbol, Stream]
 
       # Returns the unscaled width of the given CID in glyph units, or 0 if the width for the CID is
       # missing.

data/lib/hexapdf/type/file_specification.rb

@@ -78,19 +78,22 @@ module HexaPDF
 
       define_type :Filespec
 
-      define_field :Type, type: Symbol, default: type, required: true
-      define_field :FS,   type: Symbol
-      define_field :F,    type: PDFByteString
-      define_field :UF,   type: String, version: '1.7'
-      define_field :DOS,  type: PDFByteString
-      define_field :Mac,  type: PDFByteString
-      define_field :Unix, type: PDFByteString
-      define_field :ID,   type: PDFArray
-      define_field :V,    type: Boolean, version: '1.2'
-      define_field :EF,   type: :XXFilespecEFDictionary, version: '1.7'
-      define_field :RF,   type: Dictionary, version: '1.3'
-      define_field :Desc, type: String, version: '1.6'
-      define_field :CI,   type: Dictionary, version: '1.7'
+      define_field :Type,  type: Symbol, default: type, required: true
+      define_field :FS,    type: Symbol
+      define_field :F,     type: PDFByteString
+      define_field :UF,    type: String, version: '1.7'
+      define_field :DOS,   type: PDFByteString
+      define_field :Mac,   type: PDFByteString
+      define_field :Unix,  type: PDFByteString
+      define_field :ID,    type: PDFArray
+      define_field :V,     type: Boolean, version: '1.2'
+      define_field :EF,    type: :XXFilespecEFDictionary, version: '1.7'
+      define_field :RF,    type: Dictionary, version: '1.3'
+      define_field :Desc,  type: String, version: '1.6'
+      define_field :CI,    type: Dictionary, version: '1.7'
+      define_field :Thumb, type: Stream, version: '2.0'
+      define_field :EP,    type: Dictionary, version: '2.0'
+      define_field :AF,    type: Symbol, version: '2.0', default: :Unspecified
 
       # Returns +true+ if this file specification references an URL and not a file.
       def url?
@@ -114,7 +117,7 @@ module HexaPDF
 
       # Sets the file specification string to the given filename.
       #
-      # Since the /Unix, /Mac and /DOS fields are obsolescent, only the /F and /UF fields are set.
+      # Since the /Unix, /Mac and /DOS fields are deprecated, only the /F and /UF fields are set.
       def path=(filename)
         self[:UF] = filename
         self[:F] = filename.b

data/lib/hexapdf/type/font_descriptor.rb

@@ -57,7 +57,7 @@ module HexaPDF
       define_field :FontStretch,  type: Symbol, version: '1.5',
         allowed_values: [:UltraCondensed, :ExtraCondensed, :Condensed, :SemiCondensed,
                          :Normal, :SemiExpanded, :Expanded, :ExtraExpanded, :UltraExpanded]
-      define_field :FontWeight,   type: Numeric, version: '1.5'
+      define_field :FontWeight,   type: Integer, version: '1.5' # also see validation
       define_field :Flags,        type: Integer, required: true
       define_field :FontBBox,     type: Rectangle
       define_field :ItalicAngle,  type: Numeric, required: true
@@ -76,6 +76,7 @@ module HexaPDF
       define_field :FontFile3,    type: Stream, version: '1.2'
       define_field :CharSet,      type: [PDFByteString, String], version: '1.1'
 
+      # From PDF2.0 s9.8.3.1
       define_field :Style,        type: Dictionary
       define_field :Lang,         type: Symbol, version: '1.5'
       define_field :FD,           type: Dictionary
@@ -98,13 +99,13 @@ module HexaPDF
 
         font_weight = self[:FontWeight]
         if font_weight && !ALLOWED_FONT_WEIGHTS.include?(font_weight)
-          yield("Field FontWeight does not contain an allowed value", true)
+          yield("Field FontWeight contains the disallowed value #{font_weight}", true)
           delete(:FontWeight)
         end
 
         descent = self[:Descent]
         if descent && descent > 0
-          yield("The /Descent value needs to be a negative number", true)
+          yield("The /Descent value needs to be zero or negative", true)
           self[:Descent] = -descent
         end
       end

data/lib/hexapdf/type/font_simple.rb

@@ -47,10 +47,12 @@ module HexaPDF
     # See: PDF2.0 s9.6
     class FontSimple < Font
 
+      # Only the common fields are defined here, the rest in FontType1, FontType3, FontTrueType
+      define_field :Name, type: Symbol
       define_field :FirstChar, type: Integer
       define_field :LastChar, type: Integer
       define_field :Widths, type: PDFArray
-      define_field :FontDescriptor, type: :FontDescriptor, indirect: true
+      define_field :FontDescriptor, type: :FontDescriptor
       define_field :Encoding, type: [Dictionary, Symbol]
 
       # Returns the font descriptor. May be +nil+ for a standard 14 font.

data/lib/hexapdf/type/font_true_type.rb

@@ -41,6 +41,8 @@ module HexaPDF
   module Type
 
     # Represents a TrueType font.
+    #
+    # See: PDF2.0 s9.6.3
     class FontTrueType < FontSimple
 
       define_field :Subtype, type: Symbol, required: true, default: :TrueType

data/lib/hexapdf/type/font_type0.rb

@@ -48,7 +48,7 @@ module HexaPDF
     # Composite fonts also allow for vertical writing mode and support TrueType as well as OpenType
     # fonts.
     #
-    # See: PDF2.0 s9.7
+    # See: PDF2.0 s9.7, s9.7.6.1
     class FontType0 < Font
 
       define_field :Subtype, type: Symbol, required: true, default: :Type0

data/lib/hexapdf/type/font_type1.rb

@@ -170,6 +170,8 @@ module HexaPDF
         end
       end
 
+      PREDEFINED_ENCODING = [:MacRomanEncoding, :MacExpertEncoding, :WinAnsiEncoding] #:nodoc:
+
       # Validates the Type1 font dictionary.
       def perform_validation
         std_font = StandardFonts.standard_font?(self[:BaseFont])
@@ -178,6 +180,11 @@ module HexaPDF
         if !std_font && self[:FontDescriptor].nil?
           yield("Required field FontDescriptor is not set", false)
         end
+
+        encoding = self[:Encoding]
+        if encoding.kind_of?(Symbol) && !PREDEFINED_ENCODING.include?(encoding)
+          yield("The /Encoding value '#{encoding}' is invalid", false)
+        end
       end
 
     end

data/lib/hexapdf/type/font_type3.rb

@@ -49,7 +49,6 @@ module HexaPDF
     class FontType3 < FontSimple
 
       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: PDFArray, required: true
       define_field :CharProcs,  type: Dictionary, required: true

data/lib/hexapdf/type/form.rb

@@ -89,6 +89,10 @@ module HexaPDF
       define_field :StructParents, type: Integer,      version: '1.3'
       define_field :OPI,           type: Dictionary,   version: '1.2'
       define_field :OC,            type: Dictionary,   version: '1.5'
+      define_field :Name,          type: Symbol
+      define_field :AF,            type: PDFArray,     version: '2.0'
+      define_field :Measure,       type: Dictionary,   version: '2.0'
+      define_field :PtData,        type: Dictionary,   version: '2.0'
 
       # Returns the path to the PDF file that was used when creating the form object.
       #
@@ -131,8 +135,7 @@ module HexaPDF
 
       # Returns the resource dictionary which is automatically created if it doesn't exist.
       def resources
-        self[:Resources] ||= document.wrap({ProcSet: [:PDF, :Text, :ImageB, :ImageC, :ImageI]},
-                                           type: :XXResources)
+        self[:Resources] ||= document.wrap({}, type: :XXResources)
       end
 
       # Processes the content stream of the form XObject with the given processor object.

data/lib/hexapdf/type/graphics_state_parameter.rb

@@ -58,10 +58,10 @@ module HexaPDF
       define_field :ML,            type: Numeric, 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]
+                   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"
@@ -82,6 +82,9 @@ module HexaPDF
       define_field :ca,            type: Numeric, version: "1.4"
       define_field :AIS,           type: Boolean, version: "1.4"
       define_field :TK,            type: Boolean, version: "1.4"
+      define_field :UseBlackPtComp, type: Symbol, version: "2.0",
+                   allowed_values: [:OFF, :ON, :Default]
+      define_field :HTO,           type: PDFArray, version: "2.0"
 
     end