hexapdf 0.6.0 → 0.7.0

data/lib/hexapdf/font/true_type_wrapper.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
@@ -109,7 +109,6 @@ module HexaPDF
 
       private_constant :Glyph
 
-
       # Returns the wrapped TrueType font object.
       attr_reader :wrapped_font
 
@@ -162,7 +161,7 @@ module HexaPDF
         @id_to_glyph[id] ||=
           begin
             if id >= 0 && id < @wrapped_font[:maxp].num_glyphs
-              Glyph.new(@wrapped_font, id, str || ('' << (@cmap.gid_to_code(id) || 0xFFFD)))
+              Glyph.new(@wrapped_font, id, str || (+'' << (@cmap.gid_to_code(id) || 0xFFFD)))
             else
               @document.config['font.on_missing_glyph'].call("\u{FFFD}", font_type, @wrapped_font)
             end
@@ -171,13 +170,13 @@ module HexaPDF
 
       # Returns an array of glyph objects representing the characters in the UTF-8 encoded string.
       def decode_utf8(str)
-        str.each_codepoint.map do |c|
+        str.codepoints.map! do |c|
           @codepoint_to_glyph[c] ||=
             begin
               if (gid = @cmap[c])
-                glyph(gid, '' << c)
+                glyph(gid, +'' << c)
               else
-                @document.config['font.on_missing_glyph'].call('' << c, font_type, @wrapped_font)
+                @document.config['font.on_missing_glyph'].call(+'' << c, font_type, @wrapped_font)
               end
             end
         end
@@ -185,17 +184,17 @@ module HexaPDF
 
       # Encodes the glyph and returns the code string.
       def encode(glyph)
-        @encoded_glyphs[glyph] ||=
+        (@encoded_glyphs[glyph.id] ||=
           begin
             if glyph.kind_of?(InvalidGlyph)
               raise HexaPDF::Error, "Glyph for #{glyph.str.inspect} missing"
             end
             if @subsetter
-              [@subsetter.use_glyph(glyph.id)].pack('n')
+              [[@subsetter.use_glyph(glyph.id)].pack('n'), glyph]
             else
-              [glyph.id].pack('n')
+              [[glyph.id].pack('n'), glyph]
             end
-          end
+          end)[0]
       end
 
       private
@@ -211,7 +210,7 @@ module HexaPDF
                            FontName: @wrapped_font.font_name.intern,
                            FontWeight: @wrapped_font.weight,
                            Flags: 0,
-                           FontBBox: @wrapped_font.bounding_box.map {|m| m * scaling_factor},
+                           FontBBox: @wrapped_font.bounding_box.map {|m| m * scaling_factor },
                            ItalicAngle: @wrapped_font.italic_angle || 0,
                            Ascent: @wrapped_font.ascender * scaling_factor,
                            Descent: @wrapped_font.descender * scaling_factor,
@@ -235,9 +234,9 @@ module HexaPDF
         end
 
         fd.flag(:fixed_pitch) if @wrapped_font[:post].is_fixed_pitch? ||
-          @wrapped_font[:hhea].num_of_long_hor_metrics == 1
+            @wrapped_font[:hhea].num_of_long_hor_metrics == 1
         fd.flag(:italic) if @wrapped_font[:'OS/2'].selection_include?(:italic) ||
-          @wrapped_font[:'OS/2'].selection_include?(:oblique)
+            @wrapped_font[:'OS/2'].selection_include?(:oblique)
         fd.flag(:symbolic)
 
         cid_font = @document.add(Type: :Font, Subtype: :CIDFontType2,
@@ -264,8 +263,8 @@ module HexaPDF
       def update_font_name
         return unless @subsetter
 
-        tag = ''
-        data = @encoded_glyphs.each_with_object(''.b) {|(g, v), s| s << g.id.to_s << v}
+        tag = +''
+        data = @encoded_glyphs.each_with_object(''.b) {|(id, v), s| s << id.to_s << v[0] }
         hash = Digest::MD5.hexdigest(data << @wrapped_font.font_name).to_i(16)
         while hash != 0 && tag.length < 6
           hash, mod = hash.divmod(UPPERCASE_LETTERS.length)
@@ -295,8 +294,8 @@ module HexaPDF
       # Adds the /DW and /W fields to the CIDFont dictionary.
       def complete_width_information
         default_width = glyph(3, " ").width.to_i
-        widths = @encoded_glyphs.keys.reject {|g| g.width == default_width}.map! do |glyph|
-          [(@subsetter ? @subsetter.subset_glyph_id(glyph.id) : glyph.id), glyph.width]
+        widths = @encoded_glyphs.reject {|_, v| v[1].width == default_width }.map do |id, v|
+          [(@subsetter ? @subsetter.subset_glyph_id(id) : id), v[1].width]
         end.sort!
         @dict[:DescendantFonts].first.set_widths(widths, default_width: default_width)
       end
@@ -305,11 +304,10 @@ module HexaPDF
       # correctly.
       def create_to_unicode_cmap
         stream = HexaPDF::StreamData.new do
-          mapping = @encoded_glyphs.keys.map do |glyph|
+          mapping = @encoded_glyphs.keys.map! do |id|
             # Using 0xFFFD as mentioned in Adobe #5411, last line before section 1.5
-            [(@subsetter ? @subsetter.subset_glyph_id(glyph.id) : glyph.id),
-             @cmap.gid_to_code(glyph.id) || 0xFFFD]
-          end.sort_by(&:first)
+            [(@subsetter ? @subsetter.subset_glyph_id(id) : id), @cmap.gid_to_code(id) || 0xFFFD]
+          end.sort_by!(&:first)
           HexaPDF::Font::CMap.create_to_unicode_cmap(mapping)
         end
         stream_obj = @document.add({}, stream: stream)

data/lib/hexapdf/font/type1.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/type1/afm_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
@@ -68,7 +68,7 @@ module HexaPDF
           if source.respond_to?(:read)
             new(source).parse
           else
-            File.open(source) {|file| new(file).parse}
+            File.open(source) {|file| new(file).parse }
           end
         end
 
@@ -91,7 +91,7 @@ module HexaPDF
               end
             when /\AEnd/
               sections.pop
-              break if sections.empty? && command == 'EndFontMetrics.freeze'
+              break if sections.empty? && command == 'EndFontMetrics'
             else
               if sections.empty?
                 parse_global_font_information(command.to_sym)
@@ -180,7 +180,7 @@ module HexaPDF
         # internal buffer.
         def each_line
           read_line
-          unless parse_name == 'StartFontMetrics'.freeze
+          unless parse_name == 'StartFontMetrics'
             raise HexaPDF::Error, "The AFM file has to start with StartFontMetrics, not #{@line}"
           end
           until @io.eof?
@@ -197,7 +197,7 @@ module HexaPDF
         # Parses and returns the name at the start of the line, with whitespace stripped.
         def parse_name
           result = @line[/\S+\s*/].to_s
-          @line[0, result.size] = ''.freeze
+          @line[0, result.size] = ''
           result.strip!
           result
         end
@@ -221,7 +221,7 @@ module HexaPDF
 
         # Parses the boolean at the start of the line.
         def parse_boolean
-          parse_name == 'true'.freeze
+          parse_name == 'true'
         end
 
       end

data/lib/hexapdf/font/type1/character_metrics.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/type1/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
@@ -87,7 +87,7 @@ module HexaPDF
         def encoding
           @encoding ||=
             begin
-              if @metrics.encoding_scheme == 'AdobeStandardEncoding'.freeze
+              if @metrics.encoding_scheme == 'AdobeStandardEncoding'
                 Encoding.for_name(:StandardEncoding)
               elsif font_name == 'ZapfDingbats' || font_name == 'Symbol'
                 Encoding.for_name((font_name + "Encoding").to_sym)

data/lib/hexapdf/font/type1/font_metrics.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
@@ -83,7 +83,6 @@ module HexaPDF
         # Dominant width of vertical stems.
         attr_accessor :dominant_vertical_stem_width
 
-
         # Distance from the baseline for centering underlining strokes.
         attr_accessor :underline_position
 
@@ -97,7 +96,6 @@ module HexaPDF
         # Boolean specifying if the font is a fixed pitch (monospaced) font.
         attr_accessor :is_fixed_pitch
 
-
         # Mapping of character codes and names to CharacterMetrics objects.
         attr_accessor :character_metrics
 

data/lib/hexapdf/font/type1/pfb_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

data/lib/hexapdf/font/type1_wrapper.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
@@ -47,7 +47,7 @@ module HexaPDF
 
         # The name of the glyph.
         attr_reader :name
-        alias_method :id, :name
+        alias id name
 
         # The string representation of the glyph.
         attr_reader :str
@@ -98,7 +98,6 @@ module HexaPDF
 
       private_constant :Glyph
 
-
       # Returns the wrapped Type1 font object.
       attr_reader :wrapped_font
 
@@ -155,11 +154,11 @@ module HexaPDF
 
       # Returns an array of glyph objects representing the characters in the UTF-8 encoded string.
       def decode_utf8(str)
-        str.each_codepoint.map do |c|
+        str.codepoints.map! do |c|
           @codepoint_to_glyph[c] ||=
             begin
-              name = Encoding::GlyphList.unicode_to_name('' << c, @zapf_dingbats_opt)
-              name = "u" << c.to_s(16).rjust(6, '0') if name == :'.notdef'
+              name = Encoding::GlyphList.unicode_to_name(+'' << c, @zapf_dingbats_opt)
+              name = +"u" << c.to_s(16).rjust(6, '0') if name == :'.notdef'
               glyph(name)
             end
         end
@@ -221,13 +220,13 @@ module HexaPDF
         min, max = @encoding.code_to_name.keys.minmax
         @dict[:FirstChar] = min
         @dict[:LastChar] = max
-        @dict[:Widths] = (min..max).map {|code| glyph(@encoding.name(code)).width}
+        @dict[:Widths] = (min..max).map {|code| glyph(@encoding.name(code)).width }
 
         if VALID_ENCODING_NAMES.include?(@encoding.encoding_name)
           @dict[:Encoding] = @encoding.encoding_name
         else
           differences = [min]
-          (min..max).each {|code| differences << @encoding.name(code)}
+          (min..max).each {|code| differences << @encoding.name(code) }
           @dict[:Encoding] = {Differences: differences}
         end
       end

data/lib/hexapdf/font_loader.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_loader/from_configuration.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_loader/from_file.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_loader/standard14.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/image_loader.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/image_loader/jpeg.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,7 +49,9 @@ module HexaPDF
       # object.
       #
       # See: ITU T.81 B1.1.3
-      SOF_MARKERS = [0xC0, 0xC1, 0xC2, 0xC3, 0xC5, 0xC6, 0xC7, 0xC9, 0xCA, 0xCB, 0xCD, 0xCE, 0xCF].freeze
+      SOF_MARKERS = [
+        0xC0, 0xC1, 0xC2, 0xC3, 0xC5, 0xC6, 0xC7, 0xC9, 0xCA, 0xCB, 0xCD, 0xCE, 0xCF
+      ].freeze
 
       # Adobe uses the marker 0xEE (APPE) for its purposes. We need to use it for determinig
       # whether to invert the colors for CMYK/YCCK images or not (Adobe does this...).
@@ -87,7 +89,7 @@ module HexaPDF
       # Creates a PDF image object from the JPEG file or IO stream.
       def self.load(document, file_or_io)
         dict = if file_or_io.kind_of?(String)
-                 File.open(file_or_io, 'rb') {|io| image_data_from_io(io)}
+                 File.open(file_or_io, 'rb') {|io| image_data_from_io(io) }
                else
                  image_data_from_io(file_or_io)
                end

data/lib/hexapdf/image_loader/pdf.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