hexapdf 1.3.0 → 1.4.0

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

@@ -0,0 +1,208 @@
+# -*- 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 module provides a convenience method for getting and setting the line ending style for
+      # line and polyline annotations.
+      #
+      # See: PDF2.0 s12.5.6.7
+      module LineEndingStyling
+
+        # Maps HexaPDF names to PDF names.
+        LINE_ENDING_STYLE_MAP = { # :nodoc:
+          Square: :Square, square: :Square,
+          Circle: :Circle, circle: :Circle,
+          Diamond: :Diamond, diamond: :Diamond,
+          OpenArrow: :OpenArrow, open_arrow: :OpenArrow,
+          ClosedArrow: :ClosedArrow, closed_arrow: :ClosedArrow,
+          None: :None, none: :None,
+          Butt: :Butt, butt: :Butt,
+          ROpenArrow: :ROpenArrow, ropen_arrow: :ROpenArrow,
+          RClosedArrow: :RClosedArrow, rclosed_arrow: :RClosedArrow,
+          Slash: :Slash, slash: :Slash,
+        }.freeze
+        LINE_ENDING_STYLE_REVERSE_MAP = LINE_ENDING_STYLE_MAP.invert # :nodoc:
+
+        # Describes the line ending style, i.e. the +start_style+ and the +end_style+.
+        #
+        # See LineEndingStyling#line_ending_style for more information.
+        LineEndingStyle = Struct.new(:start_style, :end_style)
+
+        # :call-seq:
+        #   annot.line_ending_style                                         => style
+        #   annot.line_ending_style(start_style: :none, end_style: :none)   => line
+        #
+        # Returns a LineEndingStyle instance holding the current line ending styles when no argument
+        # is given. Otherwise sets the line ending style of the annotation and returns self.
+        #
+        # When returning the styles, unknown line ending styles are mapped to :none.
+        #
+        # When setting the line ending style, arguments that are not provided will use the currently
+        # defined value or fall back to the default of +:none+.
+        #
+        # Possible line ending styles (the first one is the HexaPDF name, the second the PDF name):
+        #
+        # :square or :Square::
+        #     A square filled with the annotation's interior colour, if any.
+        #
+        #       #>pdf-small-hide
+        #       doc.annotations.
+        #         create_line(doc.pages[0], start_point: [20, 20], end_point: [80, 60]).
+        #         interior_color("hp-orange").
+        #         line_ending_style(end_style: :square).
+        #         regenerate_appearance
+        #
+        # :circle or :Circle::
+        #     A circle filled with the annotation’s interior colour, if any.
+        #
+        #       #>pdf-small-hide
+        #       doc.annotations.
+        #         create_line(doc.pages[0], start_point: [20, 20], end_point: [80, 60]).
+        #         interior_color("hp-orange").
+        #         line_ending_style(end_style: :circle).
+        #         regenerate_appearance
+        #
+        # :diamond or :Diamond::
+        #     A diamond shape filled with the annotation’s interior colour, if any.
+        #
+        #       #>pdf-small-hide
+        #       doc.annotations.
+        #         create_line(doc.pages[0], start_point: [20, 20], end_point: [80, 60]).
+        #         interior_color("hp-orange").
+        #         line_ending_style(end_style: :diamond).
+        #         regenerate_appearance
+        #
+        # :open_arrow or :OpenArrow::
+        #     Two short lines meeting in an acute angle to form an open arrowhead.
+        #
+        #       #>pdf-small-hide
+        #       doc.annotations.
+        #         create_line(doc.pages[0], start_point: [20, 20], end_point: [80, 60]).
+        #         interior_color("hp-orange").
+        #         line_ending_style(end_style: :open_arrow).
+        #         regenerate_appearance
+        #
+        # :closed_arrow or :ClosedArrow::
+        #     Two short lines meeting in an acute angle as in the +:open_arrow+ style and connected
+        #     by a third line to form a triangular closed arrowhead filled with the annotation’s
+        #     interior colour, if any.
+        #
+        #       #>pdf-small-hide
+        #       doc.annotations.
+        #         create_line(doc.pages[0], start_point: [20, 20], end_point: [80, 60]).
+        #         interior_color("hp-orange").
+        #         line_ending_style(end_style: :closed_arrow).
+        #         regenerate_appearance
+        #
+        # :none or :None::
+        #     No line ending.
+        #
+        #       #>pdf-small-hide
+        #       doc.annotations.
+        #         create_line(doc.pages[0], start_point: [20, 20], end_point: [80, 60]).
+        #         interior_color("hp-orange").
+        #         line_ending_style(end_style: :none).
+        #         regenerate_appearance
+        #
+        # :butt or :Butt::
+        #     A short line at the endpoint perpendicular to the line itself.
+        #
+        #       #>pdf-small-hide
+        #       doc.annotations.
+        #         create_line(doc.pages[0], start_point: [20, 20], end_point: [80, 60]).
+        #         interior_color("hp-orange").
+        #         line_ending_style(end_style: :butt).
+        #         regenerate_appearance
+        #
+        # :ropen_arrow or :ROpenArrow::
+        #     Two short lines in the reverse direction from +:open_arrow+.
+        #
+        #       #>pdf-small-hide
+        #       doc.annotations.
+        #         create_line(doc.pages[0], start_point: [20, 20], end_point: [80, 60]).
+        #         interior_color("hp-orange").
+        #         line_ending_style(end_style: :ropen_arrow).
+        #         regenerate_appearance
+        #
+        # :rclosed_arrow or :RClosedArrow::
+        #     A triangular closed arrowhead in the reverse direction from +:closed_arrow+.
+        #
+        #       #>pdf-small-hide
+        #       doc.annotations.
+        #         create_line(doc.pages[0], start_point: [20, 20], end_point: [80, 60]).
+        #         interior_color("hp-orange").
+        #         line_ending_style(end_style: :rclosed_arrow).
+        #         regenerate_appearance
+        #
+        # :slash or :Slash::
+        #      A short line at the endpoint approximately 30 degrees clockwise from perpendicular to
+        #      the line itself.
+        #
+        #       #>pdf-small-hide
+        #       doc.annotations.
+        #         create_line(doc.pages[0], start_point: [20, 20], end_point: [80, 60]).
+        #         interior_color("hp-orange").
+        #         line_ending_style(end_style: :slash).
+        #         regenerate_appearance
+        def line_ending_style(start_style: :UNSET, end_style: :UNSET)
+          if start_style == :UNSET && end_style == :UNSET
+            le = self[:LE]
+            LineEndingStyle.new(LINE_ENDING_STYLE_REVERSE_MAP.fetch(le[0], :none),
+                                LINE_ENDING_STYLE_REVERSE_MAP.fetch(le[1], :none))
+          else
+            start_style = self[:LE][0] if start_style == :UNSET
+            end_style = self[:LE][1] if end_style == :UNSET
+            start_style = LINE_ENDING_STYLE_MAP.fetch(start_style) do
+              raise ArgumentError, "Invalid line ending style: #{start_style.inspect}"
+            end
+            end_style = LINE_ENDING_STYLE_MAP.fetch(end_style) do
+              raise ArgumentError, "Invalid line ending style: #{end_style.inspect}"
+            end
+            self[:LE] = [start_style, end_style]
+            self
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -61,7 +61,6 @@ module HexaPDF
 
         define_field :T,            type: String, version: '1.1'
         define_field :Popup,        type: :Annot, version: '1.3'
-        define_field :CA,           type: Numeric, default: 1.0, version: '1.4'
         define_field :RC,           type: [Stream, String], version: '1.5'
         define_field :CreationDate, type: PDFDate, version: '1.5'
         define_field :IRT,          type: Dictionary, version: '1.5'

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

@@ -0,0 +1,64 @@
+# -*- 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
+
+      # A polygon annotation displays a closed polygon inside the annotation rectangle.
+      #
+      # Also see PolygonPolyline for more information.
+      #
+      # Example:
+      #
+      #   #>pdf-small
+      #   doc.annotations.create_polygon(doc.pages[0], 20, 20, 30, 70, 80, 60, 40, 30).
+      #     border_style(color: "hp-blue", width: 2, style: [3, 1]).
+      #     interior_color("hp-orange").
+      #     regenerate_appearance
+      #
+      # See: PDF2.0 s12.5.6.9, HexaPDF::Type::Annotations::PolygonPolyline
+      class Polygon < PolygonPolyline
+
+        define_field :Subtype, type: Symbol, required: true, default: :Polygon
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,109 @@
+# -*- 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 polygon and polyline markup annotations which display either
+      # a closed polygon or a polyline 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.
+      #
+      # * The border effect can be changed through BorderEffect#border_effect. Note that cloudy
+      #   borders are not supported.
+      #
+      # * The interior color can be changed through InteriorColor#interior_color.
+      #
+      # * The line ending style can be changed through LineEndingStyling#line_ending_style.
+      #
+      # See: PDF2.0 s12.5.6.9, HexaPDF::Type::Annotations::Polyline,
+      # HexaPDF::Type::Annotations::Polygon, HexaPDF::Type::MarkupAnnotation
+      class PolygonPolyline < MarkupAnnotation
+
+        include BorderStyling
+        include BorderEffect
+        include InteriorColor
+        include LineEndingStyling
+
+        # Field Subtype is defined in the two subclasses
+        define_field :Vertices, type: PDFArray, required: true
+        define_field :LE, type: PDFArray, default: [:None, :None]
+        define_field :BS, type: :Border
+        define_field :IC, type: PDFArray
+        define_field :BE, type: :XXBorderEffect, version: '1.5'
+        define_field :IT, type: Symbol, version: '1.6',
+                     allowed_values: [:PolygonCloud, :PolyLineDimension, :PolygonDimension]
+        define_field :Measure, type: :Measure, version: '1.7'
+        define_field :Path, type: PDFArray, version: '2.0'
+
+        # :call-seq:
+        #   annot.vertices            => [x0, y0, x1, y1, ...]
+        #   annot.vertices(*points)   => annot
+        #
+        # Returns the array with the vertices, alternating between horizontal and vertical
+        # coordinates, when no argument is given. Otherwise sets the vertices and returns self.
+        #
+        # This is the only required setting. Note, however, that without setting the appearance
+        # style through convenience methods like #border_style nothing will be shown.
+        #
+        # Example:
+        #
+        #   #>pdf-small
+        #   doc.annotations.
+        #     create_polyline(doc.pages[0], 20, 20, 30, 70, 80, 60, 40, 30).
+        #     regenerate_appearance
+        def vertices(*points)
+          if points.empty?
+            self[:Vertices].to_ary
+          elsif points.length % 2 != 0
+            raise ArgumentError, "An even number of arguments must be provided"
+          else
+            self[:Vertices] = points
+            self
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,64 @@
+# -*- 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
+
+      # A polyline annotation displays a polyline inside the annotation rectangle.
+      #
+      # Also see PolygonPolyline for more information.
+      #
+      # Example:
+      #
+      #   #>pdf-small
+      #   doc.annotations.create_polyline(doc.pages[0], 20, 20, 30, 70, 80, 60, 40, 30).
+      #     border_style(color: "hp-blue", width: 2, style: [3, 1]).
+      #     interior_color("hp-orange").
+      #     regenerate_appearance
+      #
+      # See: PDF2.0 s12.5.6.9, HexaPDF::Type::Annotations::PolygonPolyline
+      class Polyline < PolygonPolyline
+
+        define_field :Subtype, type: Symbol, required: true, default: :PolyLine
+
+      end
+
+    end
+  end
+end

data/lib/hexapdf/type/annotations.rb

@@ -56,6 +56,10 @@ module HexaPDF
       autoload(:SquareCircle, 'hexapdf/type/annotations/square_circle')
       autoload(:Square, 'hexapdf/type/annotations/square')
       autoload(:Circle, 'hexapdf/type/annotations/circle')
+      autoload(:LineEndingStyling, 'hexapdf/type/annotations/line_ending_styling')
+      autoload(:PolygonPolyline, 'hexapdf/type/annotations/polygon_polyline')
+      autoload(:Polygon, 'hexapdf/type/annotations/polygon')
+      autoload(:Polyline, 'hexapdf/type/annotations/polyline')
 
     end
 

data/lib/hexapdf/type/measure.rb

@@ -0,0 +1,57 @@
+# -*- 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/dictionary'
+
+module HexaPDF
+  module Type
+
+    # A Measure dictionary specifies how measurement information should be formatted in textual
+    # form.
+    #
+    # See: PDF2.0 s12.9.1
+    class Measure < Dictionary
+
+      define_type :Measure
+
+      define_field :Type, type: Symbol, default: type
+      define_field :Subtype, type: Symbol, default: :RL,
+                   allowed_values: [:RL, :GEO]
+
+    end
+
+  end
+end

data/lib/hexapdf/type.rb

@@ -88,6 +88,7 @@ module HexaPDF
     autoload(:Namespace, 'hexapdf/type/namespace')
     autoload(:MarkedContentReference, 'hexapdf/type/marked_content_reference')
     autoload(:ObjectReference, 'hexapdf/type/object_reference')
+    autoload(:Measure, 'hexapdf/type/measure')
 
   end
 

data/lib/hexapdf/version.rb

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

data/test/hexapdf/digital_signature/signing/test_default_handler.rb

@@ -151,7 +151,6 @@ describe HexaPDF::DigitalSignature::Signing::DefaultHandler do
       @handler.finalize_objects(@field, @obj)
       ref = @obj[:Reference][0]
       assert_equal(:DocMDP, ref[:TransformMethod])
-      assert_equal(:SHA256, ref[:DigestMethod])
       assert_equal(1, ref[:TransformParams][:P])
       assert_equal(:'1.2', ref[:TransformParams][:V])
       assert_same(@obj, @doc.catalog[:Perms][:DocMDP])

data/test/hexapdf/document/test_annotations.rb

@@ -52,4 +52,24 @@ describe HexaPDF::Document::Annotations do
       assert_equal(annot, @page[:Annots].first)
     end
   end
+
+  describe "create_polyline" do
+    it "creates an appropriate polyline annotation object" do
+      annot = @annots.create(:polyline, @page, 10, 10, 20, 15)
+      assert_equal(:Annot, annot[:Type])
+      assert_equal(:PolyLine, annot[:Subtype])
+      assert_equal([10, 10, 20, 15], annot.vertices)
+      assert_equal(annot, @page[:Annots].first)
+    end
+  end
+
+  describe "create_polygon" do
+    it "creates an appropriate polygon annotation object" do
+      annot = @annots.create(:polygon, @page, 10, 10, 20, 15)
+      assert_equal(:Annot, annot[:Type])
+      assert_equal(:Polygon, annot[:Subtype])
+      assert_equal([10, 10, 20, 15], annot.vertices)
+      assert_equal(annot, @page[:Annots].first)
+    end
+  end
 end

data/test/hexapdf/document/test_layout.rb

@@ -110,11 +110,12 @@ describe HexaPDF::Document::Layout::CellArgumentCollector do
       assert_equal({key: :value, a: :c, e: :f}, @args.retrieve_arguments_for(5, 6))
     end
 
-    it "deep merges the :cell keys" do
-      @args[] = {cell: {a: :b, c: :d}}
+    it "deep merges the :cell keys in order of definition" do
       @args[3..7] = {cell: {a: :y, e: :f}}
+      @args[] = {cell: {a: :b, c: :d}}
       @args[5, 6] = {cell: {a: :z}}
       assert_equal({cell: {a: :z, c: :d, e: :f}}, @args.retrieve_arguments_for(5, 6))
+      assert_equal({cell: {a: :b, c: :d}}, @args.retrieve_arguments_for(1, 2))
     end
   end
 end
@@ -172,31 +173,36 @@ describe HexaPDF::Document::Layout do
     end
   end
 
-  describe "private retrieve_style" do
+  describe "resolve_font" do
     it "resolves a font name to a font wrapper" do
-      style = @layout.send(:retrieve_style, {font: 'Helvetica'})
+      style = @layout.style(:other, font: 'Helvetica')
+      @layout.resolve_font(style)
       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})
+      style = @layout.style(:other, font: 'Helvetica', font_bold: true)
+      @layout.resolve_font(style)
       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})
+      style = @layout.style(:other, font: 'Helvetica', font_italic: true)
+      @layout.resolve_font(style)
       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, {})
-      assert_equal('Helvetica', style.font.wrapped_font.font_name)
+      style = @layout.style(:other, base: nil, font_italic: true)
+      @layout.resolve_font(style)
+      assert_equal('Helvetica-Oblique', style.font.wrapped_font.font_name)
     end
 
     it "sets the font specified in the config option font.default as fallback" do
-      style = @layout.send(:retrieve_style, {})
-      assert_equal('Times-Roman', style.font.wrapped_font.font_name)
+      style = @layout.style(:other, base: nil, font_italic: true)
+      @layout.resolve_font(style)
+      assert_equal('Times-Italic', style.font.wrapped_font.font_name)
     end
   end
 

data/test/hexapdf/document/test_metadata.rb

@@ -13,6 +13,17 @@ describe HexaPDF::Document::Metadata do
 
   it "parses the info dictionary on creation" do
     assert_equal('Title', @metadata.title)
+
+    time = Time.now
+    @doc.trailer.info[:ModDate] = ''
+    assert_nil(HexaPDF::Document::Metadata.new(@doc).modification_date)
+    @doc.trailer.info[:ModDate] = time
+    assert_equal(time, HexaPDF::Document::Metadata.new(@doc).modification_date)
+    @doc.trailer.info[:CreationDate] = ''
+    assert_nil(HexaPDF::Document::Metadata.new(@doc).creation_date)
+    @doc.trailer.info[:CreationDate] = time
+    assert_equal(time, HexaPDF::Document::Metadata.new(@doc).creation_date)
+
     @doc.trailer.info[:Trapped] = :Unknown
     assert_nil(HexaPDF::Document::Metadata.new(@doc).trapped)
     @doc.trailer.info[:Trapped] = :True
@@ -213,6 +224,7 @@ describe HexaPDF::Document::Metadata do
       title.language = 'de'
       @metadata.title(['Title', title])
       @metadata.author(['Author 1', 'Author 2'])
+      @metadata.creation_date('')
       @metadata.register_property_type('dc', 'other', 'URI')
       @metadata.property('dc', 'other', 'https://test.org/example')
       @metadata.property('pdfaid', 'part', 3)
@@ -243,7 +255,7 @@ describe HexaPDF::Document::Metadata do
         </rdf:Description>
         <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
         <xmp:CreatorTool>Creator</xmp:CreatorTool>
-        <xmp:CreateDate>#{@metadata.send(:xmp_date, @time)}</xmp:CreateDate>
+        <xmp:CreateDate></xmp:CreateDate>
         <xmp:ModifyDate>#{@metadata.send(:xmp_date, @time)}</xmp:ModifyDate>
         </rdf:Description>
         <rdf:Description rdf:about="" xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/">