pdfrb 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26e34e7b8d5b74f8a2f8a89b36b3ea7ae028b0cf8944707aeed0a3ddde8270fc
-  data.tar.gz: 9bae4c50eff54052d0cc173559625fb0de3ff782bb567b9ac0bf7f85be951aea
+  metadata.gz: ebb3cb6d645dd2e4f01dbfdcfc49e51ed0857281fc996a38ddb29afb18aef4e7
+  data.tar.gz: 9b359396f34164f661bebece73f26dd92fc9ea804c8edd802e53d80c6fccb334
 SHA512:
-  metadata.gz: 3c12a6ae1950e81e8bb5fc181dc35aa63fcb6c0671bf0ab9e3becc92b3ebbb28e2210eb0be966ca4cefb6baf97688b1e7ba8115629d08647493680f5f42c6588
-  data.tar.gz: 87eb412507356b781a33f96f3d58aa6a14acb5284664091879c23c699e70bd3a2ee4e5f0dbd64c7958361544e1ecc3a23f71b00e2d95b3fe9f2805ab9ad441ed
+  metadata.gz: a3eb6c87f3e7b10fdb310669943b3f61cf206c10f3ad61a998673b83f94dc6aef3082a22ef8f56632dad2e75a858b39c7a969a0590779f8ae3b7320c6c78ff90
+  data.tar.gz: 9a1453e1556d9c968b3176aa207773e4083687441f7f8025941d82b4f34394a68fba1b3f7a386b4fb73743fb4770ca7c055276f28100b9686f40f6165eb69c76

data/lib/pdfrb/content/operators/inline_image.rb

@@ -10,10 +10,9 @@ module Pdfrb
       # needed, but the bytes live in the content stream so they
       # can't be reused.
       #
-      # The serialise path emits the BI dict, ID marker, raw bytes,
-      # and EI marker. The invoke path is intentionally a no-op; the
-      # content Parser handles BI/ID/EI as a single bounded block
-      # rather than via the operator dispatch table.
+      # The Parser detects BI ... ID ... EI and yields a single
+      # BeginInlineImage invocation with the parsed image Hash as
+      # the operand. The invoke hook calls Processor#inline_image.
       class BeginInlineImage < Base
         class << self
           def name; "BI"; end
@@ -27,7 +26,9 @@ module Pdfrb
             buf
           end
 
-          def invoke(_processor, *_operands); end
+          def invoke(processor, image = nil)
+            processor.inline_image(image) if image
+          end
           register
         end
       end
@@ -36,14 +37,6 @@ module Pdfrb
         class << self
           def name; "EI"; end
 
-          # The byte payload sits between ID and EI. The serializer
-          # for inline images writes the payload directly via
-          # Canvas#inline_image; this method is here so the registry
-          # knows about EI.
-          def serialize(_serializer, *_operands)
-            "EI\n"
-          end
-
           def invoke(_processor, *_operands); end
           register
         end

data/lib/pdfrb/content/processor.rb

@@ -76,6 +76,12 @@ module Pdfrb
       def begin_marked_content(_tag, _properties = nil); end
       def end_marked_content; end
       def marked_content_point(_tag, _properties = nil); end
+
+      # Called when a BI/ID/EI inline image is encountered in the
+      # content stream. +image+ is a Hash with :header (the image
+      # dict keys, expanded from abbreviations) and :data (the raw
+      # byte payload). Subclasses override to render or extract.
+      def inline_image(_image); end
     end
   end
 end

data/lib/pdfrb/layout/box_fitter.rb

@@ -3,7 +3,9 @@
 module Pdfrb
   module Layout
     # Fits an ordered list of boxes into a Frame, flowing to a new
-    # Frame (provided by a block) when one fills up.
+    # Frame (provided by a block) when one fills up. Delegates area
+    # tracking to the Frame (which now properly tracks removed areas
+    # and returns non-overlapping positions).
     class BoxFitter
       attr_reader :boxes, :frame, :result, :overflow
 
@@ -16,26 +18,8 @@ module Pdfrb
 
       def fit
         current_frame = @frame
-        cursor_y = current_frame.top
         @boxes.each do |box|
-          loop do
-            position = current_frame.find_available_area(box.width || current_frame.width, box.height || (cursor_y - current_frame.bottom))
-            if position && box.fit?(position[2] || current_frame.width, position[3] || (cursor_y - current_frame.bottom))
-              @result << [box, position]
-              current_frame.remove_area(position[0], position[1] - box.height, box.width, box.height)
-              cursor_y = position[1] - box.height
-              break
-            else
-              next_frame = yield if block_given?
-              if next_frame
-                current_frame = next_frame
-                cursor_y = current_frame.top
-              else
-                @overflow << box
-                break
-              end
-            end
-          end
+          current_frame = fit_box(box, current_frame)
         end
         self
       end
@@ -49,6 +33,37 @@ module Pdfrb
       def fit_complete?
         @overflow.empty?
       end
+
+      private
+
+      def fit_box(box, frame)
+        loop do
+          return frame if place?(box, frame)
+
+          next_frame = yield if block_given?
+          unless next_frame
+            @overflow << box
+            return frame
+          end
+
+          frame = next_frame
+        end
+      end
+
+      def place?(box, frame)
+        box_w = box.width || frame.width
+        box_h = box.height || frame.available_height
+        position = frame.find_available_area(box_w, box_h)
+        return false unless position
+
+        actual_w = position[2] || frame.width
+        actual_h = position[3] || frame.available_height
+        return false unless box.fit?(actual_w, actual_h)
+
+        @result << [box, position]
+        frame.remove_area(position[0], position[1], actual_w, box.height || actual_h)
+        true
+      end
     end
   end
 end

data/lib/pdfrb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pdfrb
-  VERSION = "0.7.12"
+  VERSION = "0.7.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdfrb
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
 platform: ruby
 authors:
 - Ribose Inc.