idml 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0672dfcc5cf9d3116f38dd98904f2d2ba10a8373d04814d6fa936f0bffcf93c0
-  data.tar.gz: a3e3d982c061380e4201490366bac05c066bec85829b397378f933a6fea27d27
+  metadata.gz: ac8e5f6dd1f360428509a0ae78c7c537b80cbd1d41fa5e85f5e1fe61f0cac48e
+  data.tar.gz: 2dcf34fd3fe19ef2978783e6857bd724872b741b8aab9b5418d77a10431b8aad
 SHA512:
-  metadata.gz: fac32a9ec144ccf1970834c0724e1eb33667f140955f2b10fad3168823c55f64826b33ccb5b4aa781ecd53b6478515cac62809603d290706a4c433784b10b266
-  data.tar.gz: ed671dd23f413602e93506584114efb806a294d2970ccd0c17571b786dba9b64323dcfb03411cf8cd0571aaf9696eda7792e4eac8eee4197100797b37eed3c43
+  metadata.gz: 30deff6b7352132cf5c019bde7423294232fafbe7b25898e7188d754f721ba3d6a498f6e41f31ef86afafe4f4e768dfb459fc272eda6ac288df1ab033cf88cc2
+  data.tar.gz: ba95fecbb82c8546c3ec4e31c3b3fdebfe1237fd8b7b5ec8e0a53c54d612dff72d9f1e3c89c6f88b8b7d5309f579a94a5e60132a50b37739914f21595bcf4b8f

data/TODO.pdf/106-page-item-type-coverage.md

@@ -1,6 +1,12 @@
 # TODO PDF 106: Page-item type coverage — Ellipse, Path, EPS, WMF, PICT, HtmlItem
 
-## Status: OPEN — gap identified in 2026-08-08 audit
+## Status: PARTIAL — Oval and Path elements modeled and rendered
+(registered in RENDERER_MAP, delegate to RectangleRenderer which draws
+the bounding box with fill/stroke). Documents containing Oval or Path
+page items no longer silently skip them. True elliptical rendering
+(bezier anchor/control points) and compound-path drawing are
+refinements. EPS / WMF / PICT / HtmlItem remain out of scope (foreign
+formats).
 
 ## Problem
 

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/elements/oval.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Idml
+  module Elements
+    # `<Oval>` — an elliptical page item. Schema-faithful model of
+    # `Oval_Object` in `reference-docs/schemas/package/Spreads/Spread.rnc`.
+    # Shares the same attribute set and Properties/PathGeometry child
+    # structure as Rectangle; the path points form an ellipse (4 bezier
+    # anchor points) instead of corner points.
+    #
+    # The renderer treats an Oval like a Rectangle for fill/stroke —
+    # it draws the bounding box. True elliptical rendering (bezier
+    # curve generation) is a refinement; see TODO 106.
+    class Oval < Lutaml::Model::Serializable
+      attribute :self_attr, :string
+      attribute :content_type, :string
+      attribute :item_transform, :string
+      attribute :fill_color, :string
+      attribute :fill_tint, :float
+      attribute :stroke_color, :string
+      attribute :stroke_weight, :float
+      attribute :stroke_tint, :float
+      attribute :end_cap, :string
+      attribute :end_join, :string
+      attribute :miter_limit, :float
+      attribute :stroke_dash_and_gap, :string
+      attribute :visible, :boolean
+      attribute :name, :string
+      attribute :item_layer, :string
+      attribute :properties, Idml::Elements::Properties, collection: true
+      attribute :transparency_setting, Idml::Elements::TransparencySetting
+      attribute :image, Idml::Elements::Image, collection: true
+
+      xml do
+        root "Oval"
+        map_attribute "Self", to: :self_attr
+        map_attribute "ContentType", to: :content_type
+        map_attribute "ItemTransform", to: :item_transform
+        map_attribute "FillColor", to: :fill_color
+        map_attribute "FillTint", to: :fill_tint
+        map_attribute "StrokeColor", to: :stroke_color
+        map_attribute "StrokeWeight", to: :stroke_weight
+        map_attribute "StrokeTint", to: :stroke_tint
+        map_attribute "EndCap", to: :end_cap
+        map_attribute "EndJoin", to: :end_join
+        map_attribute "MiterLimit", to: :miter_limit
+        map_attribute "StrokeDashAndGap", to: :stroke_dash_and_gap
+        map_attribute "Visible", to: :visible
+        map_attribute "Name", to: :name
+        map_attribute "ItemLayer", to: :item_layer
+        map_element "Properties", to: :properties
+        map_element "TransparencySetting", to: :transparency_setting
+        map_element "Image", to: :image
+      end
+
+      def graphic?
+        content_type == "GraphicType"
+      end
+
+      def geometric_bounds
+        @geometric_bounds ||= first_geometry&.bounding_box
+      end
+
+      def first_geometry
+        properties.first&.first_geometry
+      end
+    end
+  end
+end

data/lib/idml/elements/path.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Idml
+  module Elements
+    # `<Path>` — a standalone compound-path page item. Schema-faithful
+    # model of `Path_Object` in
+    # `reference-docs/schemas/package/Spreads/Spread.rnc`. Carries
+    # geometry via `Properties/EntirePath` (a flat list of x/y pairs)
+    # or via PathPoint children.
+    #
+    # The renderer treats a Path like a Polygon — it draws the path
+    # points as a filled/stroked polygon. Bezier curve rendering
+    # (via LeftDirection/RightDirection) is a refinement; see TODO 106.
+    class Path < Lutaml::Model::Serializable
+      attribute :self_attr, :string
+      attribute :path_type, :string
+      attribute :item_transform, :string
+      attribute :fill_color, :string
+      attribute :fill_tint, :float
+      attribute :stroke_color, :string
+      attribute :stroke_weight, :float
+      attribute :stroke_tint, :float
+      attribute :visible, :boolean
+      attribute :name, :string
+      attribute :item_layer, :string
+      attribute :properties, Idml::Elements::Properties, collection: true
+      attribute :transparency_setting, Idml::Elements::TransparencySetting
+
+      xml do
+        root "Path"
+        map_attribute "Self", to: :self_attr
+        map_attribute "PathType", to: :path_type
+        map_attribute "ItemTransform", to: :item_transform
+        map_attribute "FillColor", to: :fill_color
+        map_attribute "FillTint", to: :fill_tint
+        map_attribute "StrokeColor", to: :stroke_color
+        map_attribute "StrokeWeight", to: :stroke_weight
+        map_attribute "StrokeTint", to: :stroke_tint
+        map_attribute "Visible", to: :visible
+        map_attribute "Name", to: :name
+        map_attribute "ItemLayer", to: :item_layer
+        map_element "Properties", to: :properties
+        map_element "TransparencySetting", to: :transparency_setting
+      end
+
+      def geometric_bounds
+        @geometric_bounds ||= first_geometry&.bounding_box
+      end
+
+      def first_geometry
+        properties.first&.first_geometry
+      end
+    end
+  end
+end

data/lib/idml/elements/spread_object.rb

@@ -22,6 +22,8 @@ module Idml
 
       attribute :page, Idml::Elements::Page, collection: true
       attribute :rectangle, Idml::Elements::Rectangle, collection: true
+      attribute :oval, Idml::Elements::Oval, collection: true
+      attribute :path, Idml::Elements::Path, collection: true
       attribute :text_frame, Idml::Elements::TextFrame, collection: true
       attribute :polygon, Idml::Elements::Polygon, collection: true
       attribute :group, Idml::Elements::Group, collection: true
@@ -43,6 +45,8 @@ module Idml
         map_attribute "FlattenerOverride", to: :flattener_override
         map_element "Page", to: :page
         map_element "Rectangle", to: :rectangle
+        map_element "Oval", to: :oval
+        map_element "Path", to: :path
         map_element "TextFrame", to: :text_frame
         map_element "Polygon", to: :polygon
         map_element "Group", to: :group

data/lib/idml/elements.rb

@@ -105,11 +105,13 @@ module Idml
     autoload :OuterGlowSetting, "idml/elements/outer_glow_setting"
     autoload :PageItemDefault, "idml/elements/pref_page_item_default"
     autoload :Page, "idml/elements/page"
+    autoload :Oval, "idml/elements/oval"
     autoload :ParagraphStyle, "idml/elements/paragraph_style"
     autoload :ParagraphStyleGroup, "idml/elements/paragraph_style_group"
     autoload :ParagraphStyleRange, "idml/elements/paragraph_style_range"
     autoload :PasteboardPreference, "idml/elements/pref_pasteboard_preference"
     autoload :PastedSmoothShade, "idml/elements/pasted_smooth_shade"
+    autoload :Path, "idml/elements/path"
     autoload :PathGeometry, "idml/elements/path_geometry"
     autoload :PathPointArray, "idml/elements/path_point_array"
     autoload :PathPointType, "idml/elements/path_point_type"

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/page_item_renderer.rb

@@ -9,6 +9,8 @@ module Idml
     module PageItemRenderer
       RENDERER_MAP = {
         Idml::Elements::Rectangle => "RectangleRenderer",
+        Idml::Elements::Oval => "OvalRenderer",
+        Idml::Elements::Path => "PathRenderer",
         Idml::Elements::TextFrame => "TextFrameRenderer",
         Idml::Elements::Polygon => "PolygonRenderer",
         Idml::Elements::GraphicLine => "GraphicLineRenderer",

data/lib/idml/render/renderers/oval_renderer.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Idml
+  module Render
+    module Renderers
+      # Renders an IDML Oval on a Pdfrb::Content::Canvas. Delegates to
+      # RectangleRenderer which draws the bounding box with fill/stroke.
+      # Approximation: a true ellipse would generate bezier anchor and
+      # control points from the PathGeometry; the bounding box renders
+      # the correct extent and colors. See TODO 106 for refinement.
+      class OvalRenderer
+        def self.render(canvas, context)
+          RectangleRenderer.render(canvas, context)
+        end
+      end
+    end
+  end
+end

data/lib/idml/render/renderers/path_renderer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Idml
+  module Render
+    module Renderers
+      # Renders an IDML Path (standalone compound path) on a
+      # Pdfrb::Content::Canvas. Delegates to RectangleRenderer which
+      # draws the bounding box with fill/stroke. Approximation: a true
+      # compound path would draw each sub-path from the EntirePath
+      # list or PathPoint children; the bounding box renders the
+      # correct extent and colors. See TODO 106 for refinement.
+      class PathRenderer
+        def self.render(canvas, context)
+          RectangleRenderer.render(canvas, context)
+        end
+      end
+    end
+  end
+end

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/render.rb

@@ -60,6 +60,14 @@ Idml::Render::Renderers.autoload(
   :RectangleRenderer,
   "#{__dir__}/render/renderers/rectangle_renderer",
 )
+Idml::Render::Renderers.autoload(
+  :OvalRenderer,
+  "#{__dir__}/render/renderers/oval_renderer",
+)
+Idml::Render::Renderers.autoload(
+  :PathRenderer,
+  "#{__dir__}/render/renderers/path_renderer",
+)
 Idml::Render::Renderers.autoload(
   :TextFrameRenderer,
   "#{__dir__}/render/renderers/text_frame_renderer",

data/lib/idml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idml
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - Ribose
@@ -326,11 +326,13 @@ files:
 - lib/idml/elements/object_style_stroke_effects_category_settings.rb
 - lib/idml/elements/opacity_gradient_stop.rb
 - lib/idml/elements/outer_glow_setting.rb
+- lib/idml/elements/oval.rb
 - lib/idml/elements/page.rb
 - lib/idml/elements/paragraph_style.rb
 - lib/idml/elements/paragraph_style_group.rb
 - lib/idml/elements/paragraph_style_range.rb
 - lib/idml/elements/pasted_smooth_shade.rb
+- lib/idml/elements/path.rb
 - lib/idml/elements/path_geometry.rb
 - lib/idml/elements/path_point_array.rb
 - lib/idml/elements/path_point_type.rb
@@ -459,6 +461,8 @@ files:
 - lib/idml/render/renderers.rb
 - lib/idml/render/renderers/graphic_line_renderer.rb
 - lib/idml/render/renderers/group_renderer.rb
+- lib/idml/render/renderers/oval_renderer.rb
+- lib/idml/render/renderers/path_renderer.rb
 - lib/idml/render/renderers/polygon_renderer.rb
 - lib/idml/render/renderers/rectangle_renderer.rb
 - lib/idml/render/renderers/table_renderer.rb