hexapdf 0.47.0 → 1.0.1

data/lib/hexapdf/type/image.rb

@@ -61,10 +61,10 @@ module HexaPDF
       define_field :ColorSpace,       type: [Symbol, PDFArray]
       define_field :BitsPerComponent, type: Integer
       define_field :Intent,           type: Symbol,          version: '1.1',
-        allowed_values: [HexaPDF::Content::RenderingIntent::ABSOLUTE_COLORIMETRIC,
-                         HexaPDF::Content::RenderingIntent::RELATIVE_COLORIMETRIC,
-                         HexaPDF::Content::RenderingIntent::SATURATION,
-                         HexaPDF::Content::RenderingIntent::PERCEPTUAL]
+                   allowed_values: [HexaPDF::Content::RenderingIntent::ABSOLUTE_COLORIMETRIC,
+                                    HexaPDF::Content::RenderingIntent::RELATIVE_COLORIMETRIC,
+                                    HexaPDF::Content::RenderingIntent::SATURATION,
+                                    HexaPDF::Content::RenderingIntent::PERCEPTUAL]
       define_field :ImageMask,        type: Boolean,         default: false
       define_field :Mask,             type: [Stream, PDFArray], version: '1.3'
       define_field :Decode,           type: PDFArray
@@ -72,11 +72,15 @@ module HexaPDF
       define_field :Alternates,       type: PDFArray,        version: '1.3'
       define_field :SMask,            type: Stream,          version: '1.4'
       define_field :SMaskInData,      type: Integer,         version: '1.5', allowed_values: [0, 1, 2]
+      define_field :Name,             type: Symbol
       define_field :StructParent,     type: Integer,         version: '1.3'
       define_field :ID,               type: PDFByteString,   version: '1.3'
       define_field :OPI,              type: Dictionary,      version: '1.2'
       define_field :Metadata,         type: Stream,          version: '1.4'
       define_field :OC,               type: Dictionary,      version: '1.5'
+      define_field :AF,               type: PDFArray,        version: '2.0'
+      define_field :Measure,          type: Dictionary,      version: '2.0'
+      define_field :PtData,           type: Dictionary,      version: '2.0'
 
       # Returns the source path that was used when creating the image object.
       #

data/lib/hexapdf/type/info.rb

@@ -57,8 +57,8 @@ module HexaPDF
       define_field :Producer,     type: String
       define_field :CreationDate, type: PDFDate
       define_field :ModDate,      type: PDFDate
-      define_field :Trapped,      type: Symbol, version: '1.3',
-        allowed_values: [:True, :False, :Unknown]
+      define_field :Trapped,      type: Symbol, version: '1.3', default: :Unknown,
+                   allowed_values: [:True, :False, :Unknown]
 
       # Info dictionaries must always be indirect.
       def must_be_indirect?

data/lib/hexapdf/type/mark_information.rb

@@ -48,8 +48,8 @@ module HexaPDF
       define_type :XXMarkInformation
 
       define_field :Marked,         type: Boolean, default: false
-      define_field :UserProperties, type: Boolean, default: false
-      define_field :Suspects,       type: Boolean, default: false
+      define_field :UserProperties, type: Boolean, default: false, version: '1.6'
+      define_field :Suspects,       type: Boolean, default: false, version: '1.6'
 
     end
 

data/lib/hexapdf/type/optional_content_configuration.rb

@@ -76,7 +76,7 @@ module HexaPDF
       define_field :AS,        type: PDFArray
       define_field :Order,     type: PDFArray
       define_field :ListMode,  type: Symbol, default: :AllPages,
-        allowed_values: [:AllPages, :VisiblePages]
+                   allowed_values: [:AllPages, :VisiblePages]
       define_field :RBGroups,  type: PDFArray
       define_field :Locked,    type: PDFArray, default: []
 

data/lib/hexapdf/type/optional_content_membership.rb

@@ -54,7 +54,7 @@ module HexaPDF
       define_field :Type, type: Symbol, required: true, default: type
       define_field :OCGs, type: [:OCG, PDFArray]
       define_field :P,    type: Symbol, default: :AnyOn,
-        allowed_values: [:AllOn, :AnyOn, :AnyOff, :AllOff]
+                   allowed_values: [:AllOn, :AnyOn, :AnyOff, :AllOff]
       define_field :VE,   type: PDFArray
 
     end

data/lib/hexapdf/type/page.rb

@@ -159,6 +159,9 @@ module HexaPDF
       define_field :PresSteps,            type: Dictionary, version: '1.5'
       define_field :UserUnit,             type: Numeric, version: '1.6'
       define_field :VP,                   type: PDFArray, version: '1.6'
+      define_field :AF,                   type: PDFArray, version: '2.0'
+      define_field :OutputIntents,        type: PDFArray, version: '2.0'
+      define_field :DPart,                type: Dictionary, version: '2.0'
 
       # Returns +true+ since page objects must always be indirect.
       def must_be_indirect?
@@ -358,7 +361,7 @@ module HexaPDF
       def contents
         Array(self[:Contents]).each_with_object("".b) do |content_stream, content|
           content << " " unless content.empty?
-          content << content_stream.stream
+          content << content_stream.stream if content_stream.kind_of?(Stream)
         end
       end
 
@@ -380,8 +383,7 @@ module HexaPDF
       # Returns the, possibly inherited, resource dictionary which is automatically created if it
       # doesn't exist.
       def resources
-        self[:Resources] ||= document.wrap({ProcSet: [:PDF, :Text, :ImageB, :ImageC, :ImageI]},
-                                           type: :XXResources)
+        self[:Resources] ||= document.wrap({}, type: :XXResources)
       end
 
       # Processes the content streams associated with the page with the given processor object.

data/lib/hexapdf/type/resources.rb

@@ -49,13 +49,13 @@ module HexaPDF
 
       define_type :XXResources
 
-      define_field :ExtGState, type: Dictionary
+      define_field :ExtGState,  type: Dictionary
       define_field :ColorSpace, type: Dictionary
-      define_field :Pattern, type: Dictionary
-      define_field :Shading, type: Dictionary, version: '1.3'
-      define_field :XObject, type: Dictionary
-      define_field :Font, type: Dictionary
-      define_field :ProcSet, type: PDFArray
+      define_field :Pattern,    type: Dictionary
+      define_field :Shading,    type: Dictionary, version: '1.3'
+      define_field :XObject,    type: Dictionary
+      define_field :Font,       type: Dictionary
+      define_field :ProcSet,    type: PDFArray
       define_field :Properties, type: Dictionary, version: '1.2'
 
       # Returns the color space stored under the given name.

data/lib/hexapdf/type/viewer_preferences.rb

@@ -56,19 +56,20 @@ module HexaPDF
       define_field :CenterWindow,          type: Boolean, default: false
       define_field :DisplayDocTitle,       type: Boolean, default: false, version: '1.4'
       define_field :NonFullScreenPageMode, type: Symbol,  default: :UseNone,
-        allowed_values: [:UseNone, :UseOutlines, :UseThumbs, :UseOC]
+                   allowed_values: [:UseNone, :UseOutlines, :UseThumbs, :UseOC]
       define_field :Direction,             type: Symbol,  default: :L2R, version: '1.3',
-        allowed_values: [:L2R, :R2L]
+                   allowed_values: [:L2R, :R2L]
       define_field :ViewArea,              type: Symbol,  default: :CropBox, version: '1.4'
       define_field :ViewClip,              type: Symbol,  default: :CropBox, version: '1.4'
       define_field :PrintArea,             type: Symbol,  default: :CropBox, version: '1.4'
       define_field :PrintClip,             type: Symbol,  default: :CropBox, version: '1.4'
       define_field :PrintScaling,          type: Symbol,  default: :AppDefault, version: '1.6'
       define_field :Duplex,                type: Symbol,  version: '1.7',
-        allowed_values: [:Simplex, :DuplexFlipShortEdge, :DuplexFlipLongEdge]
+                   allowed_values: [:Simplex, :DuplexFlipShortEdge, :DuplexFlipLongEdge]
       define_field :PickTrayByPDFSize,     type: Boolean, version: '1.7'
       define_field :PrintPageRange,        type: PDFArray, version: '1.7'
       define_field :NumCopies,             type: Integer, version: '1.7'
+      define_field :Enforce,               type: PDFArray, version: '2.0'
 
     end
 

data/lib/hexapdf/utils/sorted_tree_node.rb

@@ -174,6 +174,7 @@ module HexaPDF
           elsif node.key?(:Kids)
             index = find_in_intermediate_node(node[:Kids], key)
             node = node[:Kids][index]
+            node = document.wrap(node, type: self.class) if node
             break unless node && key >= node[:Limits][0] && key <= node[:Limits][1]
           else
             break
@@ -194,7 +195,7 @@ module HexaPDF
         container_name = leaf_node_container_name
         stack = [self]
         until stack.empty?
-          node = stack.pop
+          node = document.wrap(stack.pop, type: self.class)
           if node.key?(container_name)
             data = node[container_name]
             index = 0
@@ -217,7 +218,7 @@ module HexaPDF
       def path_to_key(node, key, stack)
         return unless node.key?(:Kids)
         index = find_in_intermediate_node(node[:Kids], key)
-        stack << node[:Kids][index]
+        stack << document.wrap(node[:Kids][index], type: self.class)
         path_to_key(stack.last, key, stack)
       end
 
@@ -307,6 +308,15 @@ module HexaPDF
         super
         container_name = leaf_node_container_name
 
+        if key?(:Kids)
+          self[:Kids].each do |kid|
+            unless kid.indirect?
+              yield("Children of sorted tree nodes must be indirect", true)
+              document.add(kid)
+            end
+          end
+        end
+
         # All keys of the container must be lexically ordered strings and the container must be
         # correctly formatted
         if key?(container_name)

data/lib/hexapdf/version.rb

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

data/lib/hexapdf/writer.rb

@@ -149,6 +149,7 @@ module HexaPDF
       obj_to_stm = object_streams.each_with_object({}) {|stm, m| m.update(stm.write_objects(rev)) }
 
       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?

data/lib/hexapdf/xref_section.rb

@@ -111,6 +111,13 @@ module HexaPDF
     # used.
     private :'[]='
 
+    # 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.
+    def mark_as_initial_section!
+      @initial_section = true
+    end
+
     # Adds an in-use entry to the cross-reference section.
     #
     # See: ::in_use_entry
@@ -147,15 +154,24 @@ module HexaPDF
     # If this section contains no objects, a single empty array is yielded (corresponding to a
     # subsection with zero elements).
     #
-    # The subsections are dynamically generated based on the object numbers in this section.
+    # The subsections are dynamically generated based on the object numbers in this section. In case
+    # the section was marked as the initial section (see #mark_as_initial_section!) only a single
+    # subsection is yielded.
     def each_subsection
       return to_enum(__method__) unless block_given?
 
       temp = []
       oids.sort.each do |oid|
-        if !temp.empty? && temp[-1].oid + 1 != oid
-          yield(temp)
-          temp = []
+        expected_next_oid = !temp.empty? && temp[-1].oid + 1
+        if expected_next_oid && expected_next_oid != oid
+          if @initial_section
+            expected_next_oid.upto(oid - 1) do |free_oid|
+              temp << self.class.free_entry(free_oid, 0)
+            end
+          else
+            yield(temp)
+            temp = []
+          end
         end
         temp << self[oid]
       end

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

@@ -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/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_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