hexapdf 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0907516ec3eaf3e982a0380bab72ea8923ea18ed3213b426061572913c2c426e'
-  data.tar.gz: 6541fdd61bfc2000a3bd77e8aa8ebf046e14c56a87d856bace5f89c586042f42
+  metadata.gz: 245de775fa069ad91f2fe9f5e72610df40211e8b15a92b376cdf217c63b877fe
+  data.tar.gz: 34891827479def7d0efd506c9cd62f10abced99b8e694e39bc0dd06b1fa88bfe
 SHA512:
-  metadata.gz: 76a46bb08612f035c0e1159c1644797ecb949933ea73451d4f2e3bb128f5db3fd240bb759ec750ab42469c378b3fc36ec8ff466a6c39682a166b606dca5e7ca1
-  data.tar.gz: 1368b225b5d638c8cfc36057d983126746df3333e73f2b88d50238c51bdef095de275b9c872653b5c78a3009dbf60d71a7cd0ae7f9e231e6966c590e831de834
+  metadata.gz: 0c8bedff161a8aa756d6ffc426c89554e82537198692250a78f0eaad36fa896767681bda681d43bdcd5237f3eba91d25679499bbbe56ff525a16813c06187636
+  data.tar.gz: 35f82390333d2110c7ccb3059c93914e7ab03bbcd986c0ca7da1d3425c5a2c619aa42513da15d218423917e01f696b7b4e156f00b1997007c9feb637ae921d20

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.11.5 - 2020-01-27
+
+### Changed
+
+* [HexaPDF::Font::TrueType::Table::CmapSubtable] to lazily parse the subtable
+* [HexaPDF::Font::TrueType::Table::Hmtx] to lazily parse the width data
+* CLI command `hexapdf image2pdf` to use the last argument as output file
+  instead of the first (same order as `merge`)
+* Automatically require the HexaPDF C extension if it is installed
+
+### Fixed
+
+* Wrong line length calculation for variable width layouting when a text box is
+  too wide and needs to be broken into parts
+* CLI command `hexapdf image2pdf` so that treating a PDF as image works
+
+
 ## 0.11.4 - 2019-12-28
 
 ### Fixed

data/CONTRIBUTERS

@@ -1,5 +1,5 @@
   Count Name
 ======= ====
-   1097 Thomas Leitner <t_leitner@gmx.at>
+   1104 Thomas Leitner <t_leitner@gmx.at>
       1 Stanislav (Stas) Katkov <sk@skylup.com>
       1 Daniel Kraus <bovender@bovender.de>

data/VERSION

@@ -1 +1 @@
-0.11.4
+0.11.5

data/lib/hexapdf/cli/image2pdf.rb

@@ -99,15 +99,15 @@ module HexaPDF
         @margins = [0, 0, 0, 0]
       end
 
-      def execute(out_file, *images) #:nodoc:
+      def execute(*images, out_file) #:nodoc:
         maybe_raise_on_existing_file(out_file)
 
         out = HexaPDF::Document.new
 
         images.each do |image_file|
           image = out.images.add(image_file)
-          iw = image.info.width.to_f
-          ih = image.info.height.to_f
+          iw = image.width.to_f
+          ih = image.height.to_f
           if @scale != :fit
             iw *= 72 / @scale
             ih *= 72 / @scale

data/lib/hexapdf/document.rb

@@ -52,6 +52,11 @@ require 'hexapdf/image_loader'
 require 'hexapdf/font_loader'
 require 'hexapdf/layout'
 
+begin
+  require 'hexapdf/cext'
+rescue LoadError
+end
+
 # == HexaPDF API Documentation
 #
 # Here are some pointers to more in depth information:

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

@@ -73,9 +73,14 @@ module HexaPDF
           attr_accessor :language
 
           # The complete code map.
+          #
+          # Is only fully initialized for existing fonts when a mapping is first accessed via #[].
           attr_accessor :code_map
 
           # The complete gid map.
+          #
+          # Is only fully initialized for existing fonts when a mapping is first accessed via
+          # #gid_to_code.
           attr_accessor :gid_map
 
           # Creates a new subtable.
@@ -127,7 +132,22 @@ module HexaPDF
             elsif [0, 2, 4, 6].include?(@format)
               length, @language = io.read(4).unpack('n2')
             end
-            supported = true
+
+            return false unless [0, 2, 4, 6, 10, 12].include?(@format)
+            offset = io.pos
+            @code_map = lambda do |code|
+              parse_mapping(io, offset, length)
+              @code_map[code]
+            end
+            @gid_map = lambda do |gid|
+              parse_mapping(io, offset, length)
+              @gid_map[gid]
+            end
+            true
+          end
+
+          def parse_mapping(io, offset, length)
+            io.pos = offset
             @code_map, @gid_map = case @format
                                   when 0 then Format0.parse(io, length)
                                   when 2 then Format2.parse(io, length)
@@ -135,12 +155,9 @@ module HexaPDF
                                   when 6 then Format6.parse(io, length)
                                   when 10 then Format10.parse(io, length)
                                   when 12 then Format12.parse(io, length)
-                                  else
-                                    supported = false
-                                    [{}, {}]
                                   end
-            supported
           end
+          private :parse_mapping
 
           def inspect #:nodoc:
             "#<#{self.class.name} (#{platform_id}, #{encoding_id}, #{language}, " \

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

@@ -51,7 +51,7 @@ module HexaPDF
           # the :left_side_bearing.
           Metric = Struct.new(:advance_width, :left_side_bearing)
 
-          # An array of Metric objects, one for each glyph in the font.
+          # A hash of glyph ID to Metric objects mapping.
           attr_accessor :horizontal_metrics
 
           # Returns the Metric object for the give glyph ID.
@@ -63,10 +63,20 @@ module HexaPDF
 
           def parse_table #:nodoc:
             nr_entries = font[:hhea].num_of_long_hor_metrics
-            @horizontal_metrics = Array.new(nr_entries) { Metric.new(*read_formatted(4, 'ns>')) }
-            last_advance_width = @horizontal_metrics[-1].advance_width
-            read_formatted(directory_entry.length - 4 * nr_entries, 's>*').map do |lsb|
-              @horizontal_metrics << Metric.new(last_advance_width, lsb)
+            max_id = nr_entries + (directory_entry.length - 4 * nr_entries) / 2
+            @horizontal_metrics = Hash.new do |hash, glyph_id|
+              return nil if glyph_id >= max_id
+              if glyph_id >= nr_entries
+                with_io_pos(directory_entry.offset + 4 * nr_entries + (glyph_id - nr_entries) * 2) do
+                  hash[glyph_id] = Metric.new(@horizontal_metrics[nr_entries - 1].advance_width,
+                                              *read_formatted(2, 's>'))
+                end
+              else
+                with_io_pos(directory_entry.offset + 4 * glyph_id) do
+                  hash[glyph_id] = Metric.new(*read_formatted(4, 'ns>'))
+                end
+              end
+              hash[glyph_id]
             end
           end
 

data/lib/hexapdf/layout/text_layouter.rb

@@ -751,6 +751,7 @@ module HexaPDF
 
         while true
           too_wide_box = nil
+          line_height = 0
 
           rest = style.text_line_wrapping_algorithm.call(rest, width_block) do |line, item|
             # make sure empty lines broken by mandatory paragraph breaks are not empty

data/lib/hexapdf/version.rb

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

data/test/hexapdf/font/true_type/table/test_cmap_subtable.rb

@@ -43,14 +43,14 @@ describe HexaPDF::Font::TrueType::Table::CmapSubtable do
 
     it "works for format 0" do
       t = table([0, 262, 0].pack('n3') + [255].pack('C*') + (0..254).to_a.pack('C*'))
+      assert_equal(0, t.gid_to_code(255))
+      assert_equal(234, t.gid_to_code(233))
+
       assert_equal(255, t[0])
       assert_equal(233, t[234])
       assert_nil(t[256])
 
-      assert_equal(0, t.gid_to_code(255))
-      assert_equal(234, t.gid_to_code(233))
-
-      assert_raises(HexaPDF::Error) { table([0, 20, 0].pack('n3') + "a" * 20) }
+      assert_raises(HexaPDF::Error) { table([0, 20, 0].pack('n3') + "a" * 20)[0] }
     end
 
     it "works for format 2" do

data/test/hexapdf/font/true_type/table/test_hmtx.rb

@@ -5,7 +5,7 @@ require_relative 'common'
 require 'hexapdf/font/true_type/table/hhea'
 require 'hexapdf/font/true_type/table/hmtx'
 
-describe HexaPDF::Font::TrueType::Table::Hhea do
+describe HexaPDF::Font::TrueType::Table::Hmtx do
   before do
     data = [1, -2, 3, -4, 5, -6].pack('ns>ns>s>2')
     set_up_stub_true_type_font(data)
@@ -17,14 +17,14 @@ describe HexaPDF::Font::TrueType::Table::Hhea do
   describe "initialize" do
     it "reads the data from the associated file" do
       table = create_table(:Hmtx)
-      assert_equal(1, table[0].advance_width)
-      assert_equal(-2, table[0].left_side_bearing)
-      assert_equal(3, table[1].advance_width)
-      assert_equal(-4, table[1].left_side_bearing)
       assert_equal(3, table[2].advance_width)
       assert_equal(5, table[2].left_side_bearing)
       assert_equal(3, table[3].advance_width)
       assert_equal(-6, table[3].left_side_bearing)
+      assert_equal(1, table[0].advance_width)
+      assert_equal(-2, table[0].left_side_bearing)
+      assert_equal(3, table[1].advance_width)
+      assert_equal(-4, table[1].left_side_bearing)
     end
   end
 end

data/test/hexapdf/layout/test_text_layouter.rb

@@ -556,18 +556,37 @@ describe HexaPDF::Layout::TextLayouter do
       end
     end
 
-    it "breaks a text fragment into parts if it is wider than the available width" do
-      str = " Thisisaverylongstring"
-      frag = HexaPDF::Layout::TextFragment.create(str, font: @font)
-      result = @layouter.fit([frag], 20, 100)
-      assert(result.remaining_items.empty?)
-      assert_equal(:success, result.status)
-      assert_equal(str.strip.length, result.lines.sum {|l| l.items.sum {|i| i.items.count } })
-      assert_equal(45, result.height)
+    describe "breaks a text fragment into parts if it is wider than the available width" do
+      before do
+        @str = " This is averylongstring"
+        @frag = HexaPDF::Layout::TextFragment.create(@str, font: @font)
+      end
 
-      result = @layouter.fit([frag], 1, 100)
-      assert_equal(str.strip.length, result.remaining_items.count)
-      assert_equal(:box_too_wide, result.status)
+      it "works with fixed width" do
+        result = @layouter.fit([@frag], 20, 100)
+        assert(result.remaining_items.empty?)
+        assert_equal(:success, result.status)
+        assert_equal(@str.delete(" ").length, result.lines.sum {|l| l.items.sum {|i| i.items.count } })
+        assert_equal(54, result.height)
+
+        result = @layouter.fit([@frag], 1, 100)
+        assert_equal(8, result.remaining_items.count)
+        assert_equal(:box_too_wide, result.status)
+      end
+
+      it "works with variable width" do
+        width_block = lambda do |height, line_height|
+          # 'averylongstring' would fit when only considering height but not height + line_height
+          if height + line_height < 15
+            63
+          else
+            10
+          end
+        end
+        result = @layouter.fit([@frag], width_block, 30)
+        assert_equal(:height, result.status)
+        assert_equal([26.95, 9.44, 7.77], result.lines.map {|l| l.width.round(3) })
+      end
     end
 
     describe "horizontal alignment" do

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.11.4)>>
+      <</Producer(HexaPDF version 0.11.5)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.11.4)>>
+      <</Producer(HexaPDF version 0.11.5)>>
       endobj
       2 0 obj
       <</Length 10>>stream

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-28 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -637,7 +637,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby