pdfrb 0.7.11 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 110dd46487b657b7cd703d56a21cd92d6a39a5592a899298e8e0e9c18b292b17
-  data.tar.gz: bd739eb6fc4238edc56aad66db164b12c66c421a13d8165fe93c140c8e335b0d
+  metadata.gz: ebb3cb6d645dd2e4f01dbfdcfc49e51ed0857281fc996a38ddb29afb18aef4e7
+  data.tar.gz: 9b359396f34164f661bebece73f26dd92fc9ea804c8edd802e53d80c6fccb334
 SHA512:
-  metadata.gz: 1b5b55bdb8bf2cd3b4874a7c4d4f85905e7a99e27b683de07043a3dc3f3f9d3b676fc14493ee7209f2f646b593c9604f79fef4dbadbf9ae6dd08d8aa07153c39
-  data.tar.gz: d13c343ed3efc47b9dc29ad3f828dc101b093926d2516c34cb4ab0b9736312974076772e2fe1c367f1784de842d7ea220c4ab4efcc738db42542d9ef474ac7c9
+  metadata.gz: a3eb6c87f3e7b10fdb310669943b3f61cf206c10f3ad61a998673b83f94dc6aef3082a22ef8f56632dad2e75a858b39c7a969a0590779f8ae3b7320c6c78ff90
+  data.tar.gz: 9a1453e1556d9c968b3176aa207773e4083687441f7f8025941d82b4f34394a68fba1b3f7a386b4fb73743fb4770ca7c055276f28100b9686f40f6165eb69c76

data/lib/pdfrb/composer.rb

@@ -57,6 +57,8 @@ module Pdfrb
     def new_page(style_name = nil)
       @current_style_name = style_name || next_style_name
       style_obj = @page_styles[@current_style_name]
+      # Reset the frame cursor for the new page.
+      reset_frame_cursor(style_obj)
       page = @document.pages.add
       page.value[:MediaBox] = [0, 0, style_obj.width, style_obj.height]
       @current_page = page
@@ -64,6 +66,11 @@ module Pdfrb
       page
     end
 
+    def reset_frame_cursor(style_obj)
+      style_obj&.frame&.reset!
+    end
+    private :reset_frame_cursor
+
     def x
       @cursor_x || 50
     end
@@ -143,17 +150,29 @@ module Pdfrb
 
       style_obj = @page_styles[@current_style_name]
       frame = style_obj.frame
-      cursor_y = frame.top
 
       @pending_boxes.each do |box|
-        unless box.fit?(frame.width, cursor_y - frame.bottom)
+        available_h = frame.available_height.positive? ? frame.available_height : (frame.top - frame.bottom)
+        unless box.fit?(frame.width, available_h)
           new_page
-          cursor_y = @page_styles[@current_style_name].frame.top
-          box.fit?(frame.width, cursor_y - frame.bottom)
+          style_obj = @page_styles[@current_style_name]
+          frame = style_obj.frame
+          available_h = frame.top - frame.bottom
+          box.fit?(frame.width, available_h)
         end
+
+        position = frame.find_available_area(box.width || frame.width, box.height || available_h)
+        if position
+          draw_x, draw_y, = position
+        else
+          draw_x = frame.left
+          draw_y = frame.cursor_y - (box.height || 0)
+        end
+
         canvas = @current_page.canvas
-        box.draw(canvas, frame.left, cursor_y)
-        cursor_y -= box.height
+        box.draw(canvas, draw_x, draw_y)
+        box_h = box.height || available_h
+        frame.remove_area(draw_x, draw_y, box.width || frame.width, box_h)
       end
       @pending_boxes = []
     end

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/layout/frame.rb

@@ -9,8 +9,14 @@ module Pdfrb
     # Simple case: the Frame is a plain rectangle. Advanced: the
     # +shape+ polygon allows non-rectangular regions (L-shaped, with
     # cutouts around images).
+    #
+    # Area tracking: +remove_area+ marks a rectangle as used. The
+    # Frame maintains a +cursor_y+ that tracks the lowest free
+    # vertical position. +find_available_area+ returns the next
+    # position at or above the cursor where the requested
+    # (width × height) fits without overlapping any removed area.
     class Frame
-      attr_reader :left, :bottom, :width, :height, :shape
+      attr_reader :left, :bottom, :width, :height, :shape, :cursor_y
 
       def initialize(left:, bottom:, width:, height:, shape: nil)
         @left = left.to_f
@@ -18,6 +24,8 @@ module Pdfrb
         @width = width.to_f
         @height = height.to_f
         @shape = shape || default_shape
+        @cursor_y = top
+        @removed_areas = []
       end
 
       def right
@@ -28,37 +36,70 @@ module Pdfrb
         @bottom + @height
       end
 
-      # Locate the next free area of (width × height) within this Frame.
-      # Returns nil if none fits. After a successful find, callers
-      # typically call +remove_area+ with the returned rectangle to
-      # mark it as used.
+      # Locate the next free area of (width × height) within this
+      # Frame. Scans from the cursor_y downward, checking each
+      # candidate y against the removed-areas list. Returns
+      # [x, y, w, h] or nil if nothing fits.
       def find_available_area(width, height)
         w = width.to_f
         h = height.to_f
         return nil if w > @width || h > @height
+        return nil if h > available_height
+
+        y = @cursor_y - h
+        while y >= @bottom
+          if area_free?(@left, y, w, h)
+            @cursor_y = y
+            return [@left, y, w, h]
+          end
 
-        [@left, @bottom + @height - h]
+          y -= 1
+        end
+        nil
       end
 
       # Mark the rectangle at (x, y) of (w × h) as filled. Subsequent
-      # +find_available_area+ calls avoid this region.
+      # +find_available_area+ calls avoid this region. Moves the
+      # cursor down when the removed area is at the current cursor.
       def remove_area(x, y, w, h)
         return if x.nil? || y.nil?
 
-        @removed ||= []
-        @removed << [x.to_f, y.to_f, w.to_f, h.to_f]
+        @removed_areas << [x.to_f, y.to_f, w.to_f, h.to_f]
+        # If the removed area touches the cursor, advance it.
+        if (y + h) >= @cursor_y - 1
+          @cursor_y = [@cursor_y, y].min
+        end
       end
 
       def full?
-        @removed&.any?
+        @cursor_y <= @bottom
       end
 
       def empty?
-        !full?
+        @removed_areas.empty?
+      end
+
+      def available_height
+        @cursor_y - @bottom
+      end
+
+      # Reset the cursor and removed-areas list. Used by the
+      # Composer when starting a new page with the same Frame.
+      def reset!
+        @cursor_y = top
+        @removed_areas = []
       end
 
       private
 
+      def area_free?(x, y, w, h)
+        @removed_areas.none? { |rx, ry, rw, rh| rectangles_overlap?(x, y, w, h, rx, ry, rw, rh) }
+      end
+
+      def rectangles_overlap?(x1, y1, w1, h1, x2, y2, w2, h2)
+        x1 < x2 + w2 && x1 + w1 > x2 && y1 < y2 + h2 && y1 + h1 > y2
+      end
+
       def default_shape
         [[@left, @bottom], [right, @bottom], [right, top], [@left, top]]
       end

data/lib/pdfrb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdfrb
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-13 00:00:00.000000000 Z
+date: 2026-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor