hexapdf 0.47.0 → 1.0.0

data/test/hexapdf/test_composer.rb

@@ -63,6 +63,14 @@ describe HexaPDF::Composer do
     end
   end
 
+  it "writes the document to a string" do
+    pdf = HexaPDF::Composer.new
+    pdf.new_page
+    str = pdf.write_to_string
+    doc = HexaPDF::Document.new(io: StringIO.new(str))
+    assert_equal(2, doc.pages.count)
+  end
+
   describe "new_page" do
     it "creates a new page" do
       c = HexaPDF::Composer.new(page_size: [0, 0, 50, 100], margin: 10)

data/test/hexapdf/test_document.rb

@@ -595,4 +595,13 @@ describe HexaPDF::Document do
       refute(dupped.encrypted?)
     end
   end
+
+  it "writes the document to a string" do
+    doc = HexaPDF::Document.new
+    doc.trailer.info[:test] = :test
+    str = doc.write_to_string(update_fields: false)
+    assert_equal(Encoding::ASCII_8BIT, str.encoding)
+    doc = HexaPDF::Document.new(io: StringIO.new(str))
+    assert_equal(:test, doc.trailer.info[:test])
+  end
 end

data/test/hexapdf/test_parser.rb

@@ -152,6 +152,13 @@ describe HexaPDF::Parser do
       assert_equal('12', collector(stream.fiber))
     end
 
+    it "recovers from a non-existing indirect reference to a stream length value" do
+      create_parser("1 0 obj<</Length 2 0 R>> stream\n12(ab\nendstream endobj")
+      obj, _, _, stream = @parser.parse_indirect_object
+      assert_equal(5, obj[:Length])
+      assert_equal('12(ab', collector(stream.fiber))
+    end
+
     it "works even if the keyword endobj is missing or mangled" do
       create_parser("1 0 obj<</Length 4>>5")
       object, * = @parser.parse_indirect_object

data/test/hexapdf/test_writer.rb

@@ -48,10 +48,15 @@ describe HexaPDF::Writer do
       trailer
       <</Size 4/Root<</Type/Catalog>>/Info 3 0 R/Prev 219>>
       startxref
-      349
+      #{343 + HexaPDF::VERSION.length}
       %%EOF
     EOF
 
+    xref_stream = case HexaPDF::VERSION.length
+                  when 5 then "x\xDAcbdlc``b`\xB0\x04\x93\x93\x19\x18\x00\f\x0F\x01["
+                  when 6 then "x\xDAcbdlg``b`\xB0\x04\x93\x93\x18\x18\x00\f\e\x01["
+                  else fail
+                  end
     @compressed_input_io = StringIO.new(<<~EOF.force_encoding(Encoding::BINARY))
       %PDF-1.7
       %\xCF\xEC\xFF\xE8\xD7\xCB\xCD
@@ -81,11 +86,11 @@ describe HexaPDF::Writer do
       endobj
       4 0 obj
       <</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[
+      #{xref_stream}
       endstream
       endobj
       startxref
-      448
+      #{442 + HexaPDF::VERSION.length}
       %%EOF
     EOF
   end

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

@@ -549,7 +549,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
           @field.text_alignment(:left)
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 2, 6.41]],
+                           [:move_text, [2, 6.41]],
                            range: 7)
         end
 
@@ -557,7 +557,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
           @field.text_alignment(:right)
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 78.55, 6.41]],
+                           [:move_text, [78.55, 6.41]],
                            range: 7)
         end
 
@@ -565,7 +565,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
           @field.text_alignment(:center)
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 40.275, 6.41]],
+                           [:move_text, [40.275, 6.41]],
                            range: 7)
         end
 
@@ -576,7 +576,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
 
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 2, 6.41]],
+                           [:move_text, [2, 6.41]],
                            range: 7)
         ensure
           font_metrics.cap_height = cap_height
@@ -586,7 +586,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
           @widget[:Rect].height = 5
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 2, 3.07]],
+                           [:move_text, [2, 3.07]],
                            range: 7)
         end
       end
@@ -614,7 +614,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
                           [:set_font_and_size, [:F1, 10]],
                           [:set_device_rgb_non_stroking_color, [1.0, 0.0, 0.0]],
                           [:begin_text],
-                          [:set_text_matrix, [1, 0, 0, 1, 2, 2.035]],
+                          [:move_text, [2, 2.035]],
                           [:show_text, ["Te "]],
                           [:set_font_and_size, [:F2, 10]],
                           [:move_text, [14.45, 0]],
@@ -645,7 +645,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
           @field.text_alignment(:left)
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 2, 16.195]],
+                           [:move_text, [2, 16.195]],
                            range: 9)
         end
 
@@ -653,7 +653,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
           @field.text_alignment(:right)
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 78.55, 16.195]],
+                           [:move_text, [78.55, 16.195]],
                            range: 9)
         end
 
@@ -661,7 +661,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
           @field.text_alignment(:center)
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 40.275, 16.195]],
+                           [:move_text, [40.275, 16.195]],
                            range: 9)
         end
       end
@@ -681,7 +681,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
                           [:set_font_and_size, [:F1, 10]],
                           [:set_device_rgb_non_stroking_color, [1.0, 0.0, 0.0]],
                           [:begin_text],
-                          [:set_text_matrix, [1, 0, 0, 1, 2, 16.195]],
+                          [:move_text, [2, 16.195]],
                           [:show_text, ['Test']],
                           [:move_text_next_line],
                           [:show_text, ['Value']],
@@ -703,7 +703,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
                           [:set_leading, [9.25]],
                           [:set_font_and_size, [:F1, 8]],
                           [:begin_text],
-                          [:set_text_matrix, [1, 0, 0, 1, 2, 18.556]],
+                          [:move_text, [2, 18.556]],
                           [:show_text, ['Test']],
                           [:move_text_next_line],
                           [:show_text, ['Test']],
@@ -734,7 +734,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
           @field.text_alignment(:left)
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 2.945, 6.41]],
+                           [:move_text, [2.945, 6.41]],
                            range: 7)
         end
 
@@ -742,7 +742,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
           @field.text_alignment(:right)
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 62.945, 6.41]],
+                           [:move_text, [62.945, 6.41]],
                            range: 7)
         end
 
@@ -750,7 +750,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
           @field.text_alignment(:center)
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 32.945, 6.41]],
+                           [:move_text, [32.945, 6.41]],
                            range: 7)
         end
 
@@ -759,7 +759,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
           @field.text_alignment(:center)
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
-                           [:set_text_matrix, [1, 0, 0, 1, 22.39, 6.41]],
+                           [:move_text, [22.39, 6.41]],
                            range: 7)
         end
       end
@@ -777,7 +777,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
                           [:set_font_and_size, [:F1, 10]],
                           [:set_device_rgb_non_stroking_color, [1.0, 0.0, 0.0]],
                           [:begin_text],
-                          [:set_text_matrix, [1, 0, 0, 1, 2.945, 6.41]],
+                          [:move_text, [2.945, 6.41]],
                           [:show_text_with_positioning, [['T', -416.5, 'e', -472, 'x', -611, 't']]],
                           [:end_text],
                           [:restore_graphics_state],
@@ -789,7 +789,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
         @generator.create_appearances
         assert_operators(@widget[:AP][:N].stream,
                          [[:begin_text],
-                          [:set_text_matrix, [1, 0, 0, 1, 2, 6.41]],
+                          [:move_text, [2, 6.41]],
                           [:end_text]], range: 6..8)
       end
 
@@ -870,7 +870,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
                             [:set_font_and_size, [:F1, 12]],
                             [:set_device_rgb_non_stroking_color, [1.0, 0.0, 0.0]],
                             [:begin_text],
-                            [:set_text_matrix, [1, 0, 0, 1, 2, 23.609]],
+                            [:move_text, [2, 23.609]],
                             [:show_text, ["a"]],
                             [:move_text_next_line],
                             [:show_text, ["b"]],

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

@@ -159,11 +159,16 @@ describe HexaPDF::Type::AcroForm::Form do
     end
 
     def applies_variable_text_properties(method, **args)
-      field = @acro_form.send(method, "field", **args, font: 'Times')
+      field = @acro_form.send(method, "field", **args)
       font_name, font_size, font_color = field.parse_default_appearance_string
-      assert_equal(:'Times-Roman', @acro_form.default_resources.font(font_name)[:BaseFont])
+      assert_equal(:'Helvetica', @acro_form.default_resources.font(font_name)[:BaseFont])
       assert_equal(0, font_size)
       assert_equal(HexaPDF::Content::ColorSpace::DeviceGray.new.color(0), font_color)
+      assert_equal(0, field.value[:Q])
+
+      field = @acro_form.send(method, "field", **args, font: 'Times')
+      font_name, font_size, font_color = field.parse_default_appearance_string
+      assert_equal(:'Times-Roman', @acro_form.default_resources.font(font_name)[:BaseFont])
 
       field = @acro_form.send(method, "field", **args, font_options: {variant: :bold})
       font_name, = field.parse_default_appearance_string
@@ -171,7 +176,6 @@ describe HexaPDF::Type::AcroForm::Form do
 
       field = @acro_form.send(method, "field", **args, font_size: 10)
       font_name, font_size = field.parse_default_appearance_string
-      assert_equal(:Helvetica, @acro_form.default_resources.font(font_name)[:BaseFont])
       assert_equal(10, font_size)
 
       field = @acro_form.send(method, "field", **args, font_color: "red")

data/test/hexapdf/type/actions/test_launch.rb

@@ -14,10 +14,14 @@ describe HexaPDF::Type::Actions::Launch do
     it "needs a launch target" do
       refute(@action.validate)
 
-      @action.value = {F: {}}
+      @action.value = {Win: {F: "test.exe"}}
+      assert(@action.validate)
+      @action.value = {Mac: 'test'}
+      assert(@action.validate)
+      @action.value = {Unix: 'test'}
       assert(@action.validate)
 
-      @action.value = {Win: {F: "test.exe"}}
+      @action.value = {F: {}}
       assert(@action.validate)
     end
   end

data/test/hexapdf/type/test_font_type1.rb

@@ -138,5 +138,10 @@ describe HexaPDF::Type::FontType1 do
       @embedded_font.delete(:FontDescriptor)
       refute(@embedded_font.validate)
     end
+
+    it "ensures a correct Symbol value for the /Encoding key" do
+      @font[:Encoding] = :Other
+      refute(@font.validate)
+    end
   end
 end

data/test/hexapdf/type/test_form.rb

@@ -57,7 +57,7 @@ describe HexaPDF::Type::Form do
     it "creates the resource dictionary if it is not found" do
       resources = @form.resources
       assert_equal(:XXResources, resources.type)
-      assert_equal({ProcSet: [:PDF, :Text, :ImageB, :ImageC, :ImageI]}, resources.value)
+      assert_equal({}, resources.value)
     end
 
     it "returns the already used resource dictionary" do

data/test/hexapdf/type/test_page.rb

@@ -358,6 +358,12 @@ describe HexaPDF::Type::Page do
       page[:Contents] = [@doc.wrap({}, stream: 'q 10'), @doc.wrap({}, stream: 'w Q')]
       assert_equal('q 10 w Q', page.contents)
     end
+
+    it "handles null objects in the /Contents array" do
+      page = @doc.pages.add
+      page[:Contents] = [@doc.wrap({}, stream: 'q 10'), nil]
+      assert_equal('q 10 ', page.contents)
+    end
   end
 
   describe "contents=" do
@@ -389,7 +395,7 @@ describe HexaPDF::Type::Page do
       page = @doc.add({Type: :Page, Parent: @doc.pages.root})
       resources = page.resources
       assert_equal(:XXResources, resources.type)
-      assert_equal({ProcSet: [:PDF, :Text, :ImageB, :ImageC, :ImageI]}, resources.value)
+      assert_equal({}, resources.value)
     end
 
     it "returns the already used resource dictionary" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-07 00:00:00.000000000 Z
+date: 2024-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -469,6 +469,7 @@ files:
 - lib/hexapdf/stream.rb
 - lib/hexapdf/task.rb
 - lib/hexapdf/task/dereference.rb
+- lib/hexapdf/task/merge_acro_form.rb
 - lib/hexapdf/task/optimize.rb
 - lib/hexapdf/task/pdfa.rb
 - lib/hexapdf/test_utils.rb
@@ -728,6 +729,7 @@ files:
 - test/hexapdf/layout/test_text_shaper.rb
 - test/hexapdf/layout/test_width_from_polygon.rb
 - test/hexapdf/task/test_dereference.rb
+- test/hexapdf/task/test_merge_acro_form.rb
 - test/hexapdf/task/test_optimize.rb
 - test/hexapdf/task/test_pdfa.rb
 - test/hexapdf/test_composer.rb