hexapdf 1.1.1 → 1.3.0

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

@@ -48,6 +48,8 @@ module HexaPDF
       # See: PDF2.0 s12.5.6.19, HexaPDF::Type::Annotation
       class Widget < Annotation
 
+        include BorderStyling
+
         # The dictionary used by the /MK key of the widget annotation.
         class AppearanceCharacteristics < Dictionary
 
@@ -122,111 +124,21 @@ module HexaPDF
           end
         end
 
-        # Describes the border of an annotation.
-        #
-        # The +color+ property is either +nil+ if the border is transparent or else a device color
-        # object - see HexaPDF::Content::ColorSpace.
-        #
-        # The +style+ property can be one of the following:
-        #
-        # :solid::      Solid line.
-        # :beveled::    Embossed rectangle seemingly raised above the surface of the page.
-        # :inset::      Engraved rectangle receeding into the page.
-        # :underlined:: Underlined, i.e. only the bottom border is draw.
-        # Array:        Dash array describing how to dash the line.
-        BorderStyle = Struct.new(:width, :color, :style, :horizontal_corner_radius,
-                                 :vertical_corner_radius)
-
-        # :call-seq:
-        #   widget.border_style                                      => border_style
-        #   widget.border_style(color: 0, width: 1, style: :solid)   => widget
-        #
-        # Returns a BorderStyle instance representing the border style of the widget when no
-        # argument is given. Otherwise sets the border style of the widget and returns self.
-        #
-        # When setting a border style, arguments that are not provided will use the default: a
-        # border with a solid, black, 1pt wide line. This also means that multiple invocations will
-        # reset *all* prior values.
-        #
-        # +color+:: The color of the border. See
-        #           HexaPDF::Content::ColorSpace.device_color_from_specification for information on
-        #           the allowed arguments.
-        #
-        #           If the special value +:transparent+ is used when setting the color, a
-        #           transparent is used. A transparent border will return a +nil+ value when getting
-        #           the border color.
-        #
-        # +width+:: The width of the border. If set to 0, no border is shown.
-        #
-        # +style+:: Defines how the border is drawn. can be one of the following:
-        #
-        #           +:solid+::      Draws a solid border.
-        #           +:beveled+::    Draws a beveled border.
-        #           +:inset+::      Draws an inset border.
-        #           +:underlined+:: Draws only the bottom border.
-        #           Array::         An array specifying a line dash pattern (see
-        #                           HexaPDF::Content::LineDashPattern)
-        def border_style(color: nil, width: nil, style: nil)
-          if color || width || style
-            color = if color == :transparent
-                      []
-                    else
-                      Content::ColorSpace.device_color_from_specification(color || 0).components
-                    end
-            width ||= 1
-            style ||= :solid
-
-            (self[:MK] ||= {})[:BC] = color
-            bs = self[:BS] = {W: width}
-            case style
-            when :solid then bs[:S] = :S
-            when :beveled then bs[:S] = :B
-            when :inset then bs[:S] = :I
-            when :underlined then bs[:S] = :U
-            when Array
-              bs[:S] = :D
-              bs[:D] = style
-            else
-              raise ArgumentError, "Unknown value #{style} for style argument"
-            end
-            self
-          else
-            result = BorderStyle.new(1, nil, :solid, 0, 0)
-            if (ac = self[:MK]) && (bc = ac[:BC]) && !bc.empty?
-              result.color = Content::ColorSpace.prenormalized_device_color(bc.value)
-            end
-
-            if (bs = self[:BS])
-              result.width = bs[:W] if bs.key?(:W)
-              result.style = case bs[:S]
-                             when :S then :solid
-                             when :B then :beveled
-                             when :I then :inset
-                             when :U then :underlined
-                             when :D then bs[:D].value
-                             else :solid
-                             end
-            elsif key?(:Border)
-              border = self[:Border]
-              result.horizontal_corner_radius = border[0]
-              result.vertical_corner_radius = border[1]
-              result.width = border[2]
-              result.style = border[3] if border[3]
-            end
-
-            result
-          end
-        end
-
-        # Describes the marker style of a check box or radio button widget.
+        # Describes the marker style of a check box, radio button or push button widget.
         class MarkerStyle
 
-          # The kind of marker that is shown inside the widget. Can either be one of the symbols
-          # +:check+, +:circle+, +:cross+, +:diamond+, +:square+ or +:star+, or a one character
-          # string. The latter is interpreted using the ZapfDingbats font.
+          # The kind of marker that is shown inside the widget.
           #
-          # If an empty string is set, it is treated as if +nil+ was set, i.e. it shows the default
-          # marker for the field type.
+          # Radion buttons and check boxes::
+          #     Can either be one of the symbols +:check+, +:circle+, +:cross+, +:diamond+,
+          #     +:square+ or +:star+, or a one character string. The latter is interpreted using the
+          #     ZapfDingbats font.
+          #
+          #     If an empty string is set, it is treated as if +nil+ was set, i.e. it shows the
+          #     default marker for the field type.
+          #
+          # Push buttons:
+          #     The caption string.
           attr_reader :style
 
           # The size of the marker in PDF points that is shown inside the widget. The special value
@@ -237,27 +149,40 @@ module HexaPDF
           # HexaPDF::Content::ColorSpace.
           attr_reader :color
 
+          # The resource name of the font that should be used for the caption.
+          #
+          # This is only used for push button widgets.
+          attr_reader :font_name
+
           # Creates a new instance with the given values.
-          def initialize(style, size, color)
+          def initialize(style, size, color, font_name)
             @style = style
             @size = size
             @color = color
+            @font_name = font_name
           end
 
         end
 
         # :call-seq:
-        #   widget.marker_style                                     => marker_style
-        #   widget.marker_style(style: nil, size: nil, color: nil)   => widget
+        #   widget.marker_style                                                      => marker_style
+        #   widget.marker_style(style: nil, size: nil, color: nil, font_name: nil)   => widget
         #
         # Returns a MarkerStyle instance representing the marker style of the widget when no
         # argument is given. Otherwise sets the button marker style of the widget and returns self.
         #
-        # This method returns valid information only for check boxes and radio buttons!
+        # This method returns valid information only for check boxes, radio buttons and push buttons!
         #
-        # When setting a marker style, arguments that are not provided will use the default: a black
-        # auto-sized checkmark (i.e. :check for for check boxes) or circle (:circle for radio
-        # buttons). This also means that multiple invocations will reset *all* prior values.
+        # When setting a marker style, arguments that are not provided will use the default:
+        #
+        # * For check boxes a black auto-sized checkmark (i.e. :check)
+        # * For radio buttons a black auto-sized circle (i.e. :circle)
+        # * For push buttons a black 9pt empty text using Helvetica
+        #
+        # This also means that multiple invocations will reset *all* prior values.
+        #
+        # Note that the +font_name+ argument must be a valid HexaPDF font name (this is in contrast
+        # to MarkerStyle#font_name which returns the resource name of the font).
         #
         # Note: The marker is called "normal caption" in the PDF 2.0 spec and the /CA entry of the
         # associated appearance characteristics dictionary. The marker size and color are set using
@@ -265,13 +190,18 @@ module HexaPDF
         # does it).
         #
         # See: PDF2.0 s12.5.6.19 and s12.7.4.3
-        def marker_style(style: nil, size: nil, color: nil)
+        def marker_style(style: nil, size: nil, color: nil, font_name: nil)
           field = form_field
-          if style || size || color
-            style ||= (field.check_box? ? :check : :cicrle)
-            size ||= 0
+          if style || size || color || font_name
+            style ||= case field.concrete_field_type
+                      when :check_box then :check
+                      when :radio_button then :circle
+                      when :push_button then ''
+                      end
+            size ||= (field.push_button? ? 9 : 0)
             color = Content::ColorSpace.device_color_from_specification(color || 0)
             serialized_color = Content::ColorSpace.serialize_device_color(color)
+            font_name ||= 'Helvetica'
 
             self[:MK] ||= {}
             self[:MK][:CA] = case style
@@ -285,7 +215,13 @@ module HexaPDF
                              else
                                raise ArgumentError, "Unknown value #{style} for argument 'style'"
                              end
-            self[:DA] = "/ZaDb #{size} Tf #{serialized_color}".strip
+            self[:DA] = if field.push_button?
+                          name = document.acro_form(create: true).default_resources.
+                            add_font(document.fonts.add(font_name).pdf_object)
+                          "/#{name} #{size} Tf #{serialized_color}".strip
+                        else
+                          "/ZaDb #{size} Tf #{serialized_color}".strip
+                        end
           else
             style = case self[:MK]&.[](:CA)
                     when '4' then :check
@@ -305,12 +241,12 @@ module HexaPDF
             size = 0
             color = HexaPDF::Content::ColorSpace.prenormalized_device_color([0])
             if (da = self[:DA] || field[:DA])
-              _, da_size, da_color = AcroForm::VariableTextField.parse_appearance_string(da)
+              font_name, da_size, da_color = AcroForm::VariableTextField.parse_appearance_string(da)
               size = da_size || size
               color = da_color || color
             end
 
-            MarkerStyle.new(style, size, color)
+            MarkerStyle.new(style, size, color, font_name)
           end
         end
 

data/lib/hexapdf/type/annotations.rb

@@ -48,6 +48,14 @@ module HexaPDF
       autoload(:Text, 'hexapdf/type/annotations/text')
       autoload(:Link, 'hexapdf/type/annotations/link')
       autoload(:Widget, 'hexapdf/type/annotations/widget')
+      autoload(:BorderStyling, 'hexapdf/type/annotations/border_styling')
+      autoload(:Line, 'hexapdf/type/annotations/line')
+      autoload(:AppearanceGenerator, 'hexapdf/type/annotations/appearance_generator')
+      autoload(:BorderEffect, 'hexapdf/type/annotations/border_effect')
+      autoload(:InteriorColor, 'hexapdf/type/annotations/interior_color')
+      autoload(:SquareCircle, 'hexapdf/type/annotations/square_circle')
+      autoload(:Square, 'hexapdf/type/annotations/square')
+      autoload(:Circle, 'hexapdf/type/annotations/circle')
 
     end
 

data/lib/hexapdf/type/form.rb

@@ -167,14 +167,14 @@ module HexaPDF
       # bounding box.
       #
       # *Note* that a canvas can only be retrieved for initially empty form XObjects!
-      def canvas
+      def canvas(translate: true)
         cache(:canvas) do
           unless stream.empty?
             raise HexaPDF::Error, "Cannot create a canvas for a form XObjects with contents"
           end
 
           canvas = Content::Canvas.new(self)
-          if box.left != 0 || box.bottom != 0
+          if translate && (box.left != 0 || box.bottom != 0)
             canvas.save_graphics_state.translate(box.left, box.bottom)
           end
           self.stream = canvas.stream_data

data/lib/hexapdf/version.rb

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

data/lib/hexapdf/writer.rb

@@ -150,7 +150,6 @@ module HexaPDF
 
       xref_section = XRefSection.new
       xref_section.mark_as_initial_section! unless previous_xref_pos
-      xref_section.add_free_entry(0, 65535) if previous_xref_pos.nil?
       rev.each do |obj|
         if obj.null?
           xref_section.add_free_entry(obj.oid, obj.gen)

data/lib/hexapdf/xref_section.rb

@@ -113,9 +113,10 @@ module HexaPDF
 
     # Marks this XRefSection object as being the first cross-reference section in a PDF file.
     #
-    # This has the consequence that only a single sub-section is created.
+    # This has the consequence that only a single sub-section starting a zero is created.
     def mark_as_initial_section!
       @initial_section = true
+      add_free_entry(0, 65535)
     end
 
     # Adds an in-use entry to the cross-reference section.
@@ -161,9 +162,10 @@ module HexaPDF
       return to_enum(__method__) unless block_given?
 
       temp = []
-      oids.sort.each do |oid|
-        expected_next_oid = !temp.empty? && temp[-1].oid + 1
-        if expected_next_oid && expected_next_oid != oid
+      sorted_oids = oids.sort
+      expected_next_oid = sorted_oids[0]
+      sorted_oids.each do |oid|
+        if expected_next_oid != oid
           if @initial_section
             expected_next_oid.upto(oid - 1) do |free_oid|
               temp << self.class.free_entry(free_oid, 0)
@@ -174,6 +176,7 @@ module HexaPDF
           end
         end
         temp << self[oid]
+        expected_next_oid = oid + 1
       end
       yield(temp)
       self

data/test/hexapdf/content/test_graphics_state.rb

@@ -2,7 +2,6 @@
 
 require 'test_helper'
 require 'hexapdf/content/graphics_state'
-require 'ostruct'
 
 # Dummy class used as wrapper so that constant lookup works correctly
 class GraphicsStateWrapper < Minitest::Spec
@@ -149,8 +148,8 @@ class GraphicsStateWrapper < Minitest::Spec
     end
 
     it "uses the correct glyph to text space scaling" do
-      font = OpenStruct.new
-      font.glyph_scaling_factor = 0.002
+      font = Object.new
+      font.define_singleton_method(:glyph_scaling_factor) { 0.002 }
       @gs.font = font
       @gs.font_size = 10
       assert_equal(0.02, @gs.scaled_font_size)

data/test/hexapdf/content/test_operator.rb

@@ -4,7 +4,6 @@ require 'test_helper'
 require 'hexapdf/content/operator'
 require 'hexapdf/content/processor'
 require 'hexapdf/serializer'
-require 'ostruct'
 
 describe HexaPDF::Content::Operator::BaseOperator do
   before do
@@ -191,8 +190,8 @@ end
 
 describe_operator :SetGraphicsStateParameters, :gs do
   it "applies parameters from an ExtGState dictionary" do
-    font = OpenStruct.new
-    font.glyph_scaling_factor = 0.01
+    font = Object.new
+    font.define_singleton_method(: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],
@@ -453,8 +452,8 @@ describe_operator :SetFontAndSize, :Tf do
       self[:Font] && self[:Font][name]
     end
 
-    font = OpenStruct.new
-    font.glyph_scaling_factor = 0.01
+    font = Object.new
+    font.define_singleton_method(:glyph_scaling_factor) { 0.01 }
     @processor.resources[:Font] = {F1: font}
     invoke(:F1, 10)
     assert_equal(@processor.resources.font(:F1), @processor.graphics_state.font)

data/test/hexapdf/digital_signature/test_cms_handler.rb

@@ -4,17 +4,16 @@ require 'digest'
 require 'test_helper'
 require_relative 'common'
 require 'hexapdf/digital_signature'
-require 'ostruct'
 
 describe HexaPDF::DigitalSignature::CMSHandler do
   before do
-    @data = 'Some data'
-    @dict = OpenStruct.new
-    @pkcs7 = OpenSSL::PKCS7.sign(CERTIFICATES.signer_certificate, CERTIFICATES.signer_key,
-                                 @data, [CERTIFICATES.ca_certificate],
-                                 OpenSSL::PKCS7::DETACHED)
-    @dict.contents = @pkcs7.to_der
-    @dict.signed_data = @data
+    @data = data = 'Some data'
+    @dict = Struct.new(:contents, :signed_data, :signature_type, :Reference, :M).new
+    @pkcs7 = pkcs7 = OpenSSL::PKCS7.sign(CERTIFICATES.signer_certificate, CERTIFICATES.signer_key,
+                                         @data, [CERTIFICATES.ca_certificate],
+                                         OpenSSL::PKCS7::DETACHED)
+    @dict.contents = pkcs7.to_der
+    @dict.signed_data = data
     @handler = HexaPDF::DigitalSignature::CMSHandler.new(@dict)
   end
 

data/test/hexapdf/digital_signature/test_handler.rb

@@ -4,7 +4,6 @@ require 'test_helper'
 require 'hexapdf/digital_signature'
 require 'hexapdf/document'
 require 'time'
-require 'ostruct'
 require 'openssl'
 
 describe HexaPDF::DigitalSignature::Handler do
@@ -33,7 +32,7 @@ describe HexaPDF::DigitalSignature::Handler do
 
   describe "store_verification_callback" do
     before do
-      @context = OpenStruct.new
+      @context = Struct.new(:error).new
     end
 
     it "can allow self-signed certificates" do
@@ -60,7 +59,7 @@ describe HexaPDF::DigitalSignature::Handler do
     ].each do |success, not_before, not_after|
       @result.messages.clear
       @handler.define_singleton_method(:signer_certificate) do
-        OpenStruct.new.tap do |struct|
+        Struct.new(:not_before, :not_after).new.tap do |struct|
           struct.not_before = Time.parse("2021-11-14 #{not_before}")
           struct.not_after = Time.parse("2021-11-14 #{not_after}")
         end

data/test/hexapdf/digital_signature/test_pkcs1_handler.rb

@@ -3,12 +3,11 @@
 require 'test_helper'
 require_relative 'common'
 require 'hexapdf/digital_signature'
-require 'ostruct'
 
 describe HexaPDF::DigitalSignature::PKCS1Handler do
   before do
     @data = 'Some data'
-    @dict = OpenStruct.new
+    @dict = Struct.new(:signed_data, :contents, :Cert, :Reference, :M).new
     @dict.signed_data = @data
     encoded_data = CERTIFICATES.signer_key.sign(OpenSSL::Digest.new('SHA1'), @data)
     @dict.contents = OpenSSL::ASN1::OctetString.new(encoded_data).to_der

data/test/hexapdf/document/test_annotations.rb

@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+
+require 'test_helper'
+require 'hexapdf/document'
+
+describe HexaPDF::Document::Annotations do
+  before do
+    @doc = HexaPDF::Document.new
+    @page = @doc.pages.add
+    @annots = @doc.annotations
+  end
+
+  describe "create" do
+    it "fails if the type argument doesn't refer to an implemented method" do
+      assert_raises(ArgumentError) { @annots.create(:unknown, @page) }
+    end
+
+    it "delegates to the actual create_TYPE implementation" do
+      annot = @annots.create(:line, @page, start_point: [0, 0], end_point: [10, 10])
+      assert_equal(:Line, annot[:Subtype])
+      annot = @annots.create(:rectangle, @page, 10, 20, 30, 40)
+      assert_equal(:Square, annot[:Subtype])
+    end
+  end
+
+  describe "create_line" do
+    it "creates an appropriate line annotation object" do
+      annot = @annots.create(:line, @page, start_point: [0, 5], end_point: [10, 15])
+      assert_equal(:Annot, annot[:Type])
+      assert_equal(:Line, annot[:Subtype])
+      assert_equal([0, 5, 10, 15], annot.line)
+      assert_equal(annot, @page[:Annots].first)
+    end
+  end
+
+  describe "create_rectangle" do
+    it "creates an appropriate square annotation object" do
+      annot = @annots.create(:rectangle, @page, 10, 20, 30, 40)
+      assert_equal(:Annot, annot[:Type])
+      assert_equal(:Square, annot[:Subtype])
+      assert_equal([10, 20, 40, 60], annot[:Rect])
+      assert_equal(annot, @page[:Annots].first)
+    end
+  end
+
+  describe "create_ellipse" do
+    it "creates an appropriate circle annotation object" do
+      annot = @annots.create(:ellipse, @page, 100, 100, a: 30, b: 40)
+      assert_equal(:Annot, annot[:Type])
+      assert_equal(:Circle, annot[:Subtype])
+      assert_equal([70, 60, 130, 140], annot[:Rect])
+      assert_equal(annot, @page[:Annots].first)
+    end
+  end
+end

data/test/hexapdf/document/test_layout.rb

@@ -146,6 +146,16 @@ describe HexaPDF::Document::Layout do
     end
   end
 
+  describe "style?" do
+    it "returns true if a given style is defined" do
+      assert(@layout.style?(:base))
+    end
+
+    it "returns false if a given style is not defined" do
+      refute(@layout.style?(:unknown))
+    end
+  end
+
   describe "styles" do
     it "returns the existing styles" do
       @layout.style(:test, font_size: 20)
@@ -168,6 +178,16 @@ describe HexaPDF::Document::Layout do
       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})
+      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})
+      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, {})
@@ -203,7 +223,8 @@ describe HexaPDF::Document::Layout do
 
   describe "box" do
     it "creates the request box" do
-      box = @layout.box(:column, columns: 3, gaps: 20, width: 15, height: 30, style: {font_size: 10},
+      box = @layout.box(:column, columns: 3, width: 15, height: 30,
+                        style: {font_size: 10, box_options: {gaps: 20}},
                         properties: {key: :value})
       assert_equal(15, box.width)
       assert_equal(30, box.height)
@@ -431,9 +452,10 @@ describe HexaPDF::Document::Layout do
 
   describe "table_box" do
     it "creates a table box" do
-      box = @layout.table_box([['m']], column_widths: [100], header: proc { [['a']] },
+      box = @layout.table_box([['m']], header: proc { [['a']] },
                               footer: proc { [['b']] }, cell_style: {background_color: "red"},
                               width: 100, height: 300, style: {background_color: "blue"},
+                              box_options: {column_widths: [100]},
                               properties: {key: :value}, border: {width: 1})
       assert_equal(100, box.width)
       assert_equal(300, box.height)

data/test/hexapdf/font/test_true_type_wrapper.rb

@@ -209,6 +209,13 @@ describe HexaPDF::Font::TrueTypeWrapper do
                    dict[:Encoding].stream)
       assert_equal([glyph.id, [glyph.width]], dict[:DescendantFonts][0][:W].value)
     end
+
+    it "handles the case where the font is added but then not used and deleted" do
+      @doc.task(:optimize, compact: true)
+      assert(@font_wrapper.pdf_object.null?)
+      @doc.dispatch_message(:complete_objects)
+      assert(@font_wrapper.pdf_object.null?)
+    end
   end
 
   describe "font file embedding" do

data/test/hexapdf/font/test_type1_wrapper.rb

@@ -140,5 +140,12 @@ describe HexaPDF::Font::Type1Wrapper do
     it "makes sure that the PDF dictionaries are indirect" do
       assert(@times_wrapper.pdf_object.indirect?)
     end
+
+    it "handles the case where the font is added but then not used and deleted" do
+      @doc.task(:optimize, compact: true)
+      assert(@times_wrapper.pdf_object.null?)
+      @doc.dispatch_message(:complete_objects)
+      assert(@times_wrapper.pdf_object.null?)
+    end
   end
 end

data/test/hexapdf/font/true_type/test_subsetter.rb

@@ -27,6 +27,16 @@ describe HexaPDF::Font::TrueType::Subsetter do
     assert_equal(value, @subsetter.subset_glyph_id(5))
   end
 
+  it "doesn't use certain subset glyph IDs for performance reasons" do
+    1.upto(93) {|i| @subsetter.use_glyph(i) }
+    # glyph 0, 93 used glyph, 4 special glyphs
+    assert_equal(1 + 93 + 4, @subsetter.instance_variable_get(:@glyph_map).size)
+    1.upto(12) {|i| assert_equal(i, @subsetter.subset_glyph_id(i), "id=#{i}") }
+    13.upto(38) {|i| assert_equal(i + 1, @subsetter.subset_glyph_id(i), "id=#{i}") }
+    39.upto(88) {|i| assert_equal(i + 3, @subsetter.subset_glyph_id(i), "id=#{i}") }
+    89.upto(93) {|i| assert_equal(i + 4, @subsetter.subset_glyph_id(i), "id=#{i}") }
+  end
+
   it "creates the subset font file" do
     gid = @font[:cmap].preferred_table[0x41]
     @subsetter.use_glyph(gid)

data/test/hexapdf/layout/test_style.rb

@@ -738,6 +738,30 @@ describe HexaPDF::Layout::Style do
     end
   end
 
+  describe "each_property" do
+    it "yields all set properties with their values" do
+      @style.font_size = 5
+      @style.line_spacing = 1.2
+      assert_equal(0.005, @style.scaled_font_size)
+      assert_equal([[:font, @style.font], [:font_size, 5], [:horizontal_scaling, 100],
+                    [:line_spacing, @style.line_spacing], [:subscript, false], [:superscript, false]],
+                   @style.each_property.to_a.sort)
+    end
+  end
+
+  describe "merge" do
+    it "merges all set properties" do
+      @style.font_size = 5
+      @style.line_spacing = 1.2
+      new_style = HexaPDF::Layout::Style.new
+      new_style.update(font_size: 3, line_spacing: {type: :fixed, value: 2.5})
+      new_style.merge(@style)
+      assert_equal(5, new_style.font_size)
+      assert_equal(:proportional, new_style.line_spacing.type)
+      assert_equal(1.2, new_style.line_spacing.value)
+    end
+  end
+
   it "has several simple and dynamically generated properties with default values" do
     @style = HexaPDF::Layout::Style.new
     assert_raises(HexaPDF::Error) { @style.font }
@@ -780,6 +804,7 @@ describe HexaPDF::Layout::Style do
     assert_equal(:left, @style.align)
     assert_equal(:top, @style.valign)
     assert_equal(:default, @style.mask_mode)
+    assert_equal({}, @style.box_options)
   end
 
   it "allows using a non-standard setter for generated properties" do
@@ -790,8 +815,8 @@ describe HexaPDF::Layout::Style do
     @style.stroke_dash_pattern(5, 2)
     assert_equal([[5], 2], @style.stroke_dash_pattern.to_operands)
 
-    @style.line_spacing(1.2)
-    assert_equal([:proportional, 1.2], [@style.line_spacing.type, @style.line_spacing.value])
+    @style.line_spacing(HexaPDF::Layout::Style::LineSpacing.new(type: :double))
+    assert_equal([:proportional, 2], [@style.line_spacing.type, @style.line_spacing.value])
   end
 
   it "allows checking for valid values" do

data/test/hexapdf/task/test_optimize.rb

@@ -99,7 +99,7 @@ describe HexaPDF::Task::Optimize do
       objstm = @doc.add({}, type: HexaPDF::Type::ObjectStream)
       @doc.add({}, type: HexaPDF::Type::XRefStream)
       objstm.add_object(@doc.add({Type: :Test}))
-      @doc.write(io)
+      @doc.write(io, compact: false)
       io.rewind
       @doc = HexaPDF::Document.new(io: io)
     end