hexapdf 0.46.0 → 0.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9c1a35d4ad93b48faa1f728bcddc91778da584c8d673e2f15557bd22050a438
-  data.tar.gz: 2ef8ca70891723643080a402f0808882f66f01a816c422477cc03fad34774859
+  metadata.gz: 15f4c7590b5f2ce321519ac0b4871971c12073a9d4b0df36ab2f2e3c156f09ab
+  data.tar.gz: 76dac6196e06e80fd88dade3f831b7744c2b763f004d3c389d3efebcace3be82
 SHA512:
-  metadata.gz: 87c109bd8a6711b4df27a40c689a025d816075d6c68c21a1cc22924b5ae827cd44d98e45bff8f43c85403dd82d6a6e54b66c99bfe135298cba33292e9511a1fc
-  data.tar.gz: e0529e3e244be8366e722ea29ab06a8b922f18698526c79a28d5d11f02da5ee103cba71ecbc6882fefe3de27f02d38f8ce8b505fefbb45839069c74aefaed9ae
+  metadata.gz: 8ea19ed17370cad1a1fa48a7e0cb85c16e3ff62b344d2a9a90c42d2ac98d5ce5f75c356facf6bb8276822db460e2d9f912f523783c82b3539200e33f9de9f383
+  data.tar.gz: bdf2d93feade9f0654366bbf89711b670cbd03ee88b81f197f756c2032305f9ee7b9265973f31c5a4e18e7afd3e4f9dfd08b46a0483502b896774494294c111a

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+## 0.47.0 - 2024-09-07
+
+### Added
+
+* Configuration option 'acro_form.fallback_default_appearance' to allow setting
+  a standard default appearance string for a variable text field if none is
+  found
+* Support for decrypting files with the proprietary algorithm /R 5
+
+### Changed
+
+* [HexaPDF::Task::Optimize] to not remove optional /Type entries containing
+  default values
+* Validation of [HexaPDF::Type::AcroForm::Form] to not add a /DA entry
+
+### Fixed
+
+* [HexaPDF::Layout::TableBox] to correctly calculcate and distribute row
+  heights when row spans are involved
+* [HexaPDF::Type::AcroForm::AppearanceGenerator] to work for files where check
+  boxes don't define the name of the on state
+* [HexaPDF::Importer#import] to handle null values in all cases
+* [HexaPDF::Type::AcroForm::VariableTextField] to handle parsing of invalid PDFs
+  with symbolic appearance strings
+* [HexaPDF::Type::Annotations::Widget#marker_style] to handle invalid /DA values
+  with missing font size or color information
+* [HexaPDF::Type::AcroForm::SignatureField#field_value] to always return a
+  correctly wrapped object
+* [HexaPDF::Writer] to remove /Type entry from trailer
+* [HexaPDF::Type::AcroForm::AppearanceGenerator#create_text_appearances] to
+  handle invalid appearance streams that are not correct Form XObjects
+
+
 ## 0.46.0 - 2024-08-11
 
 ### Added

data/lib/hexapdf/configuration.rb

@@ -182,6 +182,16 @@ module HexaPDF
   # acro_form.default_font_size::
   #    A number specifying the default font size of AcroForm text fields which should be auto-sized.
   #
+  # acro_form.fallback_default_appearance::
+  #    A hash containging arguments for
+  #    HexaPDF::Type::AcroForm::VariableTextField#set_defaut_appearance_string which is used as
+  #    fallback for fields without a default appearance.
+  #
+  #    If this value is set to +nil+, an error is raised in case a variable text field cannot
+  #    resolve a default appearance string.
+  #
+  #    The default is the empty hash meaning the defaults from the method are used.
+  #
   # acro_form.fallback_font::
   #    The font that should be used when a variable text field references a font that cannot be used.
   #
@@ -485,6 +495,7 @@ module HexaPDF
     Configuration.new('acro_form.appearance_generator' => 'HexaPDF::Type::AcroForm::AppearanceGenerator',
                       'acro_form.create_appearances' => true,
                       'acro_form.default_font_size' => 10,
+                      'acro_form.fallback_default_appearance' => {},
                       'acro_form.fallback_font' => 'Helvetica',
                       'acro_form.on_invalid_value' => proc do |field, value|
                         raise HexaPDF::Error, "Invalid value #{value.inspect} for " \

data/lib/hexapdf/encryption/standard_security_handler.rb

@@ -106,6 +106,10 @@ module HexaPDF
     # password is supplied. To open such an encrypted PDF file, the +decryption_opts+ provided to
     # HexaPDF::Document.new needs to contain a :password key with the password.
     #
+    # **Note**: While HexaPDF supports reading files encrypted with revision 5, it doesn't support
+    # writing such files. This is no problem in practice since revision 5 was an inofficial Adobe
+    # extension to PDF 1.7 and revision 6 specified in PDF 2.0 is practically the same.
+    #
     # See: PDF2.0 s7.6.4
     class StandardSecurityHandler < SecurityHandler
 
@@ -340,13 +344,13 @@ module HexaPDF
       # Uses the given password (or the default password if none given) to retrieve the encryption
       # key.
       #
-      # If the optional +check_permissions+ argument is +true+, the permissions for files
-      # encrypted with revision 6 are checked. Otherwise, permission changes are ignored.
+      # If the optional +check_permissions+ argument is +true+, the permissions for files encrypted
+      # with revision 5 or 6 are checked. Otherwise, permission changes are ignored.
       def prepare_decryption(password: '', check_permissions: true)
         if dict[:Filter] != :Standard
           raise(HexaPDF::UnsupportedEncryptionError,
                 "Invalid /Filter value #{dict[:Filter]} for standard security handler")
-        elsif ![2, 3, 4, 6].include?(dict[:R])
+        elsif ![2, 3, 4, 5, 6].include?(dict[:R])
           raise(HexaPDF::UnsupportedEncryptionError,
                 "Invalid /R value #{dict[:R]} for standard security handler")
         elsif dict[:R] <= 4 && !document.trailer[:ID].kind_of?(PDFArray)
@@ -369,7 +373,7 @@ module HexaPDF
           raise HexaPDF::EncryptionError, "Invalid password specified"
         end
 
-        check_perms_field(encryption_key) if check_permissions && dict[:R] == 6
+        check_perms_field(encryption_key) if check_permissions && dict[:R] >= 5
 
         encryption_key
       end
@@ -396,8 +400,8 @@ module HexaPDF
       # For revisions <= 4 this is the *only* way for generating the encryption key needed to
       # encrypt or decrypt a file.
       #
-      # For revision 6 the file encryption key is a string of random bytes that has been encrypted
-      # with the user password. If the password is the owner password,
+      # For revision 5 and 6 the file encryption key is a string of random bytes that has been
+      # encrypted with the user password. If the password is the owner password,
       # #compute_owner_encryption_key has to be used instead.
       #
       # See: PDF2.0 s7.6.4.3.2 (algorithm 2), PDF2.0 s7.6.4.3.3 (algorithm 2.A (a)-(b),(e))
@@ -416,7 +420,7 @@ module HexaPDF
           end
 
           data[0, n]
-        elsif dict[:R] == 6
+        elsif dict[:R] <= 6
           key = compute_hash(password, dict[:U][40, 8])
           aes_algorithm.new(key, "\0" * 16, :decrypt).process(dict[:UE])
         end
@@ -427,15 +431,15 @@ module HexaPDF
       # For revisions <= 4 this is done by first retrieving the user password through the use of
       # the owner password and then using the #compute_user_encryption_key method.
       #
-      # For revision 6 the file encryption key is a string of random bytes that has been encrypted
-      # with the owner password. If the password is the user password, #compute_user_encryption_key
-      # has to be used.
+      # For revisions 5 and 6 the file encryption key is a string of random bytes that has been
+      # encrypted with the owner password. If the password is the user password,
+      # #compute_user_encryption_key has to be used.
       #
       # See: PDF2.0 s7.6.4.3.2 (algorithm 2.A (a)-(d))
       def compute_owner_encryption_key(password)
         if dict[:R] <= 4
           compute_user_encryption_key(user_password_from_owner_password(password))
-        elsif dict[:R] == 6
+        elsif dict[:R] <= 6
           key = compute_hash(password, dict[:O][40, 8], dict[:U])
           aes_algorithm.new(key, "\0" * 16, :decrypt).process(dict[:OE])
         end
@@ -447,7 +451,7 @@ module HexaPDF
       # the owner password. For revision 6 the /O value is a hash computed from the password and
       # the /U value with added validation and key salts.
       #
-      # *Attention*: If revision 6 is used, the /U value has to be computed and set before this
+      # *Attention*: If revision 5 or 6 is used, the /U value has to be computed and set before this
       # method is used, otherwise the return value is incorrect!
       #
       # See: PDF2.0 s7.6.4.4.2 (algorithm 3), PDF2.0 s7.6.4.4.8 (algorithm 9 (a))
@@ -465,14 +469,14 @@ module HexaPDF
           end
 
           data
-        elsif dict[:R] == 6
+        elsif dict[:R] <= 6
           validation_salt = random_bytes(8)
           key_salt = random_bytes(8)
           compute_hash(owner_password, validation_salt, dict[:U]) << validation_salt << key_salt
         end
       end
 
-      # Computes the encryption dictionary's /OE (owner encryption key) value (for revision 6
+      # Computes the encryption dictionary's /OE (owner encryption key) value (for revisions 5 and 6
       # only).
       #
       # Short explanation: Encrypts the file encryption key with a key based on the password and
@@ -487,7 +491,7 @@ module HexaPDF
       # Computes the encryption dictionary's /U (user password) value.
       #
       # Short explanation: For revisions <= 4, the password padding string is encrypted with a key
-      # based on the user password. For revision 6 the /U value is a hash computed from the
+      # based on the user password. For revisions 5 and 6 the /U value is a hash computed from the
       # password with added validation and key salts.
       #
       # See: PDF2.0 s7.6.4.4.3 (algorithm 4 for R=2), PDF s7.6.4.4.4 (algorithm 5 for R=3 and R=4)
@@ -502,14 +506,14 @@ module HexaPDF
           data = arc4_algorithm.encrypt(key, data)
           19.times {|i| data = arc4_algorithm.encrypt(xor_key(key, i + 1), data) }
           data << "hexapdfhexapdfhe"
-        elsif dict[:R] == 6
+        elsif dict[:R] <= 6
           validation_salt = random_bytes(8)
           key_salt = random_bytes(8)
           compute_hash(password, validation_salt) << validation_salt << key_salt
         end
       end
 
-      # Computes the encryption dictionary's /UE (user encryption key) value (for revision 6
+      # Computes the encryption dictionary's /UE (user encryption key) value (for revision 5 and 6
       # only).
       #
       # Short explanation: Encrypts the file encryption key with a key based on the password and
@@ -521,7 +525,8 @@ module HexaPDF
         aes_algorithm.new(key, "\0" * 16, :encrypt).process(file_encryption_key)
       end
 
-      # Computes the encryption dictionary's /Perms (permissions) value (for revision 6 only).
+      # Computes the encryption dictionary's /Perms (permissions) value (for revisions 5 and 6
+      # only).
       #
       # Uses /P and /EncryptMetadata values, so these have to be set beforehand.
       #
@@ -543,7 +548,7 @@ module HexaPDF
           compute_u_field(password) == dict[:U]
         elsif dict[:R] <= 4
           compute_u_field(password)[0, 16] == dict[:U][0, 16]
-        elsif dict[:R] == 6
+        elsif dict[:R] <= 6
           compute_hash(password, dict[:U][32, 8]) == dict[:U][0, 32]
         end
       end
@@ -554,14 +559,14 @@ module HexaPDF
       def owner_password_valid?(password)
         if dict[:R] <= 4
           user_password_valid?(user_password_from_owner_password(password))
-        elsif dict[:R] == 6
+        elsif dict[:R] <= 6
           compute_hash(password, dict[:O][32, 8], dict[:U]) == dict[:O][0, 32]
         end
       end
 
       # Checks if the decrypted /Perms entry matches the /P and /EncryptMetadata entries.
       #
-      # This method can only be used for revision 6.
+      # This method can only be used for revisions 5 and 6.
       #
       # See: PDF2.0 s7.6.4.4.12 (algorithm 13)
       def check_perms_field(encryption_key)
@@ -596,17 +601,18 @@ module HexaPDF
       end
 
       # Computes a hash that is used extensively for all operations in security handlers of
-      # revision 6.
+      # revision 5 and 6.
       #
       # Note: The original input (as defined by the spec) is calculated as
       # "#{password}#{salt}#{user_key}" where +user_key+ has to be empty when doing operations
       # with the user password.
       #
-      # See: PDF2.0 s7.6.4.3.4 (algorithm 2.B)
+      # See: PDF2.0 s7.6.4.3.4 (algorithm 2.B) and ADB Extension Level 3 s3.5.2
       def compute_hash(password, salt, user_key = '')
         k = Digest::SHA256.digest("#{password}#{salt}#{user_key}")
-        e = ''
+        return k if dict[:R] == 5
 
+        e = ''
         i = 0
         while i < 64 || e.getbyte(-1) > i - 32
           k1 = "#{password}#{k}#{user_key}" * 64
@@ -627,7 +633,7 @@ module HexaPDF
       # * For revisions <= 4, the password is converted into ISO-8859-1 encoding, padded with
       #   PASSWORD_PADDING and truncated to a maximum of 32 bytes.
       #
-      # * For revision 6 the password is converted into UTF-8 encoding that is normalized
+      # * For revision 5 and 6 the password is converted into UTF-8 encoding that is normalized
       #   according to the PDF2.0 specification.
       #
       # See: PDF2.0 s7.6.4.3.2 (algorithm 2 step a)),
@@ -636,7 +642,7 @@ module HexaPDF
         if dict[:R] <= 4
           password.to_s[0, 32].encode(Encoding::ISO_8859_1).force_encoding(Encoding::BINARY).
             ljust(32, PASSWORD_PADDING)
-        elsif dict[:R] == 6
+        elsif dict[:R] <= 6
           password.to_s.encode(Encoding::UTF_8).force_encoding(Encoding::BINARY)[0, 127]
         end
       rescue Encoding::UndefinedConversionError => e

data/lib/hexapdf/importer.rb

@@ -141,7 +141,7 @@ module HexaPDF
         internal_import(wrapper.source.object(object), wrapper)
       when HexaPDF::Object
         wrapper.source ||= object.document
-        if !@allow_all && (object.type == :Catalog || object.type == :Pages)
+        if object.null? || (!@allow_all && (object.type == :Catalog || object.type == :Pages))
           @mapper[object.data] = nil
         elsif (mapped_object = @mapper[object.data]&.__getobj__) && !mapped_object.null?
           mapped_object

data/lib/hexapdf/layout/table_box.rb

@@ -382,7 +382,14 @@ module HexaPDF
         def fit_rows(start_row, available_height, column_info, frame)
           height = available_height
           last_fitted_row_index = -1
+          row_heights = {}
+          zero_height_rows = {}
+          row_spans = []
+
           @cells[start_row..-1].each.with_index(start_row) do |columns, row_index|
+            # 1. Fit all columns of the row and record the max height of all non-row-span cells. If
+            #    a row has zero height (usually because it only has row-span cells), record that
+            #    information. Additionally store all cells with row-spans.
             row_fit = true
             row_height = 0
             columns.each_with_index do |cell, col_index|
@@ -396,27 +403,67 @@ module HexaPDF
                 row_fit = false
                 break
               end
-              cell.left = column_info[cell.column].first
-              cell.top = height - available_height
-              row_height = cell.preferred_height if row_height < cell.preferred_height
+              if row_height < cell.preferred_height && cell.row_span == 1
+                row_height = cell.preferred_height
+              end
+              row_spans << cell if cell.row_span > 1
             end
 
-            if row_fit
-              seen = {}
-              columns.each do |cell|
-                next if seen[cell]
-                cell.update_height(cell.row == row_index ? row_height : cell.height + row_height)
-                seen[cell] = true
-              end
+            zero_height_rows[row_index] = true if row_height == 0
 
+            if row_fit
+              # 2. If all cells of the row fit, we subtract the recorded row height of the
+              #    non-row-span cells from the available height for the next pass.
               last_fitted_row_index = row_index
+              row_heights[row_index] = row_height
               available_height -= row_height
+
+              # 3. We look at all row-span cells that end at the current row index. If the row-span
+              #    cell is larger than the sum of the row heights, we proportionally enlarge the
+              #    stored height of each spanned row and subtract the difference from the available
+              #    height for the next pass. If the row span contains initially zero-height rows,
+              #    only those rows are enlarged. Row-span cells themselves are not updated at this
+              #    point!
+              row_spans.each do |cell|
+                upper_row_index = cell.row + cell.row_span - 1
+                next unless upper_row_index == row_index
+
+                rows = cell.row.upto(upper_row_index)
+                row_span_height = rows.sum {|ri| row_heights[ri] }
+                if row_span_height < cell.preferred_height
+                  zero_height_rows_in_span = rows.select {|ri| zero_height_rows[ri] }
+                  rows = zero_height_rows_in_span if zero_height_rows_in_span.size > 0
+                  adjustment = (cell.preferred_height - row_span_height) / rows.size.to_f
+                  rows.each {|ri| row_heights[ri] += adjustment }
+                  available_height -= cell.preferred_height - row_span_height
+                end
+              end
             else
               last_fitted_row_index = columns.min_by(&:row).row - 1 if height != available_height
               break
             end
           end
 
+          if last_fitted_row_index >= 0
+            # 4. Once all possible rows have been fitted and the heights of the rows are fixed, the
+            #    final height and top-left corner of each cell needs to be set.
+            running_height = 0
+            @cells[start_row..last_fitted_row_index].each.with_index(start_row) do |columns, row_index|
+              columns.each_with_index do |cell, col_index|
+                next if cell.row != row_index || cell.column != col_index
+                cell.left = column_info[cell.column].first
+                cell.top = running_height
+                if cell.row_span == 1
+                  cell.update_height(row_heights[row_index])
+                else
+                  new_height = cell.row.upto(cell.row + cell.row_span - 1).sum {|ri| row_heights[ri] }
+                  cell.update_height(new_height)
+                end
+              end
+              running_height += row_heights[row_index]
+            end
+          end
+
           [height - available_height, last_fitted_row_index < start_row ? -1 : last_fitted_row_index]
         end
 

data/lib/hexapdf/task/optimize.rb

@@ -214,13 +214,13 @@ module HexaPDF
         end
       end
 
-      # Deletes field entries of the object that are optional and currently set to their default
-      # value.
+      # Deletes field entries (except for /Type) of the object that are optional and currently set
+      # to their default value.
       def self.delete_fields_with_defaults(obj)
         return unless obj.kind_of?(HexaPDF::Dictionary) && !obj.null?
         obj.each do |name, value|
-          if (field = obj.class.field(name)) && !field.required? && field.default? &&
-              value == field.default
+          if name != :Type && (field = obj.class.field(name)) && !field.required? &&
+             field.default? && value == field.default
             obj.delete(name)
           end
         end

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

@@ -134,11 +134,12 @@ module HexaPDF
           if !normal_appearance.kind_of?(HexaPDF::Dictionary) || normal_appearance.kind_of?(HexaPDF::Stream)
             (@widget[:AP] ||= {})[:N] = {Off: nil}
             normal_appearance = @widget[:AP][:N]
-            normal_appearance[@field[:V] == :Off ? :Yes : @field[:V]] = nil
+            normal_appearance[@field.field_value&.to_sym || :Yes] = nil
           end
           on_name = (normal_appearance.value.keys - [:Off]).first
           unless on_name
-            raise HexaPDF::Error, "Widget of button field doesn't define name for on state"
+            on_name = @field.field_value&.to_sym || :Yes
+            normal_appearance[on_name] = nil
           end
 
           @widget[:AS] = (@field[:V] == on_name ? on_name : :Off)
@@ -226,8 +227,11 @@ module HexaPDF
 
           form = (@widget[:AP] ||= {})[:N] ||= @document.add({Type: :XObject, Subtype: :Form})
           # Wrap existing object in Form class in case the PDF writer didn't include the /Subtype
-          # key; we can do this since we know this has to be a Form object
-          form = @document.wrap(form, type: :XObject, subtype: :Form) unless form[:Subtype] == :Form
+          # key or the type of the object is wrong; we can do this since we know this has to be a
+          # Form object
+          unless form.type == :XObject && form[:Subtype] == :Form
+            form = @document.wrap(form, type: :XObject, subtype: :Form)
+          end
           form.value.replace({Type: :XObject, Subtype: :Form, BBox: [0, 0, width, height],
                               Matrix: matrix, Resources: HexaPDF::Object.deep_copy(default_resources)})
           form.contents = ''

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

@@ -186,9 +186,14 @@ module HexaPDF
         #     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 will be an error when trying to generate a visual representation of
-        #     the field value.
+        #     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.
         #
         # +font_options+::
         #     A hash with font options like :variant that should be used.
@@ -625,8 +630,6 @@ module HexaPDF
             if font_name && !(self[:DR][:Font] && self[:DR][:Font][font_name])
               yield("The font specified in /DA is not in the /DR resource dictionary")
             end
-          else
-            set_default_appearance_string
           end
 
           create_appearances if document.config['acro_form.create_appearances']

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

@@ -199,7 +199,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

@@ -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/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/version.rb

@@ -37,6 +37,6 @@
 module HexaPDF
 
   # The version of HexaPDF.
-  VERSION = '0.46.0'
+  VERSION = '0.47.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

data/test/data/standard-security-handler/bothpwd-aes-256bit-V5-R5.pdf

@@ -0,0 +1,43 @@
+%PDF-1.7
+%����
+1 0 obj
+<< /Extensions << /ADBE << /BaseVersion /1.7 /ExtensionLevel 3 >> >> /Pages 3 0 R /Type /Catalog >>
+endobj
+2 0 obj
+<< /ModDate <aa1d1637459ea17c7fc9709f0c0c7b64761ff74e905b3765f33425776aa3010163cd5e898cfa7c5fc16159359375c323> >>
+endobj
+3 0 obj
+<< /Count 1 /Kids [ 4 0 R ] /MediaBox [ 0 0 612 446 ] /Type /Pages >>
+endobj
+4 0 obj
+<< /Contents 5 0 R /Parent 3 0 R /Resources 6 0 R /Type /Page >>
+endobj
+5 0 obj
+<< /Length 80 /Filter /FlateDecode >>
+stream
+J<~S�)��9�M�$S�z��g�j���r�.R�"PO���_���X���^�GP�&z�g�*$�2SΈ�z�Kl��5ĩendstream
+endobj
+6 0 obj
+<< /Font << /F1 7 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+7 0 obj
+<< /BaseFont /Helvetica /Name /F1 /Subtype /Type1 /Type /Font >>
+endobj
+8 0 obj
+<< /CF << /StdCF << /AuthEvent /DocOpen /CFM /AESV3 /Length 32 >> >> /Filter /Standard /Length 256 /O <c60934c0925e8d3ceebd0609102d9407dcf22d7fb3d87d030fce633af6d2ed99c1c3382bee5e8afc0d55ff8bca441d48> /OE <3fa2e3ecf34ddcb38b44af372a43268dda32111f58dc79da74d960b8fa206ead> /P -4 /Perms <b6c6ab65529f0a3322f03909e8a5547a> /R 5 /StmF /StdCF /StrF /StdCF /U <18fbd94777c28531c495a3116d273de9f8f3ed338b31c07687ca0ba06812842843765a66484d098194bcef0f9ecaaace> /UE <496a81bbb3207dfd12ddca4c16b60a411c6a18e638205824295e09afde826b4a> /V 5 >>
+endobj
+xref
+0 9
+0000000000 65535 f 
+0000000015 00000 n 
+0000000130 00000 n 
+0000000259 00000 n 
+0000000344 00000 n 
+0000000424 00000 n 
+0000000574 00000 n 
+0000000641 00000 n 
+0000000721 00000 n 
+trailer << /Info 2 0 R /Root 1 0 R /Size 9 /ID [<6790ffa610024e78369114311fc0df96><ed6c0810cb0d19599ac62042a0487749>] /Encrypt 8 0 R >>
+startxref
+1268
+%%EOF

data/test/data/standard-security-handler/nopwd-aes-256bit-V5-R5.pdf

@@ -0,0 +1,44 @@
+%PDF-1.7
+%����
+1 0 obj
+<< /Extensions << /ADBE << /BaseVersion /1.7 /ExtensionLevel 3 >> >> /Pages 3 0 R /Type /Catalog >>
+endobj
+2 0 obj
+<< /ModDate <0a09febf75d913e5eff6197f52f28b31321a43f49e0735a25a93dd77b1a2701e73ae05be0803747ca030ee4917544cbb> >>
+endobj
+3 0 obj
+<< /Count 1 /Kids [ 4 0 R ] /MediaBox [ 0 0 612 446 ] /Type /Pages >>
+endobj
+4 0 obj
+<< /Contents 5 0 R /Parent 3 0 R /Resources 6 0 R /Type /Page >>
+endobj
+5 0 obj
+<< /Length 80 /Filter /FlateDecode >>
+stream
+\��sy%1����a��
+�/���F�.�L:pb���C�`��D�5 �� �کU"�ʇ�3�Fy/�9�<V��ڦ;�?5�S�8endstream
+endobj
+6 0 obj
+<< /Font << /F1 7 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+7 0 obj
+<< /BaseFont /Helvetica /Name /F1 /Subtype /Type1 /Type /Font >>
+endobj
+8 0 obj
+<< /CF << /StdCF << /AuthEvent /DocOpen /CFM /AESV3 /Length 32 >> >> /Filter /Standard /Length 256 /O <8034f99b1eff9e91054d7ee490155e22f65170f607d6a614236b089e602517d9a22abe7c1ea53f52dbc9ae8d9701a065> /OE <bdc5c4b46519af7b4041b7341f70e4d8b1c6087dc12d3f16f060313f18e73386> /P -4 /Perms <64028d6bceb0d927477ecf45e6be7f3f> /R 5 /StmF /StdCF /StrF /StdCF /U <5db7b7b5bd8bbe9fac28477756a930cb079e1dcbdcd3b50c1817d3de4ce5184b5189848832df0043f8e1fe19ff696a36> /UE <dc3fed7b473148238ba0689409edd3d80c91bd26802003c152594aa27a50a81e> /V 5 >>
+endobj
+xref
+0 9
+0000000000 65535 f 
+0000000015 00000 n 
+0000000130 00000 n 
+0000000259 00000 n 
+0000000344 00000 n 
+0000000424 00000 n 
+0000000574 00000 n 
+0000000641 00000 n 
+0000000721 00000 n 
+trailer << /Info 2 0 R /Root 1 0 R /Size 9 /ID [<6790ffa610024e78369114311fc0df96><da8e0d03302398724f68ef24a831285e>] /Encrypt 8 0 R >>
+startxref
+1268
+%%EOF

data/test/data/standard-security-handler/ownerpwd-aes-256bit-V5-R5.pdf

@@ -0,0 +1,43 @@
+%PDF-1.7
+%����
+1 0 obj
+<< /Extensions << /ADBE << /BaseVersion /1.7 /ExtensionLevel 3 >> >> /Pages 3 0 R /Type /Catalog >>
+endobj
+2 0 obj
+<< /ModDate <d2aa32b8d87666bd29df499a424d2e6d23c0b475ebb67598733b5f06429470a37062d3d6a32fc9603301c5eb99a20605> >>
+endobj
+3 0 obj
+<< /Count 1 /Kids [ 4 0 R ] /MediaBox [ 0 0 612 446 ] /Type /Pages >>
+endobj
+4 0 obj
+<< /Contents 5 0 R /Parent 3 0 R /Resources 6 0 R /Type /Page >>
+endobj
+5 0 obj
+<< /Length 80 /Filter /FlateDecode >>
+stream
+ j��D3�(���"�ڛ�������xvY$B\4^Y����$��
+endobj
+6 0 obj
+<< /Font << /F1 7 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+7 0 obj
+<< /BaseFont /Helvetica /Name /F1 /Subtype /Type1 /Type /Font >>
+endobj
+8 0 obj
+<< /CF << /StdCF << /AuthEvent /DocOpen /CFM /AESV3 /Length 32 >> >> /Filter /Standard /Length 256 /O <95d20f6277a6955bf4bda243c2144e94889bd5fa4225a4cf4e0d496fa1ffa1d991e1a37d46e4afe9e2dfc207eba9ec53> /OE <432a7d086b4338f1020bbc5847e6dd4f49ce586ab2c5de0f5301450e45e3bb3e> /P -4 /Perms <7df865105074d365f2ce50407e8b6dc8> /R 5 /StmF /StdCF /StrF /StdCF /U <930a631e8b2b95ff6b024e9bde92cb73c5c43f0106ec4fb1c336e49608c0740d87395c6ea79b99ee07eeae5ffbacd031> /UE <3f7eb6b9a897049bfca85a5ae71470eca3dfedbe9101e8532b217e4d95bcf51a> /V 5 >>
+endobj
+xref
+0 9
+0000000000 65535 f 
+0000000015 00000 n 
+0000000130 00000 n 
+0000000259 00000 n 
+0000000344 00000 n 
+0000000424 00000 n 
+0000000574 00000 n 
+0000000641 00000 n 
+0000000721 00000 n 
+trailer << /Info 2 0 R /Root 1 0 R /Size 9 /ID [<6790ffa610024e78369114311fc0df96><dd2e6bd65a9735c0bef37d88d5291ff1>] /Encrypt 8 0 R >>
+startxref
+1268
+%%EOF

data/test/hexapdf/digital_signature/test_signatures.rb

@@ -16,13 +16,13 @@ describe HexaPDF::DigitalSignature::Signatures do
 
   it "iterates over all signature dictionaries" do
     assert_equal([], @doc.signatures.to_a)
-    @sig1.field_value = :sig1
-    @sig2.field_value = :sig2
-    assert_equal([:sig1, :sig2], @doc.signatures.to_a)
+    @sig1.field_value = {k: :sig1}
+    @sig2.field_value = {k: :sig2}
+    assert_equal([{k: :sig1}, {k: :sig2}], @doc.signatures.to_a)
   end
 
   it "returns the number of signature dictionaries" do
-    @sig1.field_value = :sig1
+    @sig1.field_value = {k: :sig1}
     assert_equal(1, @doc.signatures.count)
   end
 

data/test/hexapdf/encryption/test_standard_security_handler.rb

@@ -228,11 +228,14 @@ describe HexaPDF::Encryption::StandardSecurityHandler do
     end
 
     it "fails if the /R value is incorrect" do
+      HexaPDF::Encryption::StandardEncryptionDictionary.field(:R).allowed_values << 7
       exp = assert_raises(HexaPDF::UnsupportedEncryptionError) do
-        @handler.set_up_decryption({Filter: :Standard, V: 2, R: 5, O: 't' * 32, U: 't' * 32, P: 0,
+        @handler.set_up_decryption({Filter: :Standard, V: 2, R: 7, O: 't' * 32, U: 't' * 32, P: 0,
                                     Length: 128})
       end
-      assert_match(/Invalid \/R value 5/i, exp.message)
+      assert_match(/Invalid \/R value 7/i, exp.message)
+    ensure
+      HexaPDF::Encryption::StandardEncryptionDictionary.field(:R).allowed_values.pop
     end
 
     it "fails if the supplied password is invalid" do

data/test/hexapdf/layout/test_table_box.rb

@@ -511,6 +511,58 @@ describe HexaPDF::Layout::TableBox do
                  [0, 66, 39.75, 22], [39.75, 66, 39.75, 22], [79.5, 44, 39.75, 44], [119.25, 66, 39.75, 22]])
     end
 
+    describe "row spans" do
+      # ----------
+      # | a | b  |
+      # | a |    |
+      # | a |----|
+      # | a | c  |
+      # | a |    |
+      # ----------
+      it "works if content of a row span cell is larger than the rows" do
+        cells = [[{row_span: 2, content: @fixed_size_boxes[0..2]}, @fixed_size_boxes[3]],
+                 [@fixed_size_boxes[4]]]
+        check_box(create_box(cells: cells, cell_style: {padding: 0, border: {width: 0}}),
+                  :success, 160, 30,
+                  [[0, 0, 80, 30], [80, 0, 80, 15], [0, 0, 80, 30], [80, 15, 80, 15]])
+      end
+
+      # ----------
+      # | a | b  |
+      # |   |----|
+      # |   | c  |
+      # ----------
+      it "works if content of a row span cell is smaller than the rows" do
+        cells = [[{row_span: 2, content: @fixed_size_boxes[0]}, @fixed_size_boxes[3]],
+                 [@fixed_size_boxes[4]]]
+        check_box(create_box(cells: cells, cell_style: {padding: 0, border: {width: 0}}),
+                  :success, 160, 20,
+                  [[0, 0, 80, 20], [80, 0, 80, 10], [0, 0, 80, 20], [80, 10, 80, 10]])
+      end
+
+      # -----------------
+      # | a | b | c | d |
+      # | a | b |---| d |
+      # | a | b | e |   |
+      # | a |   | e |   |
+      # --------| e |   |
+      # | f | g | e |   |
+      # ----------------
+      it "works if multiple, possibly overlapping row spans are involved" do
+        cells = [[{row_span: 2, content: @fixed_size_boxes[0..2]},
+                  {row_span: 2, content: @fixed_size_boxes[3..4]},
+                  @fixed_size_boxes[5],
+                  {row_span: 3, content: @fixed_size_boxes[6..7]}],
+                 [{row_span: 2, content: @fixed_size_boxes[8, 3]}],
+                 [@fixed_size_boxes[11], @fixed_size_boxes[12]]]
+        check_box(create_box(cells: cells, cell_style: {padding: 0, border: {width: 0}}),
+                  :success, 160, 40,
+                  [[0, 0, 40, 30], [40, 0, 40, 30], [80, 0, 40, 10], [120, 0, 40, 40],
+                   [0, 0, 40, 30], [40, 0, 40, 30], [80, 10, 40, 30], [120, 0, 40, 40],
+                   [0, 30, 40, 10], [40, 30, 40, 10], [80, 10, 40, 30], [120, 0, 40, 40]])
+      end
+    end
+
     it "fits a table with header rows" do
       result = [[0, 0, 80, 10], [80, 0, 80, 10], [0, 10, 80, 10], [80, 10, 80, 10]]
       header = lambda {|_| [@fixed_size_boxes[10, 2], @fixed_size_boxes[12, 2]] }

data/test/hexapdf/task/test_optimize.rb

@@ -8,6 +8,7 @@ describe HexaPDF::Task::Optimize do
   class TestType < HexaPDF::Dictionary
 
     define_type :Test
+    define_field :Type, type: Symbol, default: type
     define_field :Optional, type: Symbol, default: :Optional
 
   end
@@ -46,6 +47,7 @@ describe HexaPDF::Task::Optimize do
   end
 
   def assert_default_deleted
+    assert(@doc.object(1).key?(:Type))
     refute(@doc.object(1).key?(:Optional))
   end
 

data/test/hexapdf/test_document.rb

@@ -497,10 +497,10 @@ describe HexaPDF::Document do
 
     it "returns all signature fields of the document" do
       form = @doc.acro_form(create: true)
-      sig1 = @doc.add({FT: :Sig, T: 'sig1', V: :sig1})
-      sig2 = @doc.add({FT: :Sig, T: 'sig2', V: :sig2})
+      sig1 = @doc.add({FT: :Sig, T: 'sig1', V: {k: :sig1}})
+      sig2 = @doc.add({FT: :Sig, T: 'sig2', V: {k: :sig2}})
       form.root_fields << sig1 << sig2
-      assert_equal([:sig1, :sig2], @doc.signatures.to_a)
+      assert_equal([{k: :sig1}, {k: :sig2}], @doc.signatures.to_a)
     end
 
     it "allows to conveniently sign a document" do

data/test/hexapdf/test_importer.rb

@@ -147,6 +147,13 @@ describe HexaPDF::Importer do
       assert_nil(obj[:pages])
     end
 
+    it "handles null values correctly" do
+      @source.add(@hash)
+      @source.delete(@hash)
+      obj = @importer.import(@obj)
+      assert_nil(obj[:hash])
+    end
+
     it "imports Page objects correctly by copying the inherited values" do
       page = @importer.import(@source.pages[0])
       assert_equal(90, page[:Rotate])

data/test/hexapdf/test_writer.rb

@@ -64,7 +64,7 @@ describe HexaPDF::Writer do
       20
       endobj
       3 0 obj
-      <</Type/XRef/Size 6/W[1 1 2]/Index[0 4 5 1]/Filter/FlateDecode/DecodeParms<</Columns 4/Predictor 12>>/Length 31>>stream
+      <</Size 6/Type/XRef/W[1 1 2]/Index[0 4 5 1]/Filter/FlateDecode/DecodeParms<</Columns 4/Predictor 12>>/Length 31>>stream
       x\xDAcb`\xF8\xFF\x9F\x89\x89\x95\x91\x91\xE9\x7F\x19\x03\x03\x13\x83\x10\x88he`\x00\x00B4\x04\x1E
       endstream
       endobj
@@ -80,7 +80,7 @@ describe HexaPDF::Writer do
       endstream
       endobj
       4 0 obj
-      <</Type/XRef/Size 7/Root<</Type/Catalog>>/Info 6 0 R/Prev 141/W[1 2 2]/Index[2 1 4 1 6 1]/Filter/FlateDecode/DecodeParms<</Columns 5/Predictor 12>>/Length 22>>stream
+      <</Size 7/Root<</Type/Catalog>>/Info 6 0 R/Prev 141/Type/XRef/W[1 2 2]/Index[2 1 4 1 6 1]/Filter/FlateDecode/DecodeParms<</Columns 5/Predictor 12>>/Length 22>>stream
       x\xDAcbdlg``b`\xB0\x04\x93\x93\x18\x18\x00\f\e\x01[
       endstream
       endobj
@@ -270,4 +270,13 @@ describe HexaPDF::Writer do
     doc = HexaPDF::Document.new(io: io)
     refute(doc.trailer.key?(:XRefStm))
   end
+
+  it "removes the /Type entry in a non-xref stream trailer" do
+    io = StringIO.new
+    doc = HexaPDF::Document.new
+    doc.trailer[:Type] = :XRef
+    doc.write(io)
+    doc = HexaPDF::Document.new(io: io)
+    refute(doc.trailer.key?(:Type))
+  end
 end

data/test/hexapdf/type/acro_form/test_appearance_generator.rb

@@ -291,6 +291,22 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
         assert_equal(:XObject, @widget[:AP][:N][:Other].type)
       end
 
+      it "uses the field's value or :Yes for the on state if the appearance dictionary doesn't contain a name for it" do
+        @widget[:AP][:N].delete(:Yes)
+        @generator.create_appearances
+        assert_equal(:XObject, @widget[:AP][:N][:Yes].type)
+
+        @widget[:AP][:N].delete(:Yes)
+        @field[:V] = nil
+        @generator.create_appearances
+        assert_equal(:XObject, @widget[:AP][:N][:Yes].type)
+
+        @widget[:AP][:N].delete(:Yes)
+        @field[:V] = "other"   # some PDFs use a string instead of the correct symbol
+        @generator.create_appearances
+        assert_equal(:XObject, @widget[:AP][:N][:other].type)
+      end
+
       it "creates the needed appearance streams" do
         @widget[:AP][:N].delete(:Off)
         @generator.create_appearances
@@ -327,11 +343,6 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
                           [:end_text],
                           [:restore_graphics_state]])
       end
-
-      it "fails if the appearance dictionary doesn't contain a name for the on state" do
-        @widget[:AP][:N].delete(:Yes)
-        assert_raises(HexaPDF::Error) { @generator.create_appearances }
-      end
     end
 
     describe "radio button" do
@@ -441,6 +452,12 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
       assert_equal(form, @widget[:AP][:N])
       refute(form.key?(:key))
       assert_match(/test1/, form.contents)
+
+      form.delete(:Type)
+      @widget[:AP][:N] = @doc.wrap(form, type: HexaPDF::Type::Annotation)
+      @field[:V] = 'test2'
+      @generator.create_appearances
+      assert_match(/test2/, form.contents)
     end
 
     describe "takes the rotation into account" do

data/test/hexapdf/type/acro_form/test_form.rb

@@ -507,11 +507,6 @@ describe HexaPDF::Type::AcroForm::Form do
       assert(@acro_form.validate)
     end
 
-    it "set the default appearance string, though optional, to a valid value to avoid problems" do
-      assert(@acro_form.validate)
-      assert_equal("0.0 g /F1 0 Tf", @acro_form[:DA])
-    end
-
     describe "field hierarchy validation" do
       before do
         @acro_form[:Fields] = [

data/test/hexapdf/type/acro_form/test_signature_field.rb

@@ -31,7 +31,9 @@ describe HexaPDF::Type::AcroForm::SignatureField do
 
   it "gets the field value" do
     @field[:V] = {Empty: :True}
-    assert_equal({Empty: :True}, @field.field_value.value)
+    value = @field.field_value
+    assert_kind_of(HexaPDF::DigitalSignature::Signature, value)
+    assert_equal({Empty: :True}, value)
   end
 
   it "validates the value of the /FT field" do

data/test/hexapdf/type/acro_form/test_variable_text_field.rb

@@ -102,9 +102,22 @@ describe HexaPDF::Type::AcroForm::VariableTextField do
                    @field.parse_default_appearance_string)
     end
 
-    it "fails if no /DA value is set" do
+    it "sets a standard /DA value if no other /DA is found" do
       @doc.acro_form.delete(:DA)
+      assert_equal([:F1, 0, HexaPDF::Content::ColorSpace.prenormalized_device_color([0])],
+                   @field.parse_default_appearance_string)
+    end
+
+    it "converts the /DA to a string in case an invalid PDF uses a Symbol" do
+      @field[:DA] = :"1 g /F1 20 Tf"
+      assert_equal([:F1, 20, @color], @field.parse_default_appearance_string)
+    end
+
+    it "fails if no /DA value is set and no default appearance string should be set" do
+      @doc.acro_form.delete(:DA)
+      @doc.config['acro_form.fallback_default_appearance'] = nil
       assert_raises(HexaPDF::Error) { @field.parse_default_appearance_string }
     end
+
   end
 end

data/test/hexapdf/type/annotations/test_widget.rb

@@ -194,6 +194,8 @@ describe HexaPDF::Type::Annotations::Widget do
 
       it "returns the default size if none is set" do
         assert_equal(0, @widget.marker_style.size)
+        @widget.form_field[:DA] = "0.0 g"
+        assert_equal(0, @widget.marker_style.size)
       end
 
       it "sets the given size" do
@@ -212,6 +214,8 @@ describe HexaPDF::Type::Annotations::Widget do
 
       it "returns the default color if none is set" do
         assert_equal([0], @widget.marker_style.color.components)
+        @widget.form_field[:DA] = "/ZaDb 10 Tfg"
+        assert_equal([0], @widget.marker_style.color.components)
       end
 
       it "sets the given color" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.46.0
+  version: 0.47.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-11 00:00:00.000000000 Z
+date: 2024-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -594,21 +594,25 @@ files:
 - test/data/minimal.pdf
 - test/data/standard-security-handler/README
 - test/data/standard-security-handler/bothpwd-aes-128bit-V4.pdf
+- test/data/standard-security-handler/bothpwd-aes-256bit-V5-R5.pdf
 - test/data/standard-security-handler/bothpwd-aes-256bit-V5.pdf
 - test/data/standard-security-handler/bothpwd-arc4-128bit-V2.pdf
 - test/data/standard-security-handler/bothpwd-arc4-128bit-V4.pdf
 - test/data/standard-security-handler/bothpwd-arc4-40bit-V1.pdf
 - test/data/standard-security-handler/nopwd-aes-128bit-V4.pdf
+- test/data/standard-security-handler/nopwd-aes-256bit-V5-R5.pdf
 - test/data/standard-security-handler/nopwd-aes-256bit-V5.pdf
 - test/data/standard-security-handler/nopwd-arc4-128bit-V2.pdf
 - test/data/standard-security-handler/nopwd-arc4-128bit-V4.pdf
 - test/data/standard-security-handler/nopwd-arc4-40bit-V1.pdf
 - test/data/standard-security-handler/ownerpwd-aes-128bit-V4.pdf
+- test/data/standard-security-handler/ownerpwd-aes-256bit-V5-R5.pdf
 - test/data/standard-security-handler/ownerpwd-aes-256bit-V5.pdf
 - test/data/standard-security-handler/ownerpwd-arc4-128bit-V2.pdf
 - test/data/standard-security-handler/ownerpwd-arc4-128bit-V4.pdf
 - test/data/standard-security-handler/ownerpwd-arc4-40bit-V1.pdf
 - test/data/standard-security-handler/userpwd-aes-128bit-V4.pdf
+- test/data/standard-security-handler/userpwd-aes-256bit-V5-R5.pdf
 - test/data/standard-security-handler/userpwd-aes-256bit-V5.pdf
 - test/data/standard-security-handler/userpwd-arc4-128bit-V2.pdf
 - test/data/standard-security-handler/userpwd-arc4-128bit-V4.pdf