idml 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0672dfcc5cf9d3116f38dd98904f2d2ba10a8373d04814d6fa936f0bffcf93c0
-  data.tar.gz: a3e3d982c061380e4201490366bac05c066bec85829b397378f933a6fea27d27
+  metadata.gz: a20e81d5d762e6dfcb5c374d342210ac6132a96604d83ee305dfa1c64e64e535
+  data.tar.gz: e6da886fc60f952b2e9f39f512027b953958c19e14cadf3200dc9952e4c3fa96
 SHA512:
-  metadata.gz: fac32a9ec144ccf1970834c0724e1eb33667f140955f2b10fad3168823c55f64826b33ccb5b4aa781ecd53b6478515cac62809603d290706a4c433784b10b266
-  data.tar.gz: ed671dd23f413602e93506584114efb806a294d2970ccd0c17571b786dba9b64323dcfb03411cf8cd0571aaf9696eda7792e4eac8eee4197100797b37eed3c43
+  metadata.gz: f8a51af44eaa9c43cba3bbdc9f332b1fa94f34f3eb08cb32ce01b957ceff14d6903f03a2d458884a538ef6f6e56d224868427abc46f1303d8f04d82324d9aa5b
+  data.tar.gz: 68e81d0fc87751c37015ea4a3b905a65c7863145bc074714e3241a02e4f951294703b3a3b4eef8d46601d896b95ddc40d3d267f9e54ee71483b2ba9bccbb742a

data/TODO.pdf/107-image-rendering-unification.md

@@ -1,6 +1,19 @@
 # TODO PDF 107: Image rendering unification via PageItemRenderer
 
-## Status: OPEN — gap identified in 2026-08-08 audit
+## Status: DONE for z-order — ImageCollector now tags each ref with
+`parent_self` (the containing page item's Self). SpreadRenderer
+groups refs by parent and renders each item's images when that item
+is reached in the each_page_item loop (instead of all upfront as a
+background layer). Images now respect z-order relative to other
+page items.
+
+Intra-item ordering (fill behind image, stroke on top) remains
+approximate: the image renders BEFORE the item's fill/stroke dispatch.
+For the common case (image inside unfilled rectangle with stroke)
+this produces correct output — image behind stroke. For filled
+rectangles containing images (rare), the fill would cover the image.
+Full intra-item ordering would require integrating image rendering
+into RectangleRenderer between fill and stroke.
 
 ## Problem
 

data/lib/idml/render/image_collector.rb

@@ -56,11 +56,13 @@ module Idml
 
         load_new(image, parent, uri)
       end
+      private :register
 
       def reuse(name, image, parent)
         { name: name, placement: placement_for(image, parent),
-          clip_box: clip_box_for(parent) }
+          clip_box: clip_box_for(parent), parent_self: parent.self_attr }
       end
+      private :reuse
 
       def load_new(image, parent, uri)
         path = Image.resolve_path(uri, base_dir: @base_dir)
@@ -73,8 +75,9 @@ module Idml
         name = @writer.add_image(data: data)
         @writer.register_image_name(uri, name)
         { name: name, placement: placement_for(image, parent, dims[1]),
-          clip_box: clip_box_for(parent) }
+          clip_box: clip_box_for(parent), parent_self: parent.self_attr }
       end
+      private :load_new
 
       def clip_box_for(parent)
         return nil unless parent.geometric_bounds

data/lib/idml/render/spread_renderer.rb

@@ -40,14 +40,15 @@ module Idml
           condition_filter: @condition_filter,
           style_lookup: @style_lookup,
         }
+        images_by_parent = group_images_by_parent(image_refs)
 
         canvas.save_graphics_state do
           render_background(canvas, page_width, page_height)
-          render_images(canvas, image_refs)
-          render_master_items(canvas, spread, context_base)
+          render_master_items(canvas, spread, context_base, images_by_parent)
           spread.each_page_item do |item|
             next unless @layer_filter.visible?(item)
 
+            render_item_images(canvas, images_by_parent, item.self_attr)
             context = RenderContext.new(context_base.merge(item: item))
             PageItemRenderer.render(canvas, context)
           end
@@ -62,13 +63,30 @@ module Idml
         canvas.fill
       end
 
+      # Groups image refs by their parent page item's Self so each
+      # item's images render when that item is reached in z-order
+      # (instead of all upfront as a background layer).
+      def group_images_by_parent(image_refs)
+        image_refs.each_with_object({}) do |ref, hash|
+          parent = ref[:parent_self]
+          next unless parent
+
+          (hash[parent] ||= []) << ref
+        end
+      end
+
+      def render_item_images(canvas, images_by_parent, item_self)
+        refs = images_by_parent[item_self]
+        return unless refs
+
+        render_images(canvas, refs)
+      end
+
       def render_images(canvas, image_refs)
         return if image_refs.empty?
 
         image_refs.each do |ref|
           placement = ref[:placement]
-          placement[:scale_x].abs
-          placement[:scale_y].abs
           canvas.save_graphics_state do
             apply_image_clip(canvas, ref)
             canvas.draw_image_matrix(ref[:name],
@@ -88,11 +106,12 @@ module Idml
         canvas.clip
       end
 
-      def render_master_items(canvas, spread, context_base)
+      def render_master_items(canvas, spread, context_base, images_by_parent)
         return unless @package
 
         resolve_master_spreads(spread).each do |master|
-          render_master_page_items(canvas, master, context_base)
+          render_master_page_items(canvas, master, context_base,
+                                   images_by_parent)
         end
       end
 
@@ -107,11 +126,13 @@ module Idml
         masters
       end
 
-      def render_master_page_items(canvas, master_part, context_base)
+      def render_master_page_items(canvas, master_part, context_base,
+                                   images_by_parent)
         master_part.master_spread.each do |master_so|
           master_so.each_page_item do |item|
             next unless @layer_filter.visible?(item)
 
+            render_item_images(canvas, images_by_parent, item.self_attr)
             context = RenderContext.new(context_base.merge(item: item))
             PageItemRenderer.render(canvas, context)
           end

data/lib/idml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Idml
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idml
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Ribose