hexapdf 0.15.7 → 0.17.0

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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
@@ -50,12 +50,29 @@ module HexaPDF
       # methods on the main Form instance (HexaPDF::Document#acro_form). By using those methods,
       # everything needed is automatically set up.
       #
+      # Radio buttons are widgets of a single radio button field. This is also called a radio button
+      # group. Of the radio button group only one radio button (= widget of the radio button field)
+      # may be selected at all times. Each widget must have a different value to be distinguishable;
+      # otherwise the widgets with the same value represent the same thing. Although there is the
+      # +no_toggle_to_off+ field flag, no PDF viewer implements that; one needs to use check boxes
+      # for this feature.
+      #
+      # Check boxes can be toggled on and off. One check box field may have multiple widgets. If
+      # those widgets have the same value, they will all be toggled on or off simultaneously.
+      # Otherwise only one of those widgets will be toggled on while the others are off. In such a
+      # case the check box fields acts like a radio button group, with the additional feature that
+      # no check box may be selected.
+      #
       # == Type Specific Field Flags
       #
       # :no_toggle_to_off:: Only used with radio buttons fields. If this flag is set, one button
       #                     needs to be selected at all times. Otherwise, clicking on the selected
       #                     button deselects it.
       #
+      #                     Note: This deselectiong is not implemented in *any* tested PDF viewer. A
+      #                     work-around is to use multiple check box widgets with different on
+      #                     names.
+      #
       # :radio:: If this flag is set, the field is a set of radio buttons. Otherwise it is a check
       #          box. Additionally, the :pushbutton flag needs to be clear.
       #
@@ -131,8 +148,8 @@ module HexaPDF
         #
         # Push buttons:: They don't have a value, so +nil+ is always returned.
         #
-        # Check boxes:: For check boxes that are in the on state the value +true+ is returned.
-        #               Otherwise +false+ is returned.
+        # Check boxes:: For check boxes that are checked the value of the specific check box that is
+        #               checked is returned. Otherwise +nil+ is returned.
         #
         # Radio buttons:: If no radio button is selected, +nil+ is returned. Otherwise the value (a
         #                 Symbol) of the specific radio button that is selected is returned.
@@ -145,8 +162,11 @@ module HexaPDF
         # Push buttons:: Since push buttons don't store any value, the given value is ignored and
         #                nothing is stored for them (e.g a no-op).
         #
-        # Check boxes:: Use +true+ for checking the box, i.e. toggling it to the on state, and
-        #               +false+ for unchecking it.
+        # Check boxes:: Provide +nil+ or +false+ as value to toggle all check box widgets off. If
+        #               there is only one possible value, +true+ may be used for checking the box,
+        #               i.e. toggling it to the on state. Otherwise provide the value (a Symbol or
+        #               an object responding to +#to_sym+) of the check box widget that should be
+        #               toggled on.
         #
         # Radio buttons:: To turn all radio buttons off, provide +nil+ as value. Otherwise provide
         #                 the value (a Symbol or an object responding to +#to_sym+) of a radio
@@ -180,20 +200,16 @@ module HexaPDF
           end
         end
 
-        # Returns the name (a Symbol) used for setting the check box to the on state.
+        # Returns the array of Symbol values (minus the /Off value) that can be used for the field
+        # value for check boxes or radio buttons.
         #
-        # Defaults to :Yes if no other name could be determined.
-        def check_box_on_name
-          each_widget.to_a.first&.appearance_dict&.normal_appearance&.value&.each_key&.
-            find {|key| key != :Off } || :Yes
-        end
-
-        # Returns the array of Symbol values that can be used for the field value of the radio
-        # button.
-        def radio_button_values
-          each_widget.map do |widget|
-            widget.appearance_dict&.normal_appearance&.value&.each_key&.find {|key| key != :Off }
-          end.compact
+        # Note that this will only return useful values if there is at least one correctly set-up
+        # widget.
+        def allowed_values
+          (each_widget.each_with_object([]) do |widget, result|
+             keys = widget.appearance_dict&.normal_appearance&.value&.keys
+             result.concat(keys) if keys
+           end - [:Off]).uniq
         end
 
         # Creates a widget for the button field.
@@ -205,12 +221,14 @@ module HexaPDF
         # the value (a Symbol or an object responding to +#to_sym+) this widget represents. It can
         # be used with #field_value= to set this specific widget of the radio button set to on.
         #
+        # The +value+ is optional for check box fields; if not specified, the default of :Yes will
+        # be used.
+        #
         # See: Field#create_widget, AppearanceGenerator button field methods
         def create_widget(page, defaults: true, value: nil, **values)
           super(page, allow_embedded: !radio_button?, **values).tap do |widget|
-            if check_box?
-              widget[:AP] = {N: {Yes: nil, Off: nil}}
-            elsif radio_button?
+            value = :Yes if check_box? && value.nil?
+            if radio_button? || check_box?
               unless value.respond_to?(:to_sym)
                 raise ArgumentError, "Argument 'value' has to be provided for radio buttons " \
                   "and needs to respond to #to_sym"
@@ -266,9 +284,7 @@ module HexaPDF
         def normalized_field_value(key)
           if push_button?
             nil
-          elsif check_box?
-            self[key] == check_box_on_name
-          elsif radio_button?
+          else
             self[key] == :Off ? nil : self[key]
           end
         end
@@ -279,11 +295,20 @@ module HexaPDF
         # See #field_value= for details.
         def normalized_field_value_set(key, value)
           return if push_button?
-          self[key] = if check_box?
-                        value == true ? check_box_on_name : :Off
-                      elsif value.nil?
+          av = allowed_values
+          self[key] = if value.nil? || value == :Off
                         :Off
-                      elsif radio_button_values.include?(value.to_sym)
+                      elsif check_box?
+                        if value == false
+                          :Off
+                        elsif value == true && av.size == 1
+                          av[0]
+                        elsif av.include?(value.to_sym)
+                          value.to_sym
+                        else
+                          @document.config['acro_form.on_invalid_value'].call(self, value)
+                        end
+                      elsif av.include?(value.to_sym)
                         value.to_sym
                       else
                         @document.config['acro_form.on_invalid_value'].call(self, value)

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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
@@ -247,14 +247,33 @@ module HexaPDF
         #
         # Yields each widget, i.e. visual representation, of this field.
         #
+        # Widgets can be associated to the field in three ways:
+        #
+        # 1. The widget can be embedded in the field itself.
+        # 2. One or more widgets are defined as children of this field.
+        # 3. Widgets of *another field instance with the same full field name*.
+        #
+        # Because of possibility 3 all fields of the form have to be searched to check whether there
+        # is another field with the same full field name.
+        #
         # See: HexaPDF::Type::Annotations::Widget
-        def each_widget # :yields: widget
+        def each_widget(direct_only: false, &block) # :yields: widget
           return to_enum(__method__) unless block_given?
+
           if embedded_widget?
             yield(document.wrap(self))
           elsif terminal_field?
             self[:Kids]&.each {|kid| yield(document.wrap(kid)) }
           end
+
+          unless direct_only
+            my_name = full_field_name
+            document.acro_form&.each_field do |field|
+              next if field.full_field_name != my_name || field == self
+              field.each_widget(direct_only: true, &block)
+            end
+          end
+
           self
         end
 

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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
@@ -96,7 +96,7 @@ module HexaPDF
         def find_root_fields
           result = []
           document.pages.each do |page|
-            page[:Annots]&.each do |annot|
+            page.each_annotation do |annot|
               if !annot.key?(:Parent) && annot.key?(:FT)
                 result << document.wrap(annot, type: :XXAcroFormField, subtype: annot[:FT])
               elsif annot.key?(:Parent)
@@ -157,18 +157,27 @@ 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+ is specified
-        #     but +font+ isn't, the font Helvetica is used.
+        #     The font that should be used for the text of the field. If +font_size+ or
+        #     +font_options+ 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.
+        #
+        # +font_options+::
+        #     A hash with font options like :variant that should be used.
         #
         # +font_size+::
-        #     The font size that should be used. If +font+ is specified but +font_size+ isn't, font
-        #     size defaults to 0 (= auto-sizing).
+        #     The font size that should be used. If +font+ or +font_options+ is specified but
+        #     +font_size+ isn't, font size defaults to 0 (= auto-sizing).
         #
         # +align+::
         #     The alignment of the text, either :left, :center or :right.
-        def create_text_field(name, font: nil, font_size: nil, align: nil)
+        def create_text_field(name, font: nil, font_options: nil, font_size: nil, align: nil)
           create_field(name, :Tx) do |field|
-            apply_variable_text_properties(field, font: font, font_size: font_size, align: align)
+            apply_variable_text_properties(field, font: font, font_options: font_options,
+                                           font_size: font_size, align: align)
           end
         end
 
@@ -179,10 +188,12 @@ module HexaPDF
         #
         # The optional keyword arguments allow setting often used properties of the field, see
         # #create_text_field for details.
-        def create_multiline_text_field(name, font: nil, font_size: nil, align: nil)
+        def create_multiline_text_field(name, font: nil, font_options: nil, font_size: nil,
+                                        align: nil)
           create_field(name, :Tx) do |field|
             field.initialize_as_multiline_text_field
-            apply_variable_text_properties(field, font: font, font_size: font_size, align: align)
+            apply_variable_text_properties(field, font: font, font_options: font_options,
+                                           font_size: font_size, align: align)
           end
         end
 
@@ -196,10 +207,12 @@ module HexaPDF
         #
         # The optional keyword arguments allow setting often used properties of the field, see
         # #create_text_field for details.
-        def create_comb_text_field(name, max_chars:, font: nil, font_size: nil, align: nil)
+        def create_comb_text_field(name, max_chars:, font: nil, font_options: nil, font_size: nil,
+                                   align: nil)
           create_field(name, :Tx) do |field|
             field.initialize_as_comb_text_field
-            apply_variable_text_properties(field, font: font, font_size: font_size, align: align)
+            apply_variable_text_properties(field, font: font, font_options: font_options,
+                                           font_size: font_size, align: align)
             field[:MaxLen] = max_chars
           end
         end
@@ -211,10 +224,11 @@ module HexaPDF
         #
         # The optional keyword arguments allow setting often used properties of the field, see
         # #create_text_field for details.
-        def create_file_select_field(name, font: nil, font_size: nil, align: nil)
+        def create_file_select_field(name, font: nil, font_options: nil, font_size: nil, align: nil)
           create_field(name, :Tx) do |field|
             field.initialize_as_file_select_field
-            apply_variable_text_properties(field, font: font, font_size: font_size, align: align)
+            apply_variable_text_properties(field, font: font, font_options: font_options,
+                                           font_size: font_size, align: align)
           end
         end
 
@@ -225,10 +239,11 @@ module HexaPDF
         #
         # The optional keyword arguments allow setting often used properties of the field, see
         # #create_text_field for details.
-        def create_password_field(name, font: nil, font_size: nil, align: nil)
+        def create_password_field(name, font: nil, font_options: nil, font_size: nil, align: nil)
           create_field(name, :Tx) do |field|
             field.initialize_as_password_field
-            apply_variable_text_properties(field, font: font, font_size: font_size, align: align)
+            apply_variable_text_properties(field, font: font, font_options: font_options,
+                                           font_size: font_size, align: align)
           end
         end
 
@@ -262,15 +277,16 @@ module HexaPDF
         #     If set to +true+, the combo box allows entering an arbitrary value in addition to
         #     selecting one of the provided option items.
         #
-        # +font+, +font_size+ and +align+::
+        # +font+, +font_options+, +font_size+ and +align+::
         #     See #create_text_field
-        def create_combo_box(name, option_items: nil, editable: nil, font: nil, font_size: nil,
-                             align: nil)
+        def create_combo_box(name, option_items: nil, editable: nil, font: nil,
+                             font_options: nil, font_size: nil, align: nil)
           create_field(name, :Ch) do |field|
             field.initialize_as_combo_box
             field.option_items = option_items if option_items
             field.flag(:edit) if editable
-            apply_variable_text_properties(field, font: font, font_size: font_size, align: align)
+            apply_variable_text_properties(field, font: font, font_options: font_options,
+                                           font_size: font_size, align: align)
           end
         end
 
@@ -287,15 +303,16 @@ module HexaPDF
         # +multi_select+::
         #     If set to +true+, the list box allows selecting multiple items instead of only one.
         #
-        # +font+, +font_size+ and +align+::
+        # +font+, +font_options+, +font_size+ and +align+::
         #     See #create_text_field.
-        def create_list_box(name, option_items: nil, multi_select: nil, font: nil, font_size: nil,
-                            align: nil)
+        def create_list_box(name, option_items: nil, multi_select: nil, font: nil,
+                            font_options: nil, font_size: nil, align: nil)
           create_field(name, :Ch) do |field|
             field.initialize_as_list_box
             field.option_items = option_items if option_items
             field.flag(:multi_select) if multi_select
-            apply_variable_text_properties(field, font: font, font_size: font_size, align: align)
+            apply_variable_text_properties(field, font: font, font_options: font_options,
+                                           font_size: font_size, align: align)
           end
         end
 
@@ -402,9 +419,12 @@ module HexaPDF
         end
 
         # Applies the given variable field properties to the field.
-        def apply_variable_text_properties(field, font: nil, font_size: nil, align: nil)
-          if font || font_size
-            field.set_default_appearance_string(font: font || 'Helvetica', font_size: font_size || 0)
+        def apply_variable_text_properties(field, font: nil, font_options: nil, font_size: nil,
+                                           align: nil)
+          if font || font_options || font_size
+            field.set_default_appearance_string(font: font || 'Helvetica',
+                                                font_options: font_options || {},
+                                                font_size: font_size || 0)
           end
           field.text_alignment(align) if align
         end
@@ -417,8 +437,7 @@ module HexaPDF
               yield("When the field /DA is present, the field /DR must also be present")
               return
             end
-            font_name = nil
-            HexaPDF::Content::Parser.parse(da) {|obj, params| font_name = params[0] if obj == :Tf }
+            font_name, _ = VariableTextField.parse_appearance_string(da)
             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

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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
@@ -165,7 +165,7 @@ module HexaPDF
           if flagged?(:password)
             raise HexaPDF::Error, "Storing a field value for a password field is not allowed"
           end
-          str = str.gsub(/[[:space:]]/, ' ') if concrete_field_type == :single_line_text_field
+          str = str.gsub(/[[:space:]]/, ' ') if str && concrete_field_type == :single_line_text_field
           self[:V] = str
           update_widgets
         end

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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
@@ -61,6 +61,16 @@ module HexaPDF
 
         UNSET_ARG = ::Object.new # :nodoc:
 
+        # Parses the given appearance string. If no block is given, the appearance string is
+        # searched for font name and font size both of which are returend. Otherwise the block is
+        # called with each found content stream operator and has to handle them themselves.
+        def self.parse_appearance_string(appearance_string, &block) # :yield: obj, params
+          font_params = nil
+          block ||= lambda {|obj, params| font_params = params.dup if obj == :Tf }
+          HexaPDF::Content::Parser.parse(appearance_string.sub(/\/\//, '/'), &block)
+          font_params
+        end
+
         # :call-seq:
         #   field.text_alignment                -> alignment
         #   field.text_alignment(alignment)     -> field
@@ -93,9 +103,12 @@ module HexaPDF
         #
         # The default argument values are a sane default. If +font_size+ is set to 0, the font size
         # is calculated using the height/width of the field.
-        def set_default_appearance_string(font: 'Helvetica', font_size: 0)
+        #
+        # Use the +font_options+ hash to provide font options like :variant, see
+        # HexaPDF::Document::Fonts#add.
+        def set_default_appearance_string(font: 'Helvetica', font_options: {}, font_size: 0)
           name = document.acro_form(create: true).default_resources.
-            add_font(document.fonts.add(font).pdf_object)
+            add_font(document.fonts.add(font, **font_options).pdf_object)
           self[:DA] = "0 g /#{name} #{font_size} Tf"
         end
 
@@ -107,12 +120,7 @@ module HexaPDF
         def parse_default_appearance_string
           da = self[:DA] || (document.acro_form && document.acro_form[:DA])
           raise HexaPDF::Error, "No default appearance string set" unless da
-
-          font_params = nil
-          HexaPDF::Content::Parser.parse(da) do |obj, params|
-            font_params = params.dup if obj == :Tf
-          end
-          font_params
+          self.class.parse_appearance_string(da)
         end
 
       end

data/lib/hexapdf/type/acro_form.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

data/lib/hexapdf/type/action.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

data/lib/hexapdf/type/actions.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

data/lib/hexapdf/type/annotation.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

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

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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
@@ -308,7 +308,7 @@ module HexaPDF
             size = 0
             color = [0]
             if (da = self[:DA] || field[:DA])
-              HexaPDF::Content::Parser.parse(da) do |obj, params|
+              HexaPDF::Type::AcroForm::VariableTextField.parse_appearance_string(da) do |obj, params|
                 case obj
                 when :rg, :g, :k then color = params.dup
                 when :Tf then size = params[1]

data/lib/hexapdf/type/annotations.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

data/lib/hexapdf/type/catalog.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

data/lib/hexapdf/type/cid_font.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

data/lib/hexapdf/type/embedded_file.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

data/lib/hexapdf/type/file_specification.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

data/lib/hexapdf/type/font.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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

data/lib/hexapdf/type/font_descriptor.rb

@@ -4,7 +4,7 @@
 # This file is part of HexaPDF.
 #
 # HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
-# Copyright (C) 2014-2020 Thomas Leitner
+# Copyright (C) 2014-2021 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