hexapdf 1.2.0 → 1.3.0

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

@@ -0,0 +1,77 @@
+# -*- encoding: utf-8; frozen_string_literal: true -*-
+#
+#--
+# This file is part of HexaPDF.
+#
+# HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
+# Copyright (C) 2014-2025 Thomas Leitner
+#
+# HexaPDF is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3 as
+# published by the Free Software Foundation with the addition of the
+# following permission added to Section 15 as permitted in Section 7(a):
+# FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
+# THOMAS LEITNER, THOMAS LEITNER DISCLAIMS THE WARRANTY OF NON
+# INFRINGEMENT OF THIRD PARTY RIGHTS.
+#
+# HexaPDF is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with HexaPDF. If not, see <http://www.gnu.org/licenses/>.
+#
+# The interactive user interfaces in modified source and object code
+# versions of HexaPDF must display Appropriate Legal Notices, as required
+# under Section 5 of the GNU Affero General Public License version 3.
+#
+# In accordance with Section 7(b) of the GNU Affero General Public
+# License, a covered work must retain the producer line in every PDF that
+# is created or manipulated using HexaPDF.
+#
+# If the GNU Affero General Public License doesn't fit your need,
+# commercial licenses are available at <https://gettalong.at/hexapdf/>.
+#++
+
+require 'hexapdf/type/annotations'
+
+module HexaPDF
+  module Type
+    module Annotations
+
+      # This is the base class for the square and circle markup annotations which display a
+      # rectangle or ellipse inside the annotation rectangle.
+      #
+      # The styling is done through methods included by various modules:
+      #
+      # * Changing the line width, line dash pattern and color is done using the method
+      #   BorderStyling#border_style.  While that method allows special styling of the line (like
+      #   :beveled), only a simple line dash pattern is supported by the square and circle
+      #   annotations.
+      #
+      # * The interior color can be changed through InteriorColor#interior_color.
+      #
+      # * The border effect can be changed through BorderEffect#border_effect. Note that cloudy
+      #   borders are not supported.
+      #
+      # See: PDF2.0 s12.5.6.8, HexaPDF::Type::Annotations::Square,
+      # HexaPDF::Type::Annotations::Circle, HexaPDF::Type::MarkupAnnotation
+      class SquareCircle < MarkupAnnotation
+
+        include BorderStyling
+        include BorderEffect
+        include InteriorColor
+
+        # Field Subtype is defined in the two subclasses
+        define_field :BS, type: :Border
+        define_field :IC, type: PDFArray, version: '1.4'
+        define_field :BE, type: :XXBorderEffect, version: '1.5'
+        # Array instead of Rectangle, see https://github.com/pdf-association/pdf-issues/issues/524
+        define_field :RD, type: PDFArray, version: '1.5'
+
+      end
+
+    end
+  end
+end

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

@@ -124,15 +124,21 @@ module HexaPDF
           end
         end
 
-        # Describes the marker style of a check box or radio button widget.
+        # Describes the marker style of a check box, radio button or push button widget.
         class MarkerStyle
 
-          # The kind of marker that is shown inside the widget. Can either be one of the symbols
-          # +:check+, +:circle+, +:cross+, +:diamond+, +:square+ or +:star+, or a one character
-          # string. The latter is interpreted using the ZapfDingbats font.
+          # The kind of marker that is shown inside the widget.
           #
-          # If an empty string is set, it is treated as if +nil+ was set, i.e. it shows the default
-          # marker for the field type.
+          # Radion buttons and check boxes::
+          #     Can either be one of the symbols +:check+, +:circle+, +:cross+, +:diamond+,
+          #     +:square+ or +:star+, or a one character string. The latter is interpreted using the
+          #     ZapfDingbats font.
+          #
+          #     If an empty string is set, it is treated as if +nil+ was set, i.e. it shows the
+          #     default marker for the field type.
+          #
+          # Push buttons:
+          #     The caption string.
           attr_reader :style
 
           # The size of the marker in PDF points that is shown inside the widget. The special value
@@ -143,27 +149,40 @@ module HexaPDF
           # HexaPDF::Content::ColorSpace.
           attr_reader :color
 
+          # The resource name of the font that should be used for the caption.
+          #
+          # This is only used for push button widgets.
+          attr_reader :font_name
+
           # Creates a new instance with the given values.
-          def initialize(style, size, color)
+          def initialize(style, size, color, font_name)
             @style = style
             @size = size
             @color = color
+            @font_name = font_name
           end
 
         end
 
         # :call-seq:
-        #   widget.marker_style                                     => marker_style
-        #   widget.marker_style(style: nil, size: nil, color: nil)   => widget
+        #   widget.marker_style                                                      => marker_style
+        #   widget.marker_style(style: nil, size: nil, color: nil, font_name: nil)   => widget
         #
         # Returns a MarkerStyle instance representing the marker style of the widget when no
         # argument is given. Otherwise sets the button marker style of the widget and returns self.
         #
-        # This method returns valid information only for check boxes and radio buttons!
+        # This method returns valid information only for check boxes, radio buttons and push buttons!
         #
-        # When setting a marker style, arguments that are not provided will use the default: a black
-        # 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.
+        # When setting a marker style, arguments that are not provided will use the default:
+        #
+        # * For check boxes a black auto-sized checkmark (i.e. :check)
+        # * For radio buttons a black auto-sized circle (i.e. :circle)
+        # * For push buttons a black 9pt empty text using Helvetica
+        #
+        # This also means that multiple invocations will reset *all* prior values.
+        #
+        # Note that the +font_name+ argument must be a valid HexaPDF font name (this is in contrast
+        # to MarkerStyle#font_name which returns the resource name of the font).
         #
         # 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
@@ -171,13 +190,18 @@ module HexaPDF
         # does it).
         #
         # See: PDF2.0 s12.5.6.19 and s12.7.4.3
-        def marker_style(style: nil, size: nil, color: nil)
+        def marker_style(style: nil, size: nil, color: nil, font_name: nil)
           field = form_field
-          if style || size || color
-            style ||= (field.check_box? ? :check : :cicrle)
-            size ||= 0
+          if style || size || color || font_name
+            style ||= case field.concrete_field_type
+                      when :check_box then :check
+                      when :radio_button then :circle
+                      when :push_button then ''
+                      end
+            size ||= (field.push_button? ? 9 : 0)
             color = Content::ColorSpace.device_color_from_specification(color || 0)
             serialized_color = Content::ColorSpace.serialize_device_color(color)
+            font_name ||= 'Helvetica'
 
             self[:MK] ||= {}
             self[:MK][:CA] = case style
@@ -191,7 +215,13 @@ module HexaPDF
                              else
                                raise ArgumentError, "Unknown value #{style} for argument 'style'"
                              end
-            self[:DA] = "/ZaDb #{size} Tf #{serialized_color}".strip
+            self[:DA] = if field.push_button?
+                          name = document.acro_form(create: true).default_resources.
+                            add_font(document.fonts.add(font_name).pdf_object)
+                          "/#{name} #{size} Tf #{serialized_color}".strip
+                        else
+                          "/ZaDb #{size} Tf #{serialized_color}".strip
+                        end
           else
             style = case self[:MK]&.[](:CA)
                     when '4' then :check
@@ -211,12 +241,12 @@ module HexaPDF
             size = 0
             color = HexaPDF::Content::ColorSpace.prenormalized_device_color([0])
             if (da = self[:DA] || field[:DA])
-              _, da_size, da_color = AcroForm::VariableTextField.parse_appearance_string(da)
+              font_name, da_size, da_color = AcroForm::VariableTextField.parse_appearance_string(da)
               size = da_size || size
               color = da_color || color
             end
 
-            MarkerStyle.new(style, size, color)
+            MarkerStyle.new(style, size, color, font_name)
           end
         end
 

data/lib/hexapdf/type/annotations.rb

@@ -51,6 +51,11 @@ module HexaPDF
       autoload(:BorderStyling, 'hexapdf/type/annotations/border_styling')
       autoload(:Line, 'hexapdf/type/annotations/line')
       autoload(:AppearanceGenerator, 'hexapdf/type/annotations/appearance_generator')
+      autoload(:BorderEffect, 'hexapdf/type/annotations/border_effect')
+      autoload(:InteriorColor, 'hexapdf/type/annotations/interior_color')
+      autoload(:SquareCircle, 'hexapdf/type/annotations/square_circle')
+      autoload(:Square, 'hexapdf/type/annotations/square')
+      autoload(:Circle, 'hexapdf/type/annotations/circle')
 
     end
 

data/lib/hexapdf/version.rb

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

data/test/hexapdf/document/test_annotations.rb

@@ -18,6 +18,8 @@ describe HexaPDF::Document::Annotations do
     it "delegates to the actual create_TYPE implementation" do
       annot = @annots.create(:line, @page, start_point: [0, 0], end_point: [10, 10])
       assert_equal(:Line, annot[:Subtype])
+      annot = @annots.create(:rectangle, @page, 10, 20, 30, 40)
+      assert_equal(:Square, annot[:Subtype])
     end
   end
 
@@ -30,4 +32,24 @@ describe HexaPDF::Document::Annotations do
       assert_equal(annot, @page[:Annots].first)
     end
   end
+
+  describe "create_rectangle" do
+    it "creates an appropriate square annotation object" do
+      annot = @annots.create(:rectangle, @page, 10, 20, 30, 40)
+      assert_equal(:Annot, annot[:Type])
+      assert_equal(:Square, annot[:Subtype])
+      assert_equal([10, 20, 40, 60], annot[:Rect])
+      assert_equal(annot, @page[:Annots].first)
+    end
+  end
+
+  describe "create_ellipse" do
+    it "creates an appropriate circle annotation object" do
+      annot = @annots.create(:ellipse, @page, 100, 100, a: 30, b: 40)
+      assert_equal(:Annot, annot[:Type])
+      assert_equal(:Circle, annot[:Subtype])
+      assert_equal([70, 60, 130, 140], annot[:Rect])
+      assert_equal(annot, @page[:Annots].first)
+    end
+  end
 end

data/test/hexapdf/document/test_layout.rb

@@ -146,6 +146,16 @@ describe HexaPDF::Document::Layout do
     end
   end
 
+  describe "style?" do
+    it "returns true if a given style is defined" do
+      assert(@layout.style?(:base))
+    end
+
+    it "returns false if a given style is not defined" do
+      refute(@layout.style?(:unknown))
+    end
+  end
+
   describe "styles" do
     it "returns the existing styles" do
       @layout.style(:test, font_size: 20)
@@ -168,6 +178,16 @@ describe HexaPDF::Document::Layout do
       assert_kind_of(HexaPDF::Font::Type1Wrapper, style.font)
     end
 
+    it "uses the font_bold property when resolving a font name to a font wrapper" do
+      style = @layout.send(:retrieve_style, {font: 'Helvetica', font_bold: true})
+      assert_equal('Helvetica-Bold', style.font.wrapped_font.font_name)
+    end
+
+    it "uses the font_italic property when resolving a font name to a font wrapper" do
+      style = @layout.send(:retrieve_style, {font: 'Helvetica', font_italic: true})
+      assert_equal('Helvetica-Oblique', style.font.wrapped_font.font_name)
+    end
+
     it "sets the :base style's font if no font is set" do
       @layout.style(:base, font: 'Helvetica')
       style = @layout.send(:retrieve_style, {})
@@ -203,7 +223,8 @@ describe HexaPDF::Document::Layout do
 
   describe "box" do
     it "creates the request box" do
-      box = @layout.box(:column, columns: 3, gaps: 20, width: 15, height: 30, style: {font_size: 10},
+      box = @layout.box(:column, columns: 3, width: 15, height: 30,
+                        style: {font_size: 10, box_options: {gaps: 20}},
                         properties: {key: :value})
       assert_equal(15, box.width)
       assert_equal(30, box.height)
@@ -431,9 +452,10 @@ describe HexaPDF::Document::Layout do
 
   describe "table_box" do
     it "creates a table box" do
-      box = @layout.table_box([['m']], column_widths: [100], header: proc { [['a']] },
+      box = @layout.table_box([['m']], header: proc { [['a']] },
                               footer: proc { [['b']] }, cell_style: {background_color: "red"},
                               width: 100, height: 300, style: {background_color: "blue"},
+                              box_options: {column_widths: [100]},
                               properties: {key: :value}, border: {width: 1})
       assert_equal(100, box.width)
       assert_equal(300, box.height)

data/test/hexapdf/font/true_type/test_subsetter.rb

@@ -27,6 +27,16 @@ describe HexaPDF::Font::TrueType::Subsetter do
     assert_equal(value, @subsetter.subset_glyph_id(5))
   end
 
+  it "doesn't use certain subset glyph IDs for performance reasons" do
+    1.upto(93) {|i| @subsetter.use_glyph(i) }
+    # glyph 0, 93 used glyph, 4 special glyphs
+    assert_equal(1 + 93 + 4, @subsetter.instance_variable_get(:@glyph_map).size)
+    1.upto(12) {|i| assert_equal(i, @subsetter.subset_glyph_id(i), "id=#{i}") }
+    13.upto(38) {|i| assert_equal(i + 1, @subsetter.subset_glyph_id(i), "id=#{i}") }
+    39.upto(88) {|i| assert_equal(i + 3, @subsetter.subset_glyph_id(i), "id=#{i}") }
+    89.upto(93) {|i| assert_equal(i + 4, @subsetter.subset_glyph_id(i), "id=#{i}") }
+  end
+
   it "creates the subset font file" do
     gid = @font[:cmap].preferred_table[0x41]
     @subsetter.use_glyph(gid)

data/test/hexapdf/layout/test_style.rb

@@ -738,6 +738,30 @@ describe HexaPDF::Layout::Style do
     end
   end
 
+  describe "each_property" do
+    it "yields all set properties with their values" do
+      @style.font_size = 5
+      @style.line_spacing = 1.2
+      assert_equal(0.005, @style.scaled_font_size)
+      assert_equal([[:font, @style.font], [:font_size, 5], [:horizontal_scaling, 100],
+                    [:line_spacing, @style.line_spacing], [:subscript, false], [:superscript, false]],
+                   @style.each_property.to_a.sort)
+    end
+  end
+
+  describe "merge" do
+    it "merges all set properties" do
+      @style.font_size = 5
+      @style.line_spacing = 1.2
+      new_style = HexaPDF::Layout::Style.new
+      new_style.update(font_size: 3, line_spacing: {type: :fixed, value: 2.5})
+      new_style.merge(@style)
+      assert_equal(5, new_style.font_size)
+      assert_equal(:proportional, new_style.line_spacing.type)
+      assert_equal(1.2, new_style.line_spacing.value)
+    end
+  end
+
   it "has several simple and dynamically generated properties with default values" do
     @style = HexaPDF::Layout::Style.new
     assert_raises(HexaPDF::Error) { @style.font }
@@ -780,6 +804,7 @@ describe HexaPDF::Layout::Style do
     assert_equal(:left, @style.align)
     assert_equal(:top, @style.valign)
     assert_equal(:default, @style.mask_mode)
+    assert_equal({}, @style.box_options)
   end
 
   it "allows using a non-standard setter for generated properties" do
@@ -790,8 +815,8 @@ describe HexaPDF::Layout::Style do
     @style.stroke_dash_pattern(5, 2)
     assert_equal([[5], 2], @style.stroke_dash_pattern.to_operands)
 
-    @style.line_spacing(1.2)
-    assert_equal([:proportional, 1.2], [@style.line_spacing.type, @style.line_spacing.value])
+    @style.line_spacing(HexaPDF::Layout::Style::LineSpacing.new(type: :double))
+    assert_equal([:proportional, 2], [@style.line_spacing.type, @style.line_spacing.value])
   end
 
   it "allows checking for valid values" do

data/test/hexapdf/test_composer.rb

@@ -127,6 +127,13 @@ describe HexaPDF::Composer do
     end
   end
 
+  describe "style?" do
+    it "delegates to layout.style?" do
+      @composer.document.layout.style(:header, font_size: 20)
+      assert(@composer.style?(:header))
+    end
+  end
+
   describe "styles" do
     it "delegates to layout.styles" do
       @composer.styles(base: {font_size: 30}, other: {font_size: 40})

data/test/hexapdf/test_object.rb

@@ -197,7 +197,7 @@ describe HexaPDF::Object do
       @obj.define_singleton_method(:perform_validation) { raise "Unknown" }
       invoked = []
       refute(@obj.validate {|*a| invoked << a })
-      assert_equal([["Error: Unexpected value encountered", false, @obj]], invoked)
+      assert_equal([["Unexpected error encountered: Unknown", false, @obj]], invoked)
     end
   end
 

data/test/hexapdf/test_pdf_array.rb

@@ -131,9 +131,42 @@ describe HexaPDF::PDFArray do
     end
   end
 
-  it "allows deleting elements that are selected using a block" do
-    @array.reject! {|item| item == :data }
-    assert_equal([1, "deref", @array[2]], @array[0, 5])
+  describe "reject!" do
+    it "allows deleting elements that are selected using a block" do
+      assert_same(@array, @array.reject! {|item| item == :data })
+      assert_equal([1, "deref", @array[2]], @array.to_a)
+    end
+
+    it "returns nil if no elements were deleted" do
+      assert_nil(@array.reject! {|item| false })
+    end
+
+    it "returns an enumerator if no block is given" do
+      assert_kind_of(Enumerator, @array.reject!)
+    end
+  end
+
+  describe "map!" do
+    it "maps elements in-place to the return values of the block" do
+      assert_same(@array, @array.map! {|item| 5 })
+      assert_equal([5, 5, 5, 5], @array.to_a)
+    end
+
+    it "returns an enumerator if no block is given" do
+      assert_kind_of(Enumerator, @array.reject!)
+    end
+  end
+
+  describe "compact!" do
+    it "removes all nil elements and returns self" do
+      @array << nil
+      assert_same(@array, @array.compact!)
+      assert_equal(4, @array.size)
+    end
+
+    it "returns nil if no elements were removed" do
+      assert_nil(@array.compact!)
+    end
   end
 
   describe "index" do

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

@@ -373,12 +373,87 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
     describe "push buttons" do
       before do
         @field.initialize_as_push_button
-        @widget = @field.create_widget(@page, Rect: [0, 0, 0, 0])
+        @widget = @field.create_widget(@page, Rect: [0, 0, 100, 50])
+        @widget.marker_style(style: 'Test')
         @generator = HexaPDF::Type::AcroForm::AppearanceGenerator.new(@widget)
       end
 
-      it "fails because it is not implemented yet" do
-        assert_raises(HexaPDF::Error) { @generator.create_appearances }
+      it "set the print flag on the widgets" do
+        @generator.create_appearances
+        assert(@widget.flagged?(:print))
+      end
+
+      it "removes the hidden flag on the widgets" do
+        @widget.flag(:hidden)
+        @generator.create_appearances
+        refute(@widget.flagged?(:hidden))
+      end
+
+      it "adds an appropriate form XObject" do
+        @generator.create_appearances
+        form = @widget[:AP][:N]
+        assert_equal(:XObject, form.type)
+        assert_equal(:Form, form[:Subtype])
+        assert_equal([0, 0, 100, 50], form[:BBox])
+        assert_equal(@doc.acro_form.default_resources[:Font][:F1], form[:Resources][:Font][:F1])
+      end
+
+      it "re-uses the existing form XObject" do
+        @generator.create_appearances
+        form = @widget[:AP][:N]
+        form[:key] = :value
+        form.delete(:Subtype)
+        @widget[:AP][:N] = @doc.wrap(form, type: HexaPDF::Dictionary)
+
+        @generator.create_appearances
+        assert_equal(form, @widget[:AP][:N])
+        refute(form.key?(:key))
+      end
+
+      describe "takes the rotation into account" do
+        def check_rotation(angle, width, height, matrix)
+          @widget[:MK][:R] = angle
+          @generator.create_appearances
+          form = @widget[:AP][:N]
+          assert_equal([0, 0, width, height], form[:BBox].value)
+          assert_equal(matrix, form[:Matrix].value)
+        end
+
+        it "works for 0 degrees" do
+          check_rotation(-360, @widget[:Rect].width, @widget[:Rect].height, [1, 0, 0, 1, 0, 0])
+        end
+
+        it "works for 90 degrees" do
+          check_rotation(450, @widget[:Rect].height, @widget[:Rect].width, [0, 1, -1, 0, 0, 0])
+        end
+
+        it "works for 180 degrees" do
+          check_rotation(180, @widget[:Rect].width, @widget[:Rect].height, [0, -1, -1, 0, 0, 0])
+        end
+
+        it "works for 270 degrees" do
+          check_rotation(-90, @widget[:Rect].height, @widget[:Rect].width, [0, -1, 1, 0, 0, 0])
+        end
+      end
+
+      it "adds the button title in the center" do
+        @generator.create_appearances
+        assert_operators(@widget[:AP][:N].stream,
+                         [[:save_graphics_state],
+                          [:set_device_gray_non_stroking_color, [0.5]],
+                          [:append_rectangle, [0, 0, 100, 50]],
+                          [:fill_path_non_zero],
+                          [:append_rectangle, [0.5, 0.5, 99.0, 49.0]],
+                          [:stroke_path],
+                          [:restore_graphics_state],
+                          [:save_graphics_state],
+                          [:set_font_and_size, [:F1, 9]],
+                          [:begin_text],
+                          [:move_text, [41.2475, 22.7005]],
+                          [:show_text, ["Test"]],
+                          [:end_text],
+                          [:restore_graphics_state]],
+                         )
       end
     end
   end

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

@@ -236,6 +236,13 @@ describe HexaPDF::Type::AcroForm::ButtonField do
       assert(widget[:AP][:N][:test])
     end
 
+    it "works for push buttons" do
+      @field.initialize_as_push_button
+      @field.create_widget(@doc.pages.add, Rect: [0, 0, 100, 50])
+      @field.create_appearances
+      assert(@field[:AP][:N])
+    end
+
     it "won't generate appearances if they already exist" do
       widget = @field.create_widget(@doc.pages.add, Rect: [0, 0, 0, 0])
       @field.create_appearances
@@ -262,12 +269,6 @@ describe HexaPDF::Type::AcroForm::ButtonField do
       refute_same(yes, widget.appearance_dict.normal_appearance[:Yes])
     end
 
-    it "fails for push buttons as they are not implemented yet" do
-      @field.flag(:push_button)
-      @field.create_widget(@doc.pages.add, Rect: [0, 0, 0, 0])
-      assert_raises(HexaPDF::Error) { @field.create_appearances }
-    end
-
     it "uses the configuration option acro_form.appearance_generator" do
       @doc.config['acro_form.appearance_generator'] = 'NonExistent'
       assert_raises(Exception) { @field.create_appearances }

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

@@ -193,9 +193,14 @@ describe HexaPDF::Type::AcroForm::Field do
 
     it "extracts an embedded widget into a standalone object if necessary" do
       widget1 = @field.create_widget(@page, Rect: [1, 2, 3, 4])
+      # Make sure that the field/widget looks like as if it has been loaded from a file
+      @doc.revisions.current.update(widget1)
+      assert_equal(@field, widget1)
+
       widget2 = @field.create_widget(@doc.pages.add, Rect: [2, 1, 4, 3])
       kids = @field[:Kids]
 
+      assert_kind_of(HexaPDF::Type::AcroForm::Field, @doc.object(@field.oid))
       assert_equal(2, kids.length)
       refute_same(widget1, kids[0])
       assert_same(widget2, kids[1])

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

@@ -558,13 +558,23 @@ describe HexaPDF::Type::AcroForm::Form do
         assert_equal(:Tx4, @acro_form[:Fields][2][:Kids][0][:T])
         assert_equal(@acro_form[:Fields][2], @acro_form[:Fields][2][:Kids][0][:Parent])
       end
+
+      it "ensures that objects loaded as widget are stored as field" do
+        @acro_form[:Fields][2] = @doc.add({T: :WidgetField, Type: :Annot, Subtype: :Widget})
+        assert_kind_of(HexaPDF::Type::Annotations::Widget, @acro_form[:Fields][2])
+
+        assert(@acro_form.validate)
+        field = @acro_form[:Fields][0]
+        assert_kind_of(HexaPDF::Type::AcroForm::Field, field)
+        assert_equal(:WidgetField, field.full_field_name)
+      end
     end
 
     describe "combining fields with the same name" do
       before do
         @acro_form[:Fields] = [
           @doc.add({T: 'e', Subtype: :Widget, Rect: [0, 0, 0, 1]}),
-          @doc.add({T: 'e', Subtype: :Widget, Rect: [0, 0, 0, 2]}),
+          @merged_field = @doc.add({T: 'e', Subtype: :Widget, Rect: [0, 0, 0, 2]}),
           @doc.add({T: 'Tx2'}),
           @doc.add({T: 'e', Kids: [{Subtype: :Widget, Rect: [0, 0, 0, 3]}]}),
         ]
@@ -576,6 +586,12 @@ describe HexaPDF::Type::AcroForm::Form do
         assert_equal([[0, 0, 0, 1], [0, 0, 0, 2], [0, 0, 0, 3]],
                      @acro_form.field_by_name('e').each_widget.map {|w| w[:Rect] })
       end
+
+      it "deletes the combined and now unneeded field objects" do
+        assert(@acro_form.validate)
+        assert(@merged_field.null?)
+        assert(@doc.object(@merged_field.oid).null?)
+      end
     end
 
     describe "automatically creates the terminal fields; appearances" do