hexapdf 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 245de775fa069ad91f2fe9f5e72610df40211e8b15a92b376cdf217c63b877fe
-  data.tar.gz: 34891827479def7d0efd506c9cd62f10abced99b8e694e39bc0dd06b1fa88bfe
+  metadata.gz: 60a5bf5332e0ebf949653852c2f77a7a78861b120bf0c5eed30ee6591cd0736e
+  data.tar.gz: 79c8495ffcf48c4d81180ab9aa39e5ee12386f0a015ccef2460e453a879609d3
 SHA512:
-  metadata.gz: 0c8bedff161a8aa756d6ffc426c89554e82537198692250a78f0eaad36fa896767681bda681d43bdcd5237f3eba91d25679499bbbe56ff525a16813c06187636
-  data.tar.gz: 35f82390333d2110c7ccb3059c93914e7ab03bbcd986c0ca7da1d3425c5a2c619aa42513da15d218423917e01f696b7b4e156f00b1997007c9feb637ae921d20
+  metadata.gz: ded53b4977a8caafc8811b80f42fd0e137fed0af84072ee864a30f02ac729d5327f85840c2f7eb21426a5f3beee8caa6b2d40f91e0521180f161db8ccad86a48
+  data.tar.gz: c1f7c2fb6e6fd2eacef1d11421768844471d0b048bf0eb36558f6a0a6426eed3438db1309aa17e3cd4e7a1e973affab946b52073c10ad7a37e0d9c3ce46cf3b8

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.11.6 - 2020-05-27
+
+### Fixed
+
+* [HexaPDF::Layout::TextBox] to respect the set width and height when fitting
+  and splitting the box
+
+
 ## 0.11.5 - 2020-01-27
 
 ### Changed

data/lib/hexapdf/document/pages.rb

@@ -107,6 +107,8 @@ module HexaPDF
       # Deletes the given page object from the document's page tree (but *not* from the document).
       #
       # Returns the page object, or +nil+ if the page object was not in the page tree.
+      #
+      # Also see: HexaPDF::Type::PageTreeNode#delete_page
       def delete(page)
         @document.catalog.pages.delete_page(page)
       end
@@ -118,6 +120,8 @@ module HexaPDF
       # document).
       #
       # Returns the page object, or +nil+ if the index was invalid.
+      #
+      # Also see: HexaPDF::Type::PageTreeNode#delete_page
       def delete_at(index)
         @document.catalog.pages.delete_page(index)
       end

data/lib/hexapdf/layout/text_box.rb

@@ -64,6 +64,9 @@ module HexaPDF
       #
       # Also see TextLayouter#style for other style properties taken into account.
       def fit(available_width, available_height, frame)
+        return false if (@initial_width > 0 && @initial_width > available_width) ||
+          (@initial_height > 0 && @initial_height > available_height)
+
         @width = @height = 0
         @result = if style.position == :flow
                     @tl.fit(@items, frame.width_specification, frame.contour_line.bbox.height)
@@ -74,8 +77,8 @@ module HexaPDF
                     height = (@initial_height > 0 ? @initial_height : available_height) - @height
                     @tl.fit(@items, width, height)
                   end
-        @width += @result.lines.max_by(&:width)&.width || 0
-        @height += @result.height
+        @width += (@initial_width > 0 ? width : @result.lines.max_by(&:width)&.width || 0)
+        @height += (@initial_height > 0 ? height : @result.height)
         if style.last_line_gap && @result.lines.last
           @height += style.line_spacing.gap(@result.lines.last, @result.lines.last)
         end
@@ -86,7 +89,9 @@ module HexaPDF
       # Splits the text box into two boxes if necessary and possible.
       def split(available_width, available_height, frame)
         fit(available_width, available_height, frame) unless @result
-        if @result.remaining_items.empty?
+        if @width > available_width || @height > available_height
+          [nil, self]
+        elsif @result.remaining_items.empty?
           [self]
         elsif @result.lines.empty?
           [nil, self]

data/lib/hexapdf/version.rb

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

data/test/hexapdf/layout/test_text_box.rb

@@ -31,11 +31,11 @@ describe HexaPDF::Layout::TextBox do
     end
 
     it "respects the set width and height" do
-      box = create_box([@inline_box] * 5, width: 40, height: 50, style: {padding: 10})
+      box = create_box([@inline_box], width: 40, height: 50, style: {padding: 10})
       assert(box.fit(100, 100, @frame))
       assert_equal(40, box.width)
       assert_equal(50, box.height)
-      assert_equal([20, 20, 10], box.instance_variable_get(:@result).lines.map(&:width))
+      assert_equal([10], box.instance_variable_get(:@result).lines.map(&:width))
     end
 
     it "fits into the frame's outline" do
@@ -52,6 +52,16 @@ describe HexaPDF::Layout::TextBox do
       assert_equal(50, box.width)
       assert_equal(20, box.height)
     end
+
+    it "can't fit the text box if the set width is bigger than the available width" do
+      box = create_box([@inline_box], width: 101)
+      refute(box.fit(100, 100, @frame))
+    end
+
+    it "can't fit the text box if the set height is bigger than the available height" do
+      box = create_box([@inline_box], height: 101)
+      refute(box.fit(100, 100, @frame))
+    end
   end
 
   describe "split" do
@@ -70,6 +80,14 @@ describe HexaPDF::Layout::TextBox do
       assert_equal([nil, box], box.split(5, 20, @frame))
     end
 
+    it "works if the whole text box doesn't fits" do
+      box = create_box([@inline_box], width: 102)
+      assert_equal([nil, box], box.split(100, 100, @frame))
+
+      box = create_box([@inline_box], height: 102)
+      assert_equal([nil, box], box.split(100, 100, @frame))
+    end
+
     it "splits the box if necessary" do
       box = create_box([@inline_box] * 10)
       boxes = box.split(50, 10, @frame)

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.11.5)>>
+      <</Producer(HexaPDF version 0.11.6)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.11.5)>>
+      <</Producer(HexaPDF version 0.11.6)>>
       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.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -102,11 +102,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- CONTRIBUTERS
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - agpl-3.0.txt
 - bin/hexapdf
 - data/hexapdf/afm/Courier-Bold.afm
@@ -401,7 +399,6 @@ files:
 - lib/hexapdf/version.rb
 - lib/hexapdf/writer.rb
 - lib/hexapdf/xref_section.rb
-- man/man1/hexapdf.1
 - test/data/aes-test-vectors/CBCGFSbox-128-decrypt.data.gz
 - test/data/aes-test-vectors/CBCGFSbox-128-encrypt.data.gz
 - test/data/aes-test-vectors/CBCGFSbox-192-decrypt.data.gz
@@ -637,7 +634,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby

data/CONTRIBUTERS

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

data/VERSION

@@ -1 +0,0 @@
-0.11.5