hexapdf 0.46.0 → 1.0.0

data/test/data/standard-security-handler/bothpwd-aes-256bit-V5-R5.pdf

@@ -0,0 +1,43 @@
+%PDF-1.7
+%����
+1 0 obj
+<< /Extensions << /ADBE << /BaseVersion /1.7 /ExtensionLevel 3 >> >> /Pages 3 0 R /Type /Catalog >>
+endobj
+2 0 obj
+<< /ModDate <aa1d1637459ea17c7fc9709f0c0c7b64761ff74e905b3765f33425776aa3010163cd5e898cfa7c5fc16159359375c323> >>
+endobj
+3 0 obj
+<< /Count 1 /Kids [ 4 0 R ] /MediaBox [ 0 0 612 446 ] /Type /Pages >>
+endobj
+4 0 obj
+<< /Contents 5 0 R /Parent 3 0 R /Resources 6 0 R /Type /Page >>
+endobj
+5 0 obj
+<< /Length 80 /Filter /FlateDecode >>
+stream
+J<~S�)��9�M�$S�z��g�j���r�.R�"PO���_���X���^�GP�&z�g�*$�2SΈ�z�Kl��5ĩendstream
+endobj
+6 0 obj
+<< /Font << /F1 7 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+7 0 obj
+<< /BaseFont /Helvetica /Name /F1 /Subtype /Type1 /Type /Font >>
+endobj
+8 0 obj
+<< /CF << /StdCF << /AuthEvent /DocOpen /CFM /AESV3 /Length 32 >> >> /Filter /Standard /Length 256 /O <c60934c0925e8d3ceebd0609102d9407dcf22d7fb3d87d030fce633af6d2ed99c1c3382bee5e8afc0d55ff8bca441d48> /OE <3fa2e3ecf34ddcb38b44af372a43268dda32111f58dc79da74d960b8fa206ead> /P -4 /Perms <b6c6ab65529f0a3322f03909e8a5547a> /R 5 /StmF /StdCF /StrF /StdCF /U <18fbd94777c28531c495a3116d273de9f8f3ed338b31c07687ca0ba06812842843765a66484d098194bcef0f9ecaaace> /UE <496a81bbb3207dfd12ddca4c16b60a411c6a18e638205824295e09afde826b4a> /V 5 >>
+endobj
+xref
+0 9
+0000000000 65535 f 
+0000000015 00000 n 
+0000000130 00000 n 
+0000000259 00000 n 
+0000000344 00000 n 
+0000000424 00000 n 
+0000000574 00000 n 
+0000000641 00000 n 
+0000000721 00000 n 
+trailer << /Info 2 0 R /Root 1 0 R /Size 9 /ID [<6790ffa610024e78369114311fc0df96><ed6c0810cb0d19599ac62042a0487749>] /Encrypt 8 0 R >>
+startxref
+1268
+%%EOF

data/test/data/standard-security-handler/nopwd-aes-256bit-V5-R5.pdf

@@ -0,0 +1,44 @@
+%PDF-1.7
+%����
+1 0 obj
+<< /Extensions << /ADBE << /BaseVersion /1.7 /ExtensionLevel 3 >> >> /Pages 3 0 R /Type /Catalog >>
+endobj
+2 0 obj
+<< /ModDate <0a09febf75d913e5eff6197f52f28b31321a43f49e0735a25a93dd77b1a2701e73ae05be0803747ca030ee4917544cbb> >>
+endobj
+3 0 obj
+<< /Count 1 /Kids [ 4 0 R ] /MediaBox [ 0 0 612 446 ] /Type /Pages >>
+endobj
+4 0 obj
+<< /Contents 5 0 R /Parent 3 0 R /Resources 6 0 R /Type /Page >>
+endobj
+5 0 obj
+<< /Length 80 /Filter /FlateDecode >>
+stream
+\��sy%1����a��
+�/���F�.�L:pb���C�`��D�5 �� �کU"�ʇ�3�Fy/�9�<V��ڦ;�?5�S�8endstream
+endobj
+6 0 obj
+<< /Font << /F1 7 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+7 0 obj
+<< /BaseFont /Helvetica /Name /F1 /Subtype /Type1 /Type /Font >>
+endobj
+8 0 obj
+<< /CF << /StdCF << /AuthEvent /DocOpen /CFM /AESV3 /Length 32 >> >> /Filter /Standard /Length 256 /O <8034f99b1eff9e91054d7ee490155e22f65170f607d6a614236b089e602517d9a22abe7c1ea53f52dbc9ae8d9701a065> /OE <bdc5c4b46519af7b4041b7341f70e4d8b1c6087dc12d3f16f060313f18e73386> /P -4 /Perms <64028d6bceb0d927477ecf45e6be7f3f> /R 5 /StmF /StdCF /StrF /StdCF /U <5db7b7b5bd8bbe9fac28477756a930cb079e1dcbdcd3b50c1817d3de4ce5184b5189848832df0043f8e1fe19ff696a36> /UE <dc3fed7b473148238ba0689409edd3d80c91bd26802003c152594aa27a50a81e> /V 5 >>
+endobj
+xref
+0 9
+0000000000 65535 f 
+0000000015 00000 n 
+0000000130 00000 n 
+0000000259 00000 n 
+0000000344 00000 n 
+0000000424 00000 n 
+0000000574 00000 n 
+0000000641 00000 n 
+0000000721 00000 n 
+trailer << /Info 2 0 R /Root 1 0 R /Size 9 /ID [<6790ffa610024e78369114311fc0df96><da8e0d03302398724f68ef24a831285e>] /Encrypt 8 0 R >>
+startxref
+1268
+%%EOF

data/test/data/standard-security-handler/ownerpwd-aes-256bit-V5-R5.pdf

@@ -0,0 +1,43 @@
+%PDF-1.7
+%����
+1 0 obj
+<< /Extensions << /ADBE << /BaseVersion /1.7 /ExtensionLevel 3 >> >> /Pages 3 0 R /Type /Catalog >>
+endobj
+2 0 obj
+<< /ModDate <d2aa32b8d87666bd29df499a424d2e6d23c0b475ebb67598733b5f06429470a37062d3d6a32fc9603301c5eb99a20605> >>
+endobj
+3 0 obj
+<< /Count 1 /Kids [ 4 0 R ] /MediaBox [ 0 0 612 446 ] /Type /Pages >>
+endobj
+4 0 obj
+<< /Contents 5 0 R /Parent 3 0 R /Resources 6 0 R /Type /Page >>
+endobj
+5 0 obj
+<< /Length 80 /Filter /FlateDecode >>
+stream
+ j��D3�(���"�ڛ�������xvY$B\4^Y����$��
+endobj
+6 0 obj
+<< /Font << /F1 7 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+7 0 obj
+<< /BaseFont /Helvetica /Name /F1 /Subtype /Type1 /Type /Font >>
+endobj
+8 0 obj
+<< /CF << /StdCF << /AuthEvent /DocOpen /CFM /AESV3 /Length 32 >> >> /Filter /Standard /Length 256 /O <95d20f6277a6955bf4bda243c2144e94889bd5fa4225a4cf4e0d496fa1ffa1d991e1a37d46e4afe9e2dfc207eba9ec53> /OE <432a7d086b4338f1020bbc5847e6dd4f49ce586ab2c5de0f5301450e45e3bb3e> /P -4 /Perms <7df865105074d365f2ce50407e8b6dc8> /R 5 /StmF /StdCF /StrF /StdCF /U <930a631e8b2b95ff6b024e9bde92cb73c5c43f0106ec4fb1c336e49608c0740d87395c6ea79b99ee07eeae5ffbacd031> /UE <3f7eb6b9a897049bfca85a5ae71470eca3dfedbe9101e8532b217e4d95bcf51a> /V 5 >>
+endobj
+xref
+0 9
+0000000000 65535 f 
+0000000015 00000 n 
+0000000130 00000 n 
+0000000259 00000 n 
+0000000344 00000 n 
+0000000424 00000 n 
+0000000574 00000 n 
+0000000641 00000 n 
+0000000721 00000 n 
+trailer << /Info 2 0 R /Root 1 0 R /Size 9 /ID [<6790ffa610024e78369114311fc0df96><dd2e6bd65a9735c0bef37d88d5291ff1>] /Encrypt 8 0 R >>
+startxref
+1268
+%%EOF

data/test/hexapdf/common_tokenizer_tests.rb

@@ -104,6 +104,11 @@ module CommonTokenizerTests
     assert_raises(HexaPDF::MalformedPDFError) { @tokenizer.next_token }
   end
 
+  it "next_token: fails on a closing parenthesis that is not part of a literal string" do
+    create_tokenizer(" )")
+    assert_raises(HexaPDF::MalformedPDFError) { @tokenizer.next_token }
+  end
+
   it "next_token: fails on a missing greater than sign in a hex string" do
     create_tokenizer("<ABCD")
     assert_raises(HexaPDF::MalformedPDFError) { @tokenizer.next_token }

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

@@ -157,6 +157,12 @@ describe HexaPDF::DigitalSignature::Signing::DefaultHandler do
       assert_same(@obj, @doc.catalog[:Perms][:DocMDP])
     end
 
+    it "updates the document version if :pades signing is used" do
+      @handler.signature_type = :pades
+      @handler.finalize_objects(@field, @obj)
+      assert_equal('2.0', @doc.version)
+    end
+
     it "fails if DocMDP should be set but there is already a signature" do
       @handler.doc_mdp_permissions = :no_changes
       2.times do

data/test/hexapdf/digital_signature/test_cms_handler.rb

@@ -62,7 +62,7 @@ describe HexaPDF::DigitalSignature::CMSHandler do
       @dict.contents = @pkcs7.to_der
       @handler = HexaPDF::DigitalSignature::CMSHandler.new(@dict)
       result = @handler.verify(@store)
-      assert_equal(2, result.messages.size)
+      assert_equal(3, result.messages.size)
       assert_equal(:error, result.messages.first.type)
       assert_match(/Exactly one signer needed/, result.messages.first.content)
     end
@@ -100,13 +100,13 @@ describe HexaPDF::DigitalSignature::CMSHandler do
 
     it "verifies the signature itself" do
       result = @handler.verify(@store)
-      assert_equal(:info, result.messages.last.type)
-      assert_match(/Signature valid/, result.messages.last.content)
+      assert_equal(:info, result.messages[-2].type)
+      assert_match(/Signature valid/, result.messages[-2].content)
 
       @dict.signed_data = 'other data'
       result = @handler.verify(@store)
-      assert_equal(:error, result.messages.last.type)
-      assert_match(/Signature verification failed/, result.messages.last.content)
+      assert_equal(:error, result.messages[-2].type)
+      assert_match(/Signature verification failed/, result.messages[-2].content)
     end
 
     it "verifies a timestamp signature" do
@@ -125,8 +125,13 @@ describe HexaPDF::DigitalSignature::CMSHandler do
       @handler = HexaPDF::DigitalSignature::CMSHandler.new(@dict)
 
       result = @handler.verify(@store)
-      assert_equal(:info, result.messages.last.type)
-      assert_match(/Signature valid/, result.messages.last.content)
+      assert_equal(:info, result.messages[-2].type)
+      assert_match(/Signature valid/, result.messages[-2].content)
+    end
+
+    it "provides information on the certificate chain" do
+      result = @handler.verify(@store)
+      assert_match(/RSA signer -> HexaPDF Test Root CA/, result.messages.last.content)
     end
   end
 

data/test/hexapdf/digital_signature/test_signature.rb

@@ -111,6 +111,13 @@ describe HexaPDF::DigitalSignature::Signature do
       assert_equal((MINIMAL_PDF[0, 400] << MINIMAL_PDF[500, 333]).b, @sig.signed_data)
     end
 
+    it "works for invalid offsets" do
+      doc = HexaPDF::Document.new(io: StringIO.new(MINIMAL_PDF))
+      @sig.document = doc
+      @sig[:ByteRange] = [0, 400, 9000, 333]
+      assert_equal(MINIMAL_PDF[0, 400], @sig.signed_data)
+    end
+
     it "fails if the document isn't associated with an existing PDF file" do
       assert_raises(HexaPDF::Error) { @sig.signed_data }
     end

data/test/hexapdf/digital_signature/test_signatures.rb

@@ -16,13 +16,13 @@ describe HexaPDF::DigitalSignature::Signatures do
 
   it "iterates over all signature dictionaries" do
     assert_equal([], @doc.signatures.to_a)
-    @sig1.field_value = :sig1
-    @sig2.field_value = :sig2
-    assert_equal([:sig1, :sig2], @doc.signatures.to_a)
+    @sig1.field_value = {k: :sig1}
+    @sig2.field_value = {k: :sig2}
+    assert_equal([{k: :sig1}, {k: :sig2}], @doc.signatures.to_a)
   end
 
   it "returns the number of signature dictionaries" do
-    @sig1.field_value = :sig1
+    @sig1.field_value = {k: :sig1}
     assert_equal(1, @doc.signatures.count)
   end
 
@@ -70,7 +70,8 @@ describe HexaPDF::DigitalSignature::Signatures do
       end
       @doc.signatures.add(@io, @handler, write_options: {update_fields: false})
       sig = @doc.signatures.first
-      assert_equal([0, 925, 925 + sig[:Contents].size * 2 + 2, 2501], sig[:ByteRange].value)
+      assert_equal([0, 925, 925 + sig[:Contents].size * 2 + 2, 2455 + HexaPDF::VERSION.length],
+                   sig[:ByteRange].value)
       assert_equal(:sig, sig[:key])
       assert_equal(:sig_field, @doc.acro_form.each_field.first[:key])
       assert(sig.key?(:Contents))
@@ -132,14 +133,18 @@ describe HexaPDF::DigitalSignature::Signatures do
     it "handles different xref section types correctly when determing the offsets" do
       @doc.delete(7)
       sig = @doc.signatures.add(@io, @handler, write_options: {update_fields: false})
-      assert_equal([0, 1036, 1036 + sig[:Contents].size * 2 + 2, 2483], sig[:ByteRange].value)
+      l1 = 1030 + HexaPDF::VERSION.length
+      assert_equal([0, l1, l1 + sig[:Contents].size * 2 + 2, 2437 + HexaPDF::VERSION.length],
+                   sig[:ByteRange].value)
     end
 
     it "works if the signature object is the last object of the xref section" do
       field = @doc.acro_form(create: true).create_signature_field('Signature2')
       field.create_widget(@doc.pages[0], Rect: [0, 0, 0, 0])
       sig = @doc.signatures.add(@io, @handler, signature: field, write_options: {update_fields: false})
-      assert_equal([0, 3143, 3143 + sig[:Contents].size * 2 + 2, 380], sig[:ByteRange].value)
+      l1 = 3097 + HexaPDF::VERSION.length
+      assert_equal([0, l1, l1 + sig[:Contents].size * 2 + 2, 374 + HexaPDF::VERSION.length],
+                   sig[:ByteRange].value)
     end
 
     it "allows writing to a file in addition to writing to an IO" do

data/test/hexapdf/encryption/test_standard_security_handler.rb

@@ -228,11 +228,14 @@ describe HexaPDF::Encryption::StandardSecurityHandler do
     end
 
     it "fails if the /R value is incorrect" do
+      HexaPDF::Encryption::StandardEncryptionDictionary.field(:R).allowed_values << 7
       exp = assert_raises(HexaPDF::UnsupportedEncryptionError) do
-        @handler.set_up_decryption({Filter: :Standard, V: 2, R: 5, O: 't' * 32, U: 't' * 32, P: 0,
+        @handler.set_up_decryption({Filter: :Standard, V: 2, R: 7, O: 't' * 32, U: 't' * 32, P: 0,
                                     Length: 128})
       end
-      assert_match(/Invalid \/R value 5/i, exp.message)
+      assert_match(/Invalid \/R value 7/i, exp.message)
+    ensure
+      HexaPDF::Encryption::StandardEncryptionDictionary.field(:R).allowed_values.pop
     end
 
     it "fails if the supplied password is invalid" do

data/test/hexapdf/font/cmap/test_writer.rb

@@ -5,7 +5,7 @@ require 'hexapdf/font/cmap/writer'
 
 describe HexaPDF::Font::CMap::Writer do
   before do
-    @cmap_data = <<~EOF
+    @to_unicode_cmap_data = <<~EOF
       /CIDInit /ProcSet findresource begin
       12 dict begin
       begincmap
@@ -32,35 +32,92 @@ describe HexaPDF::Font::CMap::Writer do
       end
       end
     EOF
-    @mapping = []
-    0x00.upto(0x5e) {|i| @mapping << [i, 0x20 + i] }
-    @mapping << [0x60, 0x90]
-    0x1379.upto(0x137B) {|i| @mapping << [i, 0x90FE + i - 0x1379] }
-    @mapping << [0x3A51, 0x2003E]
+    @cid_cmap_data = <<~EOF
+      %!PS-Adobe-3.0 Resource-CMap
+      %%DocumentNeededResources: ProcSet (CIDInit)
+      %%IncludeResource: ProcSet (CIDInit)
+      %%BeginResource: CMap (Custom)
+      %%Title: (Custom Adobe Identity 0)
+      %%Version: 1
+      /CIDInit /ProcSet findresource begin
+      12 dict begin
+      begincmap
+      /CIDSystemInfo 3 dict dup begin
+        /Registry (Adobe) def
+        /Ordering (Identity) def
+        /Supplement 0 def
+      end def
+      /CMapName /Custom def
+      /CMapType 1 def
+      /CMapVersion 1 def
+      /WMode 0 def
+      1 begincodespacerange
+      <0000> <FFFF>
+      endcodespacerange
+      1 begincidchar
+      <0060> 144
+      endcidchar
+      1 begincidrange
+      <0000><005E> 32
+      endcidrange
+      endcmap
+      CMapName currentdict /CMap defineresource pop
+      end
+      end
+      %%EndResource
+      %%EOF
+    EOF
+
+    @to_unicode_mapping = []
+    @cid_mapping = []
+    0x00.upto(0x5e) do |i|
+      @to_unicode_mapping << [i, 0x20 + i]
+      @cid_mapping << [i, 0x20 + i]
+    end
+    @to_unicode_mapping << [0x60, 0x90]
+    @cid_mapping << [0x60, 0x90]
+    0x1379.upto(0x137B) do |i|
+      @to_unicode_mapping << [i, 0x90FE + i - 0x1379]
+    end
+    @to_unicode_mapping << [0x3A51, 0x2003E]
   end
 
   describe "create_to_unicode_cmap" do
     it "creates a correct CMap file" do
-      assert_equal(@cmap_data, HexaPDF::Font::CMap.create_to_unicode_cmap(@mapping))
+      assert_equal(@to_unicode_cmap_data,
+                   HexaPDF::Font::CMap.create_to_unicode_cmap(@to_unicode_mapping))
     end
 
     it "works if the last item is a range" do
-      @mapping.pop
-      @cmap_data.sub!(/2 beginbfchar/, '1 beginbfchar')
-      @cmap_data.sub!(/<3A51><d840dc3e>\n/, '')
-      assert_equal(@cmap_data, HexaPDF::Font::CMap.create_to_unicode_cmap(@mapping))
+      @to_unicode_mapping.pop
+      @to_unicode_cmap_data.sub!(/2 beginbfchar/, '1 beginbfchar')
+      @to_unicode_cmap_data.sub!(/<3A51><d840dc3e>\n/, '')
+      assert_equal(@to_unicode_cmap_data,
+                   HexaPDF::Font::CMap.create_to_unicode_cmap(@to_unicode_mapping))
     end
 
     it "works with only ranges" do
-      @mapping.delete_at(-1)
-      @mapping.delete_at(0x5f)
-      @cmap_data.sub!(/\n2 beginbfchar.*endbfchar/m, '')
-      assert_equal(@cmap_data, HexaPDF::Font::CMap.create_to_unicode_cmap(@mapping))
+      @to_unicode_mapping.delete_at(-1)
+      @to_unicode_mapping.delete_at(0x5f)
+      @to_unicode_cmap_data.sub!(/\n2 beginbfchar.*endbfchar/m, '')
+      assert_equal(@to_unicode_cmap_data,
+                   HexaPDF::Font::CMap.create_to_unicode_cmap(@to_unicode_mapping))
     end
 
     it "returns an empty CMap if the mapping is empty" do
-      assert_equal(@cmap_data.sub(/\d+ beginbfchar.*endbfrange/m, ''),
+      assert_equal(@to_unicode_cmap_data.sub(/\d+ beginbfchar.*endbfrange/m, ''),
                    HexaPDF::Font::CMap.create_to_unicode_cmap([]))
     end
   end
+
+  describe "create_cid_cmap" do
+    it "creates a correct CMap file" do
+      assert_equal(@cid_cmap_data, HexaPDF::Font::CMap.create_cid_cmap(@cid_mapping))
+    end
+
+    it "returns an empty CMap if the mapping is empty" do
+      assert_equal(@cid_cmap_data.sub(/\d+ begincidchar.*endcidrange/m, ''),
+                   HexaPDF::Font::CMap.create_cid_cmap([]))
+    end
+  end
 end

data/test/hexapdf/font/test_true_type_wrapper.rb

@@ -71,6 +71,12 @@ describe HexaPDF::Font::TrueTypeWrapper do
                    glyph.inspect)
     end
 
+    it "caches glyphs based on the id and string" do
+      glyph = @font_wrapper.glyph(17)
+      assert_same(glyph, @font_wrapper.glyph(17))
+      refute_same(glyph, @font_wrapper.glyph(17, "1"))
+    end
+
     it "invokes font.on_missing_glyph for missing glyphs" do
       glyph = @font_wrapper.glyph(9999)
       assert_kind_of(HexaPDF::Font::InvalidGlyph, glyph)
@@ -99,14 +105,18 @@ describe HexaPDF::Font::TrueTypeWrapper do
       assert_equal([1].pack('n'), code)
       code = @font_wrapper.encode(@font_wrapper.glyph(10))
       assert_equal([2].pack('n'), code)
+      code = @font_wrapper.encode(@font_wrapper.glyph(10, "o"))
+      assert_equal([3].pack('n'), code)
     end
 
     it "returns the encoded glyph ID for fonts that are not subset" do
       @font_wrapper = HexaPDF::Font::TrueTypeWrapper.new(@doc, @font, subset: false)
       code = @font_wrapper.encode(@font_wrapper.glyph(3))
-      assert_equal([3].pack('n'), code)
+      assert_equal([1].pack('n'), code)
       code = @font_wrapper.encode(@font_wrapper.glyph(10))
-      assert_equal([10].pack('n'), code)
+      assert_equal([2].pack('n'), code)
+      code = @font_wrapper.encode(@font_wrapper.glyph(10, "o"))
+      assert_equal([3].pack('n'), code)
     end
 
     it "raises an error if an InvalidGlyph is encoded" do
@@ -180,14 +190,18 @@ describe HexaPDF::Font::TrueTypeWrapper do
     it "with fonts that are not subset (only differences to other case)" do
       @font_wrapper = HexaPDF::Font::TrueTypeWrapper.new(@doc, @font, subset: false)
       @font_wrapper.encode(@font_wrapper.glyph(3))
+      @font_wrapper.encode(@font_wrapper.glyph(3, "-"))
       glyph = @font_wrapper.decode_utf8('H').first
       @font_wrapper.encode(glyph)
       @doc.dispatch_message(:complete_objects)
 
       dict = @font_wrapper.pdf_object
 
-      assert_equal(HexaPDF::Font::CMap.create_to_unicode_cmap([[3, ' '.ord], [glyph.id, 'H'.ord]]),
+      assert_equal(HexaPDF::Font::CMap.create_to_unicode_cmap([[1, ' '.ord], [2, '-'.ord],
+                                                               [3, 'H'.ord]]),
                    dict[:ToUnicode].stream)
+      assert_equal(HexaPDF::Font::CMap.create_cid_cmap([[1, 3], [2, 3], [3, glyph.id]]),
+                   dict[:Encoding].stream)
       assert_equal([glyph.id, [glyph.width]], dict[:DescendantFonts][0][:W].value)
     end
   end

data/test/hexapdf/layout/test_list_box.rb

@@ -185,7 +185,7 @@ describe HexaPDF::Layout::ListBox do
         [:set_font_and_size, [:F1, 11]],
         [:set_device_gray_non_stroking_color, [0.5]],
         [:begin_text],
-        [:set_text_matrix, [1, 0, 0, 1, 1.15, 92.487]],
+        [:move_text, [1.15, 92.487]],
         [:show_text, ["\x95".b]],
         [:end_text],
         [:restore_graphics_state],
@@ -197,7 +197,7 @@ describe HexaPDF::Layout::ListBox do
         [:set_font_and_size, [:F1, 11]],
         [:set_device_gray_non_stroking_color, [0.5]],
         [:begin_text],
-        [:set_text_matrix, [1, 0, 0, 1, 1.15, 82.487]],
+        [:move_text, [1.15, 82.487]],
         [:show_text, ["\x95".b]],
         [:end_text],
         [:restore_graphics_state],
@@ -219,7 +219,7 @@ describe HexaPDF::Layout::ListBox do
         [:set_text_rise, [-6.111111]],
         [:set_device_gray_non_stroking_color, [0.5]],
         [:begin_text],
-        [:set_text_matrix, [1, 0, 0, 1, 0.1985, 100]],
+        [:move_text, [0.1985, 100]],
         [:show_text, ["m".b]],
         [:end_text],
         [:restore_graphics_state],
@@ -241,7 +241,7 @@ describe HexaPDF::Layout::ListBox do
         [:set_text_rise, [-6.111111]],
         [:set_device_gray_non_stroking_color, [0.5]],
         [:begin_text],
-        [:set_text_matrix, [1, 0, 0, 1, 0.8145, 100]],
+        [:move_text, [0.8145, 100]],
         [:show_text, ["n".b]],
         [:end_text],
         [:restore_graphics_state],
@@ -263,7 +263,7 @@ describe HexaPDF::Layout::ListBox do
         [:set_font_and_size, [:F1, 11]],
         [:set_device_gray_non_stroking_color, [0.5]],
         [:begin_text],
-        [:set_text_matrix, [1, 0, 0, 1, 6.75, 92.487]],
+        [:move_text, [6.75, 92.487]],
         [:show_text, ["1.".b]],
         [:end_text],
         [:restore_graphics_state],
@@ -275,7 +275,7 @@ describe HexaPDF::Layout::ListBox do
         [:set_font_and_size, [:F1, 11]],
         [:set_device_gray_non_stroking_color, [0.5]],
         [:begin_text],
-        [:set_text_matrix, [1, 0, 0, 1, 6.75, 82.487]],
+        [:move_text, [6.75, 82.487]],
         [:show_text, ["2.".b]],
         [:end_text],
         [:restore_graphics_state],
@@ -314,7 +314,7 @@ describe HexaPDF::Layout::ListBox do
         [:save_graphics_state],
         [:set_font_and_size, [:F1, 10]],
         [:begin_text],
-        [:set_text_matrix, [1, 0, 0, 1, 1.5, 93.17]],
+        [:move_text, [1.5, 93.17]],
         [:show_text, ["\x95".b]],
         [:end_text],
         [:restore_graphics_state],

data/test/hexapdf/layout/test_table_box.rb

@@ -511,6 +511,58 @@ describe HexaPDF::Layout::TableBox do
                  [0, 66, 39.75, 22], [39.75, 66, 39.75, 22], [79.5, 44, 39.75, 44], [119.25, 66, 39.75, 22]])
     end
 
+    describe "row spans" do
+      # ----------
+      # | a | b  |
+      # | a |    |
+      # | a |----|
+      # | a | c  |
+      # | a |    |
+      # ----------
+      it "works if content of a row span cell is larger than the rows" do
+        cells = [[{row_span: 2, content: @fixed_size_boxes[0..2]}, @fixed_size_boxes[3]],
+                 [@fixed_size_boxes[4]]]
+        check_box(create_box(cells: cells, cell_style: {padding: 0, border: {width: 0}}),
+                  :success, 160, 30,
+                  [[0, 0, 80, 30], [80, 0, 80, 15], [0, 0, 80, 30], [80, 15, 80, 15]])
+      end
+
+      # ----------
+      # | a | b  |
+      # |   |----|
+      # |   | c  |
+      # ----------
+      it "works if content of a row span cell is smaller than the rows" do
+        cells = [[{row_span: 2, content: @fixed_size_boxes[0]}, @fixed_size_boxes[3]],
+                 [@fixed_size_boxes[4]]]
+        check_box(create_box(cells: cells, cell_style: {padding: 0, border: {width: 0}}),
+                  :success, 160, 20,
+                  [[0, 0, 80, 20], [80, 0, 80, 10], [0, 0, 80, 20], [80, 10, 80, 10]])
+      end
+
+      # -----------------
+      # | a | b | c | d |
+      # | a | b |---| d |
+      # | a | b | e |   |
+      # | a |   | e |   |
+      # --------| e |   |
+      # | f | g | e |   |
+      # ----------------
+      it "works if multiple, possibly overlapping row spans are involved" do
+        cells = [[{row_span: 2, content: @fixed_size_boxes[0..2]},
+                  {row_span: 2, content: @fixed_size_boxes[3..4]},
+                  @fixed_size_boxes[5],
+                  {row_span: 3, content: @fixed_size_boxes[6..7]}],
+                 [{row_span: 2, content: @fixed_size_boxes[8, 3]}],
+                 [@fixed_size_boxes[11], @fixed_size_boxes[12]]]
+        check_box(create_box(cells: cells, cell_style: {padding: 0, border: {width: 0}}),
+                  :success, 160, 40,
+                  [[0, 0, 40, 30], [40, 0, 40, 30], [80, 0, 40, 10], [120, 0, 40, 40],
+                   [0, 0, 40, 30], [40, 0, 40, 30], [80, 10, 40, 30], [120, 0, 40, 40],
+                   [0, 30, 40, 10], [40, 30, 40, 10], [80, 10, 40, 30], [120, 0, 40, 40]])
+      end
+    end
+
     it "fits a table with header rows" do
       result = [[0, 0, 80, 10], [80, 0, 80, 10], [0, 10, 80, 10], [80, 10, 80, 10]]
       header = lambda {|_| [@fixed_size_boxes[10, 2], @fixed_size_boxes[12, 2]] }

data/test/hexapdf/layout/test_text_fragment.rb

@@ -139,7 +139,7 @@ describe HexaPDF::Layout::TextFragment do
         [:set_text_rise, [2]],
         *middle,
         [:begin_text],
-        [:set_text_matrix, [1, 0, 0, 1, 10, 15]],
+        [:move_text, [10, 15]],
         [:show_text, ['!']],
         *back,
       ].compact
@@ -156,7 +156,7 @@ describe HexaPDF::Layout::TextFragment do
       @canvas = @doc.pages.add.canvas
       @fragment.draw(@canvas, 10, 15, ignore_text_properties: true)
       assert_operators(@canvas.contents, [[:begin_text],
-                                          [:set_text_matrix, [1, 0, 0, 1, 10, 15]]])
+                                          [:move_text, [10, 15]]])
     end
 
     describe "uses an appropriate text position setter" do
@@ -188,7 +188,7 @@ describe HexaPDF::Layout::TextFragment do
       it "horizontal and vertical movement" do
         @fragment.draw(@canvas, 10, 10, ignore_text_properties: true)
         assert_operators(@canvas.contents, [[:begin_text],
-                                            [:set_text_matrix, [1, 0, 0, 1, 10, 10]]])
+                                            [:move_text, [10, 10]]])
       end
     end
 

data/test/hexapdf/layout/test_text_layouter.rb

@@ -743,10 +743,12 @@ describe HexaPDF::Layout::TextLayouter do
       result = processor.recorded_ops
       leading = (result.select {|name, _| name == :set_leading } || [0]).map(&:last).flatten.first
       pos = [0, 0]
-      result.select! {|name, _| name == :set_text_matrix || name == :move_text_next_line }.
-        map! do |name, ops|
+      result.select! do |name, _|
+        name == :set_text_matrix || name == :move_text || name == :move_text_next_line
+      end.map! do |name, ops|
         case name
         when :set_text_matrix then pos = ops[-2, 2]
+        when :move_text then pos = ops
         when :move_text_next_line then pos[1] -= leading
         end
         pos.dup