hexapdf 0.17.2 → 0.19.1

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

@@ -499,6 +499,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
 
       it "creates the /N appearance stream according to the set string" do
         @field.field_value = 'Text'
+        @field.set_default_appearance_string(font_color: "red")
         @generator.create_appearances
         assert_operators(@widget[:AP][:N].stream,
                          [[:begin_marked_content, [:Tx]],
@@ -507,6 +508,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
                           [:clip_path_non_zero],
                           [:end_path],
                           [:set_font_and_size, [:F1, 6.641436]],
+                          [:set_device_rgb_non_stroking_color, [1.0, 0.0, 0.0]],
                           [:begin_text],
                           [:set_text_matrix, [1, 0, 0, 1, 2, 3.240724]],
                           [:show_text, ["Text"]],
@@ -556,6 +558,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
 
       it "creates the /N appearance stream according to the set string" do
         @field.field_value = "Test\nValue"
+        @field.set_default_appearance_string(font_size: 10, font_color: "red")
         @generator.create_appearances
         assert_operators(@widget[:AP][:N].stream,
                          [[:begin_marked_content, [:Tx]],
@@ -566,6 +569,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
                           [:save_graphics_state],
                           [:set_leading, [11.5625]],
                           [: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]],
                           [:show_text, ['Test']],
@@ -653,6 +657,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
 
       it "creates the /N appearance stream according to the set string" do
         @field.field_value = 'Text'
+        @field.set_default_appearance_string(font_size: 10, font_color: "red")
         @generator.create_appearances
         assert_operators(@widget[:AP][:N].stream,
                          [[:begin_marked_content, [:Tx]],
@@ -661,6 +666,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
                           [:clip_path_non_zero],
                           [:end_path],
                           [: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]],
                           [:show_text_with_positioning, [['T', -416.5, 'e', -472, 'x', -611, 't']]],
@@ -721,6 +727,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
         it "creates the /N appearance stream" do
           @field[:I] = [1, 2]
           @field[:V] = ['b', 'c']
+          @field.set_default_appearance_string(font_size: 12, font_color: "red")
           @generator.create_appearances
           assert_operators(@widget[:AP][:N].stream,
                            [[:begin_marked_content, [:Tx]],
@@ -734,7 +741,7 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
                             [:save_graphics_state],
                             [:set_leading, [13.875]],
                             [:set_font_and_size, [:F1, 12]],
-                            [:set_device_gray_non_stroking_color, [0.0]],
+                            [:set_device_rgb_non_stroking_color, [1.0, 0.0, 0.0]],
                             [:begin_text],
                             [:set_text_matrix, [1, 0, 0, 1, 2, 23.609]],
                             [:show_text, ["a"]],

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

@@ -8,6 +8,7 @@ describe HexaPDF::Type::AcroForm::Form do
   before do
     @doc = HexaPDF::Document.new
     @acro_form = @doc.add({Fields: []}, type: :XXAcroForm)
+    @doc.catalog[:AcroForm] = @acro_form
   end
 
   describe "signature flags" do
@@ -140,12 +141,13 @@ describe HexaPDF::Type::AcroForm::Form do
 
     def applies_variable_text_properties(method, **args)
       field = @acro_form.send(method, "field", **args, font: 'Times')
-      font_name, font_size = field.parse_default_appearance_string
+      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(0, font_size)
+      assert_equal(HexaPDF::Content::ColorSpace::DeviceGray.new.color(0), font_color)
 
       field = @acro_form.send(method, "field", **args, font_options: {variant: :bold})
-      font_name, font_size = field.parse_default_appearance_string
+      font_name, = field.parse_default_appearance_string
       assert_equal(:'Helvetica-Bold', @acro_form.default_resources.font(font_name)[:BaseFont])
 
       field = @acro_form.send(method, "field", **args, font_size: 10)
@@ -153,6 +155,10 @@ describe HexaPDF::Type::AcroForm::Form do
       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")
+      _, _, font_color = field.parse_default_appearance_string
+      assert_equal(HexaPDF::Content::ColorSpace::DeviceRGB.new.color(255, 0, 0), font_color)
+
       field = @acro_form.send(method, "field", **args, font: 'Courier', font_size: 10, align: :center)
       font_name, font_size = field.parse_default_appearance_string
       assert_equal(:Courier, @acro_form.default_resources.font(font_name)[:BaseFont])
@@ -229,16 +235,17 @@ describe HexaPDF::Type::AcroForm::Form do
   describe "set_default_appearance_string" do
     it "uses sane default values if no arguments are provided" do
       @acro_form.set_default_appearance_string
-      assert_equal("0 g /F1 0 Tf", @acro_form[:DA])
+      assert_equal("0.0 g /F1 0 Tf", @acro_form[:DA])
       font = @acro_form.default_resources.font(:F1)
       assert(font)
       assert_equal(:Helvetica, font[:BaseFont])
     end
 
-    it "allows specifying the used font and font size" do
-      @acro_form.set_default_appearance_string(font: 'Times', font_size: 10)
-      assert_equal("0 g /F1 10 Tf", @acro_form[:DA])
-      assert_equal(:'Times-Roman', @acro_form.default_resources.font(:F1)[:BaseFont])
+    it "allows specifying the used font, font size and font color" do
+      @acro_form.set_default_appearance_string(font: 'Times', font_options: {variant: :bold},
+                                               font_size: 10, font_color: "red")
+      assert_equal("1.0 0.0 0.0 rg /F1 10 Tf", @acro_form[:DA])
+      assert_equal(:'Times-Bold', @acro_form.default_resources.font(:F1)[:BaseFont])
     end
   end
 
@@ -333,7 +340,7 @@ describe HexaPDF::Type::AcroForm::Form do
 
     it "set the default appearance string, though optional, to a valid value to avoid problems" do
       assert(@acro_form.validate)
-      assert_equal("0 g /F1 0 Tf", @acro_form[:DA])
+      assert_equal("0.0 g /F1 0 Tf", @acro_form[:DA])
     end
 
     describe "automatically creates the terminal fields; appearances" do

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

@@ -31,7 +31,7 @@ describe HexaPDF::Type::AcroForm::VariableTextField do
     end
   end
 
-  describe "set_default_appearance_string" do
+  describe "set_default_appearance_string / self.create_appearance_string" do
     it "creates the AcroForm object if it doesn't exist" do
       @doc.catalog.delete(:AcroForm)
       @field.set_default_appearance_string
@@ -40,7 +40,7 @@ describe HexaPDF::Type::AcroForm::VariableTextField do
 
     it "uses sane default values if no arguments are provided" do
       @field.set_default_appearance_string
-      assert_equal("0 g /F1 0 Tf", @field[:DA])
+      assert_equal("0.0 g /F1 0 Tf", @field[:DA])
       font = @doc.acro_form.default_resources.font(:F1)
       assert(font)
       assert_equal(:Helvetica, font[:BaseFont])
@@ -48,36 +48,46 @@ describe HexaPDF::Type::AcroForm::VariableTextField do
 
     it "allows specifying the font" do
       @field.set_default_appearance_string(font: 'Times')
-      assert_equal("0 g /F2 0 Tf", @field[:DA])
+      assert_equal("0.0 g /F2 0 Tf", @field[:DA])
       assert_equal(:'Times-Roman', @doc.acro_form.default_resources.font(:F2)[:BaseFont])
     end
 
     it "allows specifying the font options" do
       @field.set_default_appearance_string(font_options: {variant: :italic})
-      assert_equal("0 g /F2 0 Tf", @field[:DA])
+      assert_equal("0.0 g /F2 0 Tf", @field[:DA])
       assert_equal(:'Helvetica-Oblique', @doc.acro_form.default_resources.font(:F2)[:BaseFont])
     end
 
     it "allows specifying the font size" do
       @field.set_default_appearance_string(font_size: 10)
-      assert_equal("0 g /F1 10 Tf", @field[:DA])
+      assert_equal("0.0 g /F1 10 Tf", @field[:DA])
+    end
+
+    it "allows specifying the font color" do
+      @field.set_default_appearance_string(font_color: "red")
+      assert_equal("1.0 0.0 0.0 rg /F1 0 Tf", @field[:DA])
     end
   end
 
   describe "parse_default_appearance_string" do
+    before do
+      @color = HexaPDF::Content::ColorSpace.prenormalized_device_color([1])
+    end
+
     it "parses the default appearance string of the field" do
       @field[:DA] = "1 g //F1 20 Tf 5 w /F2 10 Tf"
-      assert_equal([:F2, 10], @field.parse_default_appearance_string)
+      assert_equal([:F2, 10, @color], @field.parse_default_appearance_string)
     end
 
     it "uses the default appearance string of a parent field" do
       parent = @doc.add({DA: "/F1 15 Tf"}, type: :XXAcroFormField)
       @field[:Parent] = parent
-      assert_equal([:F1, 15], @field.parse_default_appearance_string)
+      assert_equal([:F1, 15, nil], @field.parse_default_appearance_string)
     end
 
     it "uses the global default appearance string" do
-      assert_equal([:F1, 0], @field.parse_default_appearance_string)
+      assert_equal([:F1, 0, HexaPDF::Content::ColorSpace.prenormalized_device_color([0])],
+                   @field.parse_default_appearance_string)
     end
 
     it "fails if no /DA value is set" do

data/test/hexapdf/type/test_font.rb

@@ -64,4 +64,8 @@ describe HexaPDF::Type::Font do
       assert_equal(5, @font.font_file)
     end
   end
+
+  it "returns the glyph scaling factor" do
+    assert_equal(0.001, @font.glyph_scaling_factor)
+  end
 end

data/test/hexapdf/type/test_font_type3.rb

@@ -9,10 +9,25 @@ describe HexaPDF::Type::FontType3 do
     @doc = HexaPDF::Document.new
     @font = @doc.add({Type: :Font, Subtype: :Type3, Encoding: :WinAnsiEncoding,
                       FirstChar: 32, LastChar: 34, Widths: [600, 0, 700],
-                      FontBBox: [0, 0, 100, 100], FontMatrix: [1, 0, 0, 1, 0, 0],
+                      FontBBox: [0, 100, 100, 0], FontMatrix: [0.002, 0, 0, 0.002, 0, 0],
                       CharProcs: {}})
   end
 
+  describe "bounding_box" do
+    it "returns the font's bounding box" do
+      assert_equal([0, 0, 100, 100], @font.bounding_box)
+    end
+
+    it "inverts the y-values if necessary based on /FontMatrix" do
+      @font[:FontMatrix][3] *= -1
+      assert_equal([0, -100, 100, 0], @font.bounding_box)
+    end
+  end
+
+  it "returns the glyph scaling factor" do
+    assert_equal(0.002, @font.glyph_scaling_factor)
+  end
+
   describe "validation" do
     it "works for valid objects" do
       assert(@font.validate)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.19.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -254,6 +254,7 @@ files:
 - lib/hexapdf/document/fonts.rb
 - lib/hexapdf/document/images.rb
 - lib/hexapdf/document/pages.rb
+- lib/hexapdf/document/signatures.rb
 - lib/hexapdf/encryption.rb
 - lib/hexapdf/encryption/aes.rb
 - lib/hexapdf/encryption/arc4.rb
@@ -396,6 +397,7 @@ files:
 - lib/hexapdf/type/page.rb
 - lib/hexapdf/type/page_tree_node.rb
 - lib/hexapdf/type/resources.rb
+- lib/hexapdf/type/signature/adbe_pkcs7_detached.rb
 - lib/hexapdf/type/trailer.rb
 - lib/hexapdf/type/viewer_preferences.rb
 - lib/hexapdf/type/xref_stream.rb