hexapdf 0.45.0 → 0.47.0

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/layout/test_text_box.rb

@@ -178,15 +178,12 @@ describe HexaPDF::Layout::TextBox do
       assert_operators(@canvas.contents, [[:save_graphics_state],
                                           [:restore_graphics_state],
                                           [:save_graphics_state],
-                                          [:concatenate_matrix, [1, 0, 0, 1, 5, 10]],
-                                          [:save_graphics_state],
-                                          [:append_rectangle, [0, 0, 10, 10]],
+                                          [:append_rectangle, [5, 10, 10, 10]],
                                           [:clip_path_non_zero],
                                           [:end_path],
-                                          [:append_rectangle, [0.5, 0.5, 9.0, 9.0]],
+                                          [:append_rectangle, [5.5, 10.5, 9.0, 9.0]],
                                           [:stroke_path],
                                           [:restore_graphics_state],
-                                          [:restore_graphics_state],
                                           [:save_graphics_state],
                                           [:restore_graphics_state]])
     end
@@ -195,7 +192,7 @@ describe HexaPDF::Layout::TextBox do
       @frame.remove_area(Geom2D::Rectangle(0, 0, 40, 100))
       box = create_box([@inline_box], style: {position: :flow, border: {width: 1}})
       box.fit(60, 100, @frame)
-      box.draw(@canvas, 0, 88)
+      box.draw(@canvas, 40, 88)
       assert_operators(@canvas.contents, [[:save_graphics_state],
                                           [:append_rectangle, [40, 88, 12, 12]],
                                           [:clip_path_non_zero],
@@ -207,9 +204,6 @@ describe HexaPDF::Layout::TextBox do
                                           [:restore_graphics_state],
                                           [:save_graphics_state],
                                           [:concatenate_matrix, [1, 0, 0, 1, 41, 89]],
-                                          [:save_graphics_state],
-                                          [:concatenate_matrix, [1, 0, 0, 1, 0, 0]],
-                                          [:restore_graphics_state],
                                           [:restore_graphics_state],
                                           [:save_graphics_state],
                                           [:restore_graphics_state]])

data/test/hexapdf/layout/test_text_layouter.rb

@@ -812,11 +812,8 @@ describe HexaPDF::Layout::TextLayouter do
                                           [:restore_graphics_state],
                                           [:save_graphics_state],
                                           [:concatenate_matrix, [1, 0, 0, 1, 10, -40]],
-                                          [:save_graphics_state],
-                                          [:concatenate_matrix, [1, 0, 0, 1, 0, 0]],
                                           [:set_line_width, [2]],
                                           [:restore_graphics_state],
-                                          [:restore_graphics_state],
                                           [:save_graphics_state],
                                           [:restore_graphics_state]])
     end

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
@@ -568,4 +568,31 @@ describe HexaPDF::Document do
   it "can be inspected and the output is not too large" do
     assert_match(/HexaPDF::Document:\d+/, @doc.inspect)
   end
+
+  describe "duplicate" do
+    it "creates an in-memory copy" do
+      doc = HexaPDF::Document.new
+      doc.pages.add.canvas.line_width(10)
+      doc.trailer.info[:Author] = 'HexaPDF'
+      doc.dispatch_message(:complete_objects)
+
+      dupped = doc.duplicate
+      assert_equal('HexaPDF', dupped.trailer.info[:Author])
+      doc.pages[0].canvas.line_cap_style(:round)
+      assert_equal("10 w\n", dupped.pages[0].contents)
+    end
+
+    it "doesn't copy the encryption state" do
+      doc = HexaPDF::Document.new
+      doc.pages.add.canvas.line_width(10)
+      doc.encrypt
+      io = StringIO.new
+      doc.write(io)
+
+      doc = HexaPDF::Document.new(io: io)
+      dupped = doc.duplicate
+      assert_equal("10 w\n", dupped.pages[0].contents)
+      refute(dupped.encrypted?)
+    end
+  end
 end

data/test/hexapdf/test_importer.rb

@@ -47,6 +47,13 @@ describe HexaPDF::Importer do
       refute_same(obj1, obj2)
       refute_same(obj1[:ref], obj2[:ref])
     end
+
+    it "duplicates the whole document" do
+      trailer = HexaPDF::Importer.copy(@dest, @source.trailer, allow_all: true)
+      refute_same(@source.catalog, trailer[:Root])
+      refute_same(@source.pages.root, trailer[:Root][:Pages])
+      assert_equal(90, trailer[:Root][:Pages][:Kids][0][:Rotate])
+    end
   end
 
   describe "import" do
@@ -121,6 +128,16 @@ describe HexaPDF::Importer do
       refute_same(dst_obj.data.stream, src_obj.data.stream)
     end
 
+    it "duplicates the stream if it is a FiberDoubleForString, e.g. when using Canvas" do
+      src_page = @source.pages[0]
+      src_page.canvas.line_width(10)
+      dst_page = @importer.import(src_page)
+      refute_same(dst_page, src_page)
+      refute_same(dst_page[:Contents].data.stream, src_page[:Contents].data.stream)
+      src_page.canvas.line_width(20)
+      assert_equal("10 w\n", dst_page.contents)
+    end
+
     it "does not import objects of type Catalog or Pages" do
       @obj[:catalog] = @source.catalog
       @obj[:pages] = @source.catalog.pages
@@ -130,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_revisions.rb

@@ -357,46 +357,59 @@ describe HexaPDF::Revisions do
     end
   end
 
-  it "merges the two revisions of a linearized PDF into one" do
-    io = StringIO.new(<<~EOF)
-      %PDF-1.2
-      5 0 obj
-      <</Linearized 1>>
-      endobj
-      xref
-      5 1
-      0000000009 00000 n
-      trailer
-      <</ID[(a)(b)]/Info 1 0 R/Root 2 0 R/Size 6/Prev 394>>
-      %
-      1 0 obj
-      <</ModDate(D:20221205233910+01'00')/Producer(HexaPDF version 0.27.0)>>
-      endobj
-      2 0 obj
-      <</Type/Catalog/Pages 3 0 R>>
-      endobj
-      3 0 obj
-      <</Type/Pages/Kids[4 0 R]/Count 1>>
-      endobj
-      4 0 obj
-      <</Type/Page/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<<>>>>
-      endobj
-      xref
-      0 5
-      0000000000 65535 f 
-      0000000133 00000 n 
-      0000000219 00000 n 
-      0000000264 00000 n 
-      0000000315 00000 n 
-      trailer
-      <</ID[(a)(b)]/Info 1 0 R/Root 2 0 R/Size 5>>
-      startxref
-      41
-      %%EOF
-    EOF
-    doc = HexaPDF::Document.new(io: io, config: {'parser.try_xref_reconstruction' => false})
-    assert(doc.revisions.parser.linearized?)
-    assert_equal(1, doc.revisions.count)
-    assert_same(5, doc.revisions.current.xref_section.max_oid)
+  describe "linearzied PDFs" do
+    before  do
+      @io = StringIO.new(<<~EOF)
+        %PDF-1.2
+        5 0 obj
+        <</Linearized 1>>
+        endobj
+        xref
+        5 1
+        0000000009 00000 n
+        trailer
+        <</ID[(a)(b)]/Info 1 0 R/Root 2 0 R/Size 6/Prev 394>>
+        %
+        1 0 obj
+        <</ModDate(D:20221205233910+01'00')/Producer(HexaPDF version 0.27.0)>>
+        endobj
+        2 0 obj
+        <</Type/Catalog/Pages 3 0 R>>
+        endobj
+        3 0 obj
+        <</Type/Pages/Kids[4 0 R]/Count 1>>
+        endobj
+        4 0 obj
+        <</Type/Page/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<<>>>>
+        endobj
+        xref
+        0 5
+        0000000000 65535 f 
+        0000000133 00000 n 
+        0000000219 00000 n 
+        0000000264 00000 n 
+        0000000315 00000 n 
+        trailer
+        <</ID[(a)(b)]/Info 1 0 R/Root 2 0 R/Size 5>>
+        startxref
+        41
+        %%EOF
+      EOF
+    end
+
+    it "merges the two revisions of a linearized PDF into one" do
+      doc = HexaPDF::Document.new(io: @io, config: {'parser.try_xref_reconstruction' => false})
+      assert(doc.revisions.parser.linearized?)
+      assert_equal(1, doc.revisions.count)
+      assert_same(5, doc.revisions.current.xref_section.max_oid)
+    end
+
+    it "works for a fake linearized PDF where the first xref section isn't actually used" do
+      @io.string[-9..-1] = "394\n%%EOF\n"
+      doc = HexaPDF::Document.new(io: @io, config: {'parser.try_xref_reconstruction' => false})
+      assert(doc.revisions.parser.linearized?)
+      assert_equal(1, doc.revisions.count)
+      assert_same(4, doc.revisions.current.xref_section.max_oid)
+    end
   end
 end

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

@@ -274,6 +274,15 @@ describe HexaPDF::Type::AcroForm::Form do
       assert(obj.null?)
     end
 
+    it "deletes a field with an embedded widget annotation" do
+      widget = @field.create_widget(@doc.pages.add, Rect: [0, 0, 0, 0])
+      assert_equal(widget, @field)
+      refute(@doc.pages[0][:Annots].empty?)
+      @acro_form.delete_field(@field)
+      assert(@doc.pages[0][:Annots].empty?)
+      assert(@field.null?)
+    end
+
     it "deletes all widget annotations from the document and the annotation array" do
       widget1 = @field.create_widget(@doc.pages.add, Rect: [0, 0, 0, 0])
       widget2 = @field.create_widget(@doc.pages.add, Rect: [0, 0, 0, 0])
@@ -498,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.45.0
+  version: 0.47.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-18 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