hexapdf 0.6.0 → 0.7.0

data/lib/hexapdf/filter/run_length_decode.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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

data/lib/hexapdf/font/cmap.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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
@@ -82,7 +82,6 @@ module HexaPDF
         Writer.new.create_to_unicode_cmap(mapping)
       end
 
-
       # The registry part of the CMap version.
       attr_accessor :registry
 

data/lib/hexapdf/font/cmap/parser.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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
@@ -49,20 +49,20 @@ module HexaPDF
           tokenizer = HexaPDF::Content::Tokenizer.new(string)
           cmap = CMap.new
 
-          while (token = tokenizer.next_token) != HexaPDF::Tokenizer::NO_MORE_TOKENS
+          until (token = tokenizer.next_token) == HexaPDF::Tokenizer::NO_MORE_TOKENS
             if token.kind_of?(HexaPDF::Tokenizer::Token)
               case token
-              when 'beginbfchar'.freeze then parse_bf_char(tokenizer, cmap)
-              when 'beginbfrange'.freeze then parse_bf_range(tokenizer, cmap)
-              when 'begincidchar'.freeze then parse_cid_char(tokenizer, cmap)
-              when 'begincidrange'.freeze then parse_cid_range(tokenizer, cmap)
-              when 'begincodespacerange'.freeze then parse_codespace_range(tokenizer, cmap)
+              when 'beginbfchar' then parse_bf_char(tokenizer, cmap)
+              when 'beginbfrange' then parse_bf_range(tokenizer, cmap)
+              when 'begincidchar' then parse_cid_char(tokenizer, cmap)
+              when 'begincidrange' then parse_cid_range(tokenizer, cmap)
+              when 'begincodespacerange' then parse_codespace_range(tokenizer, cmap)
               when 'endcmap' then break
               end
             elsif token.kind_of?(Symbol)
               value = tokenizer.next_token
               if value.kind_of?(HexaPDF::Tokenizer::Token)
-                parse_cmap(cmap, token) if value == 'usecmap'.freeze
+                parse_cmap(cmap, token) if value == 'usecmap'
               else
                 parse_dict_mapping(cmap, token, value)
               end
@@ -70,7 +70,7 @@ module HexaPDF
           end
 
           cmap
-        rescue => e
+        rescue StandardError => e
           raise HexaPDF::Error, "Error parsing CMap: #{e.message}", e.backtrace
         end
 
@@ -162,7 +162,7 @@ module HexaPDF
             if dest.kind_of?(String)
               codepoint = dest.force_encoding(::Encoding::UTF_16BE).ord
               code1.upto(code2) do |code|
-                cmap.add_unicode_mapping(code, '' << codepoint)
+                cmap.add_unicode_mapping(code, +'' << codepoint)
                 codepoint += 1
               end
             elsif dest.kind_of?(Array)

data/lib/hexapdf/font/cmap/writer.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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
@@ -57,14 +57,14 @@ module HexaPDF
           result = create_sections("bfchar", chars.size / 2) do |index|
             index *= 2
             sprintf("<%04X>", chars[index]) << "<" <<
-              (''.force_encoding(::Encoding::UTF_16BE) << chars[index + 1]).unpack('H*').first <<
+              ((+'').force_encoding(::Encoding::UTF_16BE) << chars[index + 1]).unpack('H*').first <<
               ">\n"
           end
 
           result << create_sections("bfrange", ranges.size / 3) do |index|
             index *= 3
             sprintf("<%04X><%04X>", ranges[index], ranges[index + 1]) << "<" <<
-              (''.force_encoding(::Encoding::UTF_16BE) << ranges[index + 2]).unpack('H*').first <<
+              ((+'').force_encoding(::Encoding::UTF_16BE) << ranges[index + 2]).unpack('H*').first <<
               ">\n"
           end
 
@@ -129,12 +129,12 @@ module HexaPDF
         def create_sections(type, size)
           return '' if size == 0
 
-          result = ""
+          result = +""
           index = 0
           while size > 0
             count = [MAX_ENTRIES_IN_SECTION, size].min
             result << "#{count} begin#{type}\n"
-            index.upto(index + count - 1) {|i| result << yield(i)}
+            index.upto(index + count - 1) {|i| result << yield(i) }
             result << "end#{type}\n"
             index += count
             size -= count
@@ -145,25 +145,25 @@ module HexaPDF
 
         # Returns the CMap file template for a ToUnicode CMap.
         def to_unicode_template
-          <<-TEMPLATE
-/CIDInit /ProcSet findresource begin
-12 dict begin
-begincmap
-/CIDSystemInfo
-<< /Registry (Adobe)
-/Ordering (UCS)
-/Supplement 0
->> def
-/CMapName /Adobe-Identity-UCS def
-/CMapType 2 def
-1 begincodespacerange
-<0000> <FFFF>
-endcodespacerange
-%s
-endcmap
-CMapName currentdict /CMap defineresource pop
-end
-end
+          <<~TEMPLATE
+            /CIDInit /ProcSet findresource begin
+            12 dict begin
+            begincmap
+            /CIDSystemInfo
+            << /Registry (Adobe)
+            /Ordering (UCS)
+            /Supplement 0
+            >> def
+            /CMapName /Adobe-Identity-UCS def
+            /CMapType 2 def
+            1 begincodespacerange
+            <0000> <FFFF>
+            endcodespacerange
+            %s
+            endcmap
+            CMapName currentdict /CMap defineresource pop
+            end
+            end
           TEMPLATE
         end
 

data/lib/hexapdf/font/encoding.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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

data/lib/hexapdf/font/encoding/base.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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

data/lib/hexapdf/font/encoding/difference_encoding.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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

data/lib/hexapdf/font/encoding/glyph_list.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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
@@ -87,7 +87,7 @@ module HexaPDF
           else
             name = name.to_s
             if name =~ /\Auni([0-9A-F]{4})\Z/ || name =~ /\Au([0-9A-f]{4,6})\Z/
-              '' << $1.hex
+              +'' << $1.hex
             end
           end
         end
@@ -130,10 +130,10 @@ module HexaPDF
           uni2name = {}
           File.open(file, 'rb') do |f|
             while (line = f.gets)
-              next if line.start_with?('#'.freeze)
-              index = line.index(';'.freeze)
+              next if line.start_with?('#')
+              index = line.index(';')
               name = line[0, index].to_sym
-              codes = line[index + 1, 50].split(" ".freeze).map(&:hex).pack('U*'.freeze)
+              codes = line[index + 1, 50].split(" ").map(&:hex).pack('U*')
               name2uni[name] = codes
               uni2name[codes] = name unless uni2name.key?(codes)
             end

data/lib/hexapdf/font/encoding/mac_expert_encoding.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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

data/lib/hexapdf/font/encoding/mac_roman_encoding.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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

data/lib/hexapdf/font/encoding/standard_encoding.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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

data/lib/hexapdf/font/encoding/symbol_encoding.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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

data/lib/hexapdf/font/encoding/win_ansi_encoding.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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

data/lib/hexapdf/font/encoding/zapf_dingbats_encoding.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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

data/lib/hexapdf/font/invalid_glyph.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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
@@ -51,16 +51,16 @@ module HexaPDF
       def id
         @font.missing_glyph_id
       end
-      alias_method :name, :id
+      alias name id
 
       # Returns 0.
       def x_min
         0
       end
-      alias_method :x_max, :x_min
-      alias_method :y_min, :x_min
-      alias_method :y_max, :x_min
-      alias_method :width, :x_min
+      alias x_max x_min
+      alias y_min x_min
+      alias y_max x_min
+      alias width x_min
 
       # Word spacing is never applied for the invalid glyph, so +false+ is returned.
       def apply_word_spacing?

data/lib/hexapdf/font/true_type.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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

data/lib/hexapdf/font/true_type/builder.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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
@@ -51,19 +51,25 @@ module HexaPDF
           offset = font_data.length + tables.length * 16
           checksum = Table.calculate_checksum(font_data)
 
-          # prepare head table for checksumming
-          tables['head'][8, 4] = "\0\0\0\0"
+          # Prepare head table for checksumming
+          head_table = tables['head']
+          head_table[8, 4] = "\0\0\0\0"
+
+          # The directory table needs to be sorted in ascending order by tag
+          tables = tables.sort
 
           tables.each do |tag, data|
+            original_data_length = data.length
             table_checksum = Table.calculate_checksum(data)
+            data << "\0" * (4 - original_data_length % 4) if original_data_length % 4 != 0
             # tag, offset, data.length are all 32bit uint, table_checksum for header and body
             checksum += tag.unpack('N').first + 2 * table_checksum + offset + data.length
-            font_data << [tag, table_checksum, offset, data.length].pack('a4N3')
+            font_data << [tag, table_checksum, offset, original_data_length].pack('a4N3')
             offset += data.length
           end
 
-          tables['head'][8, 4] = [0xB1B0AFBA - checksum].pack('N')
-          tables.each_value {|data| font_data << data}
+          head_table[8, 4] = [0xB1B0AFBA - checksum].pack('N')
+          tables.each {|_, data| font_data << data }
 
           font_data
         end

data/lib/hexapdf/font/true_type/font.rb

@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# -*- 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-2017 Thomas Leitner
+# Copyright (C) 2014-2018 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
@@ -66,7 +66,6 @@ module HexaPDF
           'font.true_type.unknown_format' => :ignore,
         }
 
-
         # The IO stream associated with this file.
         attr_reader :io