hexapdf 0.34.0 → 0.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00aaef323df26b1a17c6e4ee39787c92037e8ae887713b28c3674962fcb6ac26
-  data.tar.gz: a46ecda2514bc5c044d115370f66402fc22ad3f8c8dfa1741e057b6849a6b952
+  metadata.gz: 5f2aec69ce9d984994c40912cd86d4cd10c38f23d5b975288ab11cd9e967d28b
+  data.tar.gz: 3012460ef7ca03cf81d65ac4a507dd7e23f31292d60d6e101bc555eee60f66a0
 SHA512:
-  metadata.gz: a15e468bdc852fd4c16286ba0e4829fcd3fb3be64aa48c429246216fbfe1c856cb8e155bfefa83c47b99246e7161f20a1de54769aa222dbcdfdb25f8be777643
-  data.tar.gz: d75048ff9d77601d93893cceb0c73673410695e3ea381e17d27de8c92d7de3d29d2ed467e44df6362dd28d3ee374a8e5710e5f1323393ee2e4104cdcecef1112
+  metadata.gz: 10004ae421f4daefb3fa0a3672b56ff8cd208048ca61aaaa75de687af4ac0f9bad8470de011f4944828c4b530a61cd0f52d27dc74530af365f556bdbfcaf3373
+  data.tar.gz: 12c0e3dbca50e6dd05a8e2a211aa8459e7e085a30570769af4b98b85c46e36202275765ea64b2c5805ccca4bc8f28b3b5d1c1322085978b3e0ce5cfce6e9f6bd

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.34.1 - 2023-11-01
+
+### Added
+
+* Setting of /SMask key in graphics state parameters operator
+
+### Fixed
+
+* [HexaPDF::Composer#page_style] to set a page style when no attributes are
+  given but a block is
+* [HexaPDF::Type::Page#each_annotation] and
+  [HexaPDF::Type::Page#flatten_annotations] to process certain invalid /Annot
+  keys without errors
+
+
 ## 0.34.0 - 2023-10-22
 
 ### Added

data/lib/hexapdf/composer.rb

@@ -281,7 +281,7 @@ module HexaPDF
     #
     # See: HexaPDF::Layout::PageStyle
     def page_style(name, **attributes, &block)
-      if attributes.empty?
+      if attributes.empty? && block.nil?
         @page_styles[name]
       else
         @page_styles[name] = HexaPDF::Layout::PageStyle.new(**attributes, &block)

data/lib/hexapdf/content/operator.rb

@@ -326,7 +326,6 @@ module HexaPDF
           ops[:M].invoke(processor, dict[:ML]) if dict.key?(:ML)
           ops[:d].invoke(processor, *dict[:D]) if dict.key?(:D)
           ops[:ri].invoke(processor, dict[:RI]) if dict.key?(:RI)
-          # TODO: dict[:SMask] works differently than operator!
 
           # No content operator exists for the following parameters
           gs = processor.graphics_state
@@ -335,6 +334,7 @@ module HexaPDF
           gs.stroke_alpha = dict[:CA] if dict.key?(:CA)
           gs.fill_alpha = dict[:ca] if dict.key?(:ca)
           gs.alpha_source = dict[:AIS] if dict.key?(:AIS)
+          gs.soft_mask = dict[:SMask] if dict.key?(:SMask)
           gs.text_knockout = dict[:TK] if dict.key?(:TK)
           if dict.key?(:Font)
             gs.font = processor.resources.document.deref(dict[:Font][0])

data/lib/hexapdf/type/page.rb

@@ -534,7 +534,7 @@ module HexaPDF
       def each_annotation
         return to_enum(__method__) unless block_given?
         Array(self[:Annots]).each do |annotation|
-          next unless annotation&.key?(:Subtype) && annotation&.key?(:Rect)
+          next unless annotation?(annotation)
           yield(document.wrap(annotation, type: :Annot))
         end
         self
@@ -551,12 +551,14 @@ module HexaPDF
       # field itself.
       def flatten_annotations(annotations = self[:Annots])
         not_flattened = Array(annotations) || []
-        return not_flattened unless key?(:Annots)
+        unless self[:Annots].kind_of?(PDFArray)
+          return (not_flattened == [annotations] ? [] : not_flattened)
+        end
 
         annotations = if annotations == self[:Annots]
                         not_flattened
                       else
-                        not_flattened & Array(self[:Annots])
+                        not_flattened & self[:Annots]
                       end
         return not_flattened if annotations.empty?
 
@@ -569,8 +571,8 @@ module HexaPDF
         to_delete = []
         not_flattened -= annotations
         annotations.each do |annotation|
-          unless annotation&.key?(:Subtype) && annotation&.key?(:Rect)
-            to_delete << annotation if annotation
+          unless annotation?(annotation)
+            self[:Annots].delete(annotation)
             next
           end
 
@@ -637,6 +639,12 @@ module HexaPDF
 
       private
 
+      # Returns +true+ if the given object seems to be an annotation.
+      def annotation?(obj)
+        (obj.kind_of?(Hash) || obj.kind_of?(Dictionary)) &&
+          obj&.key?(:Subtype) && obj&.key?(:Rect)
+      end
+
       # Ensures that the required inheritable fields are set.
       def perform_validation(&block)
         root_node = document.catalog.pages

data/lib/hexapdf/version.rb

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

data/test/hexapdf/content/test_operator.rb

@@ -195,7 +195,8 @@ describe_operator :SetGraphicsStateParameters, :gs do
     font.glyph_scaling_factor = 0.01
     @processor.resources[:ExtGState] = {Name: {LW: 10, LC: 2, LJ: 2, ML: 2, D: [[3, 5], 2],
                                                RI: 2, SA: true, BM: :Multiply, CA: 0.5, ca: 0.5,
-                                               AIS: true, TK: false, Font: [font, 10]}}
+                                               AIS: true, TK: false, Font: [font, 10],
+                                               SMask: {Type: :Mask, S: :Luminosity}}}
     @processor.resources.define_singleton_method(:document) do
       Object.new.tap {|obj| obj.define_singleton_method(:deref) {|o| o } }
     end
@@ -213,6 +214,7 @@ describe_operator :SetGraphicsStateParameters, :gs do
     assert_equal(0.5, gs.stroke_alpha)
     assert_equal(0.5, gs.fill_alpha)
     assert(gs.alpha_source)
+    assert_equal({Type: :Mask, S: :Luminosity}, gs.soft_mask)
     assert_equal(font, gs.font)
     assert_equal(10, gs.font_size)
     refute(gs.text_knockout)

data/test/hexapdf/test_composer.rb

@@ -119,6 +119,26 @@ describe HexaPDF::Composer do
     end
   end
 
+  describe "page_style" do
+    it "returns the page style if no argument or block is given" do
+      page_style = @composer.page_style(:default)
+      assert_kind_of(HexaPDF::Layout::PageStyle, page_style)
+      assert_equal(:A4, page_style.page_size)
+    end
+
+    it "sets a page style using the given attributes" do
+      @composer.page_style(:other, page_size: :A3)
+      assert_equal(:A3, @composer.page_style(:other).page_size)
+    end
+
+    it "sets a page style using default attributes but with a block" do
+      @composer.page_style(:other) {|canvas, style| style.frame = :hallo }
+      style = @composer.page_style(:other)
+      style.create_page(@composer.document)
+      assert_equal(:hallo, style.frame)
+    end
+  end
+
   describe "text/formatted_text/image/box/method_missing" do
     before do
       test_self = self

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.34.0)>>
+      <</Producer(HexaPDF version 0.34.1)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.34.0)>>
+      <</Producer(HexaPDF version 0.34.1)>>
       endobj
       2 0 obj
       <</Length 10>>stream
@@ -214,7 +214,7 @@ describe HexaPDF::Writer do
       <</Type/Page/MediaBox[0 0 595 842]/Parent 2 0 R/Resources<<>>>>
       endobj
       5 0 obj
-      <</Producer(HexaPDF version 0.34.0)>>
+      <</Producer(HexaPDF version 0.34.1)>>
       endobj
       4 0 obj
       <</Root 1 0 R/Info 5 0 R/Size 6/Type/XRef/W[1 1 2]/Index[0 6]/Filter/FlateDecode/DecodeParms<</Columns 4/Predictor 12>>/Length 33>>stream

data/test/hexapdf/type/test_page.rb

@@ -592,11 +592,12 @@ describe HexaPDF::Type::Page do
     end
 
     it "gracefully handles invalid /Annot key values" do
-      @page[:Annots] << nil << @doc.add({}, stream: '')
+      @page[:Annots] << nil << @doc.add({}, stream: '') << 543
       result = @page.flatten_annotations
       assert(result.empty?)
       assert(@annot1.null?)
       assert(@annot2.null?)
+      assert_equal([], @page[:Annots].value)
 
       @page[:Annots] = @doc.add({}, stream: '')
       result = @page.flatten_annotations
@@ -722,12 +723,13 @@ describe HexaPDF::Type::Page do
     annot1 = @doc.add({Type: :Annot, Subtype: :Text, Rect: [100, 100, 160, 125]})
     annot2 = @doc.add({Subtype: :Unknown, Rect: [10, 10, 70, 35]})
     not_an_annot = @doc.add({}, stream: '')
-    page[:Annots] = [not_an_annot, annot1, nil, annot2]
+    page[:Annots] = [not_an_annot, annot1, nil, annot2, {Type: :Annot, Subtype: :Text, Rect: [0, 0, 0, 0]}]
 
     annotations = page.each_annotation.to_a
-    assert_equal(2, annotations.size)
+    assert_equal(3, annotations.size)
     assert_equal([100, 100, 160, 125], annotations[0][:Rect])
     assert_equal(:Annot, annotations[0].type)
     assert_equal(:Annot, annotations[1].type)
+    assert_equal(:Annot, annotations[2].type)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.34.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-22 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse