hexapdf 0.46.0 → 1.0.0

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
@@ -199,7 +209,8 @@ module HexaPDF
 
         # Returns the associated signature dictionary or +nil+ if the signature is not filled in.
         def field_value
-          self[:V]
+          val = self[:V]
+          val.instance_of?(Dictionary) ? document.wrap(val, type: :Sig) : val
         end
 
         # Sets the signature dictionary as value of this signature field.

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'
@@ -106,7 +106,7 @@ module HexaPDF
               font_params[2] = HexaPDF::Content::ColorSpace.prenormalized_device_color(params)
             end
           end
-          HexaPDF::Content::Parser.parse(appearance_string.sub(/\/\//, '/'), &block)
+          HexaPDF::Content::Parser.parse(appearance_string.to_s.sub(/\/\//, '/'), &block)
           block_given? ? nil : font_params
         end
 
@@ -154,13 +154,21 @@ module HexaPDF
         # font_size, font_color].
         #
         # The default appearance string is taken from the given +widget+ of the field, falls back to
-        # the field itself or, if still not available, the default appearance string of the form.
+        # the field itself and then the default appearance string of the form. If it still not
+        # available, a standard default appearance string is set (see
+        # #set_default_appearance_string) and used.
         #
         # The reason why a specific widget of the field can be specified is because the widgets of a
         # field might differ in their visual representation.
         def parse_default_appearance_string(widget = self)
           da = widget[:DA] || self[:DA] || (document.acro_form && document.acro_form[:DA])
-          raise HexaPDF::Error, "No default appearance string set" unless da
+          unless da
+            if (args = document.config['acro_form.fallback_default_appearance'])
+              da = set_default_appearance_string(**args)
+            else
+              raise HexaPDF::Error, "No default appearance string set"
+            end
+          end
           self.class.parse_appearance_string(da)
         end
 

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/annotations/widget.rb

@@ -259,7 +259,7 @@ module HexaPDF
         # auto-sized checkmark (i.e. :check for for check boxes) or circle (:circle for radio
         # buttons). This also means that multiple invocations will reset *all* prior values.
         #
-        # Note: The marker is called "normal caption" in the PDF 1.7 spec and the /CA entry of the
+        # Note: The marker is called "normal caption" in the PDF 2.0 spec and the /CA entry of the
         # associated appearance characteristics dictionary. The marker size and color are set using
         # the /DA key on the widget (although /DA is not defined for widget, this is how Acrobat
         # does it).
@@ -305,7 +305,9 @@ module HexaPDF
             size = 0
             color = HexaPDF::Content::ColorSpace.prenormalized_device_color([0])
             if (da = self[:DA] || field[:DA])
-              _, size, color = HexaPDF::Type::AcroForm::VariableTextField.parse_appearance_string(da)
+              _, da_size, da_color = AcroForm::VariableTextField.parse_appearance_string(da)
+              size = da_size || size
+              color = da_color || color
             end
 
             MarkerStyle.new(style, size, color)

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
 

data/lib/hexapdf/type/image.rb

@@ -61,10 +61,10 @@ module HexaPDF
       define_field :ColorSpace,       type: [Symbol, PDFArray]
       define_field :BitsPerComponent, type: Integer
       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]
+                   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, PDFArray], version: '1.3'
       define_field :Decode,           type: PDFArray
@@ -72,11 +72,15 @@ module HexaPDF
       define_field :Alternates,       type: PDFArray,        version: '1.3'
       define_field :SMask,            type: Stream,          version: '1.4'
       define_field :SMaskInData,      type: Integer,         version: '1.5', allowed_values: [0, 1, 2]
+      define_field :Name,             type: Symbol
       define_field :StructParent,     type: Integer,         version: '1.3'
       define_field :ID,               type: PDFByteString,   version: '1.3'
       define_field :OPI,              type: Dictionary,      version: '1.2'
       define_field :Metadata,         type: Stream,          version: '1.4'
       define_field :OC,               type: Dictionary,      version: '1.5'
+      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 source path that was used when creating the image object.
       #

data/lib/hexapdf/type/info.rb

@@ -57,8 +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',
-        allowed_values: [:True, :False, :Unknown]
+      define_field :Trapped,      type: Symbol, version: '1.3', default: :Unknown,
+                   allowed_values: [:True, :False, :Unknown]
 
       # Info dictionaries must always be indirect.
       def must_be_indirect?

data/lib/hexapdf/type/mark_information.rb

@@ -48,8 +48,8 @@ module HexaPDF
       define_type :XXMarkInformation
 
       define_field :Marked,         type: Boolean, default: false
-      define_field :UserProperties, type: Boolean, default: false
-      define_field :Suspects,       type: Boolean, default: false
+      define_field :UserProperties, type: Boolean, default: false, version: '1.6'
+      define_field :Suspects,       type: Boolean, default: false, version: '1.6'
 
     end
 

data/lib/hexapdf/type/optional_content_configuration.rb

@@ -76,7 +76,7 @@ module HexaPDF
       define_field :AS,        type: PDFArray
       define_field :Order,     type: PDFArray
       define_field :ListMode,  type: Symbol, default: :AllPages,
-        allowed_values: [:AllPages, :VisiblePages]
+                   allowed_values: [:AllPages, :VisiblePages]
       define_field :RBGroups,  type: PDFArray
       define_field :Locked,    type: PDFArray, default: []
 

data/lib/hexapdf/type/optional_content_membership.rb

@@ -54,7 +54,7 @@ module HexaPDF
       define_field :Type, type: Symbol, required: true, default: type
       define_field :OCGs, type: [:OCG, PDFArray]
       define_field :P,    type: Symbol, default: :AnyOn,
-        allowed_values: [:AllOn, :AnyOn, :AnyOff, :AllOff]
+                   allowed_values: [:AllOn, :AnyOn, :AnyOff, :AllOff]
       define_field :VE,   type: PDFArray
 
     end

data/lib/hexapdf/type/page.rb

@@ -159,6 +159,9 @@ module HexaPDF
       define_field :PresSteps,            type: Dictionary, version: '1.5'
       define_field :UserUnit,             type: Numeric, version: '1.6'
       define_field :VP,                   type: PDFArray, version: '1.6'
+      define_field :AF,                   type: PDFArray, version: '2.0'
+      define_field :OutputIntents,        type: PDFArray, version: '2.0'
+      define_field :DPart,                type: Dictionary, version: '2.0'
 
       # Returns +true+ since page objects must always be indirect.
       def must_be_indirect?
@@ -358,7 +361,7 @@ module HexaPDF
       def contents
         Array(self[:Contents]).each_with_object("".b) do |content_stream, content|
           content << " " unless content.empty?
-          content << content_stream.stream
+          content << content_stream.stream if content_stream.kind_of?(Stream)
         end
       end
 
@@ -380,8 +383,7 @@ module HexaPDF
       # Returns the, possibly inherited, 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 streams associated with the page with the given processor object.

data/lib/hexapdf/type/resources.rb

@@ -49,13 +49,13 @@ module HexaPDF
 
       define_type :XXResources
 
-      define_field :ExtGState, type: Dictionary
+      define_field :ExtGState,  type: Dictionary
       define_field :ColorSpace, type: Dictionary
-      define_field :Pattern, type: Dictionary
-      define_field :Shading, type: Dictionary, version: '1.3'
-      define_field :XObject, type: Dictionary
-      define_field :Font, type: Dictionary
-      define_field :ProcSet, type: PDFArray
+      define_field :Pattern,    type: Dictionary
+      define_field :Shading,    type: Dictionary, version: '1.3'
+      define_field :XObject,    type: Dictionary
+      define_field :Font,       type: Dictionary
+      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/viewer_preferences.rb

@@ -56,19 +56,20 @@ module HexaPDF
       define_field :CenterWindow,          type: Boolean, default: false
       define_field :DisplayDocTitle,       type: Boolean, default: false, version: '1.4'
       define_field :NonFullScreenPageMode, type: Symbol,  default: :UseNone,
-        allowed_values: [:UseNone, :UseOutlines, :UseThumbs, :UseOC]
+                   allowed_values: [:UseNone, :UseOutlines, :UseThumbs, :UseOC]
       define_field :Direction,             type: Symbol,  default: :L2R, version: '1.3',
-        allowed_values: [:L2R, :R2L]
+                   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',
-        allowed_values: [:Simplex, :DuplexFlipShortEdge, :DuplexFlipLongEdge]
+                   allowed_values: [:Simplex, :DuplexFlipShortEdge, :DuplexFlipLongEdge]
       define_field :PickTrayByPDFSize,     type: Boolean, version: '1.7'
       define_field :PrintPageRange,        type: PDFArray, version: '1.7'
       define_field :NumCopies,             type: Integer, version: '1.7'
+      define_field :Enforce,               type: PDFArray, version: '2.0'
 
     end
 

data/lib/hexapdf/version.rb

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

data/lib/hexapdf/writer.rb

@@ -163,6 +163,7 @@ module HexaPDF
 
       trailer = rev.trailer.value.dup
       trailer.delete(:XRefStm)
+      trailer.delete(:Type)
       if previous_xref_pos
         trailer[:Prev] = previous_xref_pos
       else