idml 0.10.11 → 0.10.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea3cefcb949b7fd6399d850354df7fe37e6f822e766994522b9df4ceaa13cfd7
-  data.tar.gz: 531db1a6a0d5ccb32cd7f3fddd751b99d140a5504a3ab7645913167e34fdeb7e
+  metadata.gz: 2f2a7b73c56645a87269780fc0cab9f998f5a6bf0d167b0ce9433dba9a8019cd
+  data.tar.gz: e4bb1522273937a4c2cf5631de1927f4583f63d16f2b351f893921407d89dc88
 SHA512:
-  metadata.gz: 6659beee3fa4e1d325bed4d0ed86a4a1db4c2944010d8a3deffbe3bf029df137187cb3b34fa064b5feecd000abad671fd712fb083caae837796339157bde9e25
-  data.tar.gz: d225c68cea43b34da224e37809cbfa5c0be3abc8775c7f10baee3d1756c69c325a002562070a54a5994ecc7da3883f58bbd407b337b66d9994a99b3532436049
+  metadata.gz: 83756750d549a02ff7080686509ac45acce77405db6c9d3ba0ee6dae3643622b8eb89198d28fead77047dac50bdcf9491bdab05b7e03d02e18560f1021fa5360
+  data.tar.gz: 8a9fc59030029b4342019b205f9fe7da46ae6296729d641c49c199391cd5765ffea195dfca6cde46ff0df6518f496dcf9a1b66dc5dad0b808503230be8057107

data/TODO.pdf/150-architecture-round-three.md

@@ -0,0 +1,41 @@
+# TODO PDF 150: Architecture review round three — seam repairs
+
+## Status: COMPLETE — implemented 2026-08-30
+
+## Problem
+
+Round-three review findings (after TODOs 148-149):
+
+1. **Page-dimensions seam leak (bug)**: `ImageCollector` and
+   `HyperlinkEmitter` received a hardcoded `DEFAULT_HEIGHT = 792`
+   while pages rendered at per-page dimensions — both use the
+   height for the IDML→PDF y-flip, so images and link rectangles
+   misplaced on any non-letter page.
+2. **Dead interface kept alive by its tests**:
+   `TextWrapResolver#overlap_width` (+ `line_overlap`) had zero
+   lib callers since TODO 138 — only its own spec — and encoded
+   sum-semantics for multiple contours where the real interface
+   (`wrap_adjustment`) uses max. The spec suite asserted behavior
+   the renderer no longer had.
+3. **Thirteen copies of the synthetic-package triplet**: every
+   engine-path spec repeated `Dir.mktmpdir → Package.write →
+   Package.new`, with drifting names and inconsistent part sets.
+
+## Solution
+
+- Pipeline threads per-page `dims[:height]` into both consumers;
+  the constants stay only as `page_dimensions_for` fallbacks.
+- `overlap_width` / `line_overlap` deleted; all 15 spec call
+  sites migrated to `wrap_adjustment` (the "sums contours" spec
+  now documents max-combination honestly). The polygon variant
+  `WrapContour.overlap_width` stays — it is load-bearing.
+- `build_package(parts, name)` helper in spec_helper; thirteen
+  triplet copies replaced; three local helpers that shadowed the
+  global renamed (`anchored_fixture`, `decorated_fixture`,
+  `footnote_fixture`, `endnote_fixture`, `footnote_package`).
+
+## Files
+
+- `lib/idml/render/pipeline.rb`
+- `lib/idml/render/text_wrap_resolver.rb`
+- `spec/spec_helper.rb` + 13 spec files

data/TODO.pdf/151-schema-conformance.md

@@ -0,0 +1,48 @@
+# TODO PDF 151: Schema conformance for the Elements layer
+
+## Status: COMPLETE — implemented 2026-08-31
+
+## Problem
+
+Architecture review round four: 147 element classes held hundreds
+of wire attributes transcribed from the RNC, but only 11 classes
+had attribute-set specs — the project's own drift defense
+(CLAUDE.md convention 5) covered a tenth of the surface. Any
+hand-edit that added, dropped, or misspelled a `map_attribute`
+passed every test.
+
+## Solution
+
+- **`Idml::Schema::Rnc`** (`schema/rnc.rb`): the RNC parsing
+  extracted from the generator script into a lib adapter
+  (`element_attribute_map`, `element_definition`). Two consumers
+  over one seam — `scripts/rnc_to_lutaml.rb` (now presentation
+  only) and the conformance spec.
+- **Schema-conformance spec** (`elements_schema_conformance_spec.rb`):
+  for every Elements class — no wire attribute outside the RNC
+  universe (catches typos and inventions), and every mapped
+  destination is a declared attribute (mapping/declaration
+  consistency). Legacy non-schema classes (TableCell) carry an
+  explicit allow-list. Full equality is documented as
+  unenforceable (deliberate subsets; typedef-composed attributes).
+
+**Bug found by the probe and fixed**: `TextFramePreference`
+carried four invented attributes (`InsetTop/Left/Bottom/Right`)
+that appear in no schema, no spec, and no real file — while the
+schema-faithful inset carrier (`Properties > InsetSpacing`, spec
+examples 31/32) was unmodeled, so real documents' text frame
+insets were silently ignored. New `Elements::InsetSpacing`
+(single unit → all sides; list → [top, right, bottom, left]),
+wired into `layout_frame`; the invented attributes removed.
+
+## Files
+
+- `lib/idml/schema.rb`, `lib/idml/schema/rnc.rb` (new)
+- `scripts/rnc_to_lutaml.rb`
+- `lib/idml/elements/inset_spacing.rb` (new)
+- `lib/idml/elements/text_frame_preference.rb`,
+  `lib/idml/elements/properties.rb`, `lib/idml/elements.rb`
+- `lib/idml/render/renderers/text_frame_renderer.rb`,
+  `lib/idml.rb`
+- `spec/idml/elements_schema_conformance_spec.rb` (new)
+- `spec/idml/elements/inset_spacing_spec.rb` (new)

data/lib/idml/elements/inset_spacing.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Idml
+  module Elements
+    # `<InsetSpacing>` inside TextFramePreference's Properties —
+    # the schema-faithful carrier of text frame insets (the
+    # spec's examples 31/32): a single `type="unit"` value applies
+    # to all sides; a `type="list"` of ListItems carries
+    # [top, right, bottom, left].
+    class InsetSpacing < Lutaml::Model::Serializable
+      attribute :type, :string
+      attribute :value, :string
+      attribute :list_item, TypedValue, collection: true
+
+      xml do
+        root "InsetSpacing"
+        map_attribute "type", to: :type
+        map_content to: :value
+        map_element "ListItem", to: :list_item
+      end
+
+      # [top, right, bottom, left] insets; nil components when the
+      # document doesn't declare them.
+      def sides
+        return Array.new(4, value&.to_f) if list_item.empty?
+
+        (0...4).map { |i| list_item[i]&.value&.to_f }
+      end
+    end
+  end
+end

data/lib/idml/elements/properties.rb

@@ -18,6 +18,7 @@ module Idml
       attribute :paragraph_border_color, Idml::Elements::TypedValue
       attribute :text_wrap_offset, Idml::Elements::TypedValue
       attribute :paragraph_border_gap_color, Idml::Elements::TypedValue
+      attribute :inset_spacing, Idml::Elements::InsetSpacing
 
       xml do
         root "Properties"
@@ -29,6 +30,7 @@ module Idml
         map_element "ParagraphBorderColor", to: :paragraph_border_color
         map_element "TextWrapOffset", to: :text_wrap_offset
         map_element "ParagraphBorderGapColor", to: :paragraph_border_gap_color
+        map_element "InsetSpacing", to: :inset_spacing
       end
 
       def first_geometry

data/lib/idml/elements/text_frame_preference.rb

@@ -5,12 +5,10 @@ module Idml
     # Typed model of `<TextFramePreference>`. Every
     # attribute from `TextFramePreference_Object` in
     # `reference-docs/schemas/package/Resources/Styles.rnc` is declared (33 attributes),
-    # generated by `scripts/rnc_to_lutaml.rb`.
+    # generated by `scripts/rnc_to_lutaml.rb`. Insets live in the
+    # Properties > InsetSpacing child (spec examples 31/32).
     class TextFramePreference < Lutaml::Model::Serializable
-      attribute :inset_top, :float
-      attribute :inset_left, :float
-      attribute :inset_bottom, :float
-      attribute :inset_right, :float
+      attribute :properties, Idml::Elements::Properties, collection: true
       attribute :footnotes_enable_overrides, :boolean
       attribute :footnotes_span_across_columns, :boolean
       attribute :footnotes_minimum_spacing, :float
@@ -47,10 +45,7 @@ module Idml
 
       xml do
         root "TextFramePreference"
-        map_attribute "InsetTop", to: :inset_top
-        map_attribute "InsetLeft", to: :inset_left
-        map_attribute "InsetBottom", to: :inset_bottom
-        map_attribute "InsetRight", to: :inset_right
+        map_element "Properties", to: :properties
         map_attribute "FootnotesEnableOverrides", to: :footnotes_enable_overrides
         map_attribute "FootnotesSpanAcrossColumns", to: :footnotes_span_across_columns
         map_attribute "FootnotesMinimumSpacing", to: :footnotes_minimum_spacing

data/lib/idml/elements.rb

@@ -90,6 +90,7 @@ module Idml
     autoload :MasterSpreadObject, "idml/elements/master_spread_object"
     autoload :MixedInk, "idml/elements/mixed_ink"
     autoload :MixedInkGroup, "idml/elements/mixed_ink_group"
+    autoload :InsetSpacing, "idml/elements/inset_spacing"
     autoload :MojikumiTable, "idml/elements/mojikumi_table"
     autoload :MojikumiTableProperties, "idml/elements/mojikumi_table"
     autoload :OverrideMojikumiAki, "idml/elements/mojikumi_table"

data/lib/idml/render/pipeline.rb

@@ -96,9 +96,6 @@ module Idml
                         position_tracker, condition_filter, style_lookup,
                         page_offset)
         pages = spread.spread.flat_map(&:page)
-        image_refs = ImageCollector.new(writer: writer,
-                                        base_dir: File.dirname(@package.path),
-                                        page_height: DEFAULT_HEIGHT).collect(spread)
         renderer = build_renderer(layer_filter, font_ref_resolver,
                                   font_resource, font_metrics, font_map,
                                   structure, position_tracker, condition_filter,
@@ -108,21 +105,26 @@ module Idml
         pages.each do |page|
           current += 1
           dims = page_dimensions_for(page)
+          image_refs = ImageCollector.new(
+            writer: writer,
+            base_dir: File.dirname(@package.path),
+            page_height: dims[:height],
+          ).collect(spread)
           canvas = writer.add_page(width: dims[:width], height: dims[:height])
           renderer.render(canvas, spread, page_width: dims[:width],
                                           page_height: dims[:height],
                                           image_refs: image_refs,
                                           page_index: current)
-          emit_hyperlinks(writer, spread, current, layer_filter,
-                          position_tracker)
+          emit_hyperlinks(writer, spread, current, dims[:height],
+                          layer_filter, position_tracker)
         end
         current
       end
 
-      def emit_hyperlinks(writer, spread, page_index, layer_filter,
-                          position_tracker)
+      def emit_hyperlinks(writer, spread, page_index, page_height,
+                          layer_filter, position_tracker)
         HyperlinkEmitter.new(writer: writer, package: @package,
-                             page_height: DEFAULT_HEIGHT,
+                             page_height: page_height,
                              layer_filter: layer_filter,
                              position_tracker: position_tracker)
           .emit_for(spread, page_index)

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

@@ -244,20 +244,40 @@ module Idml
         # back to 0 when the preference is absent or doesn't declare
         # them.
         def self.layout_frame(frame_item, box)
-          pref = frame_item.text_frame_preference&.first
+          top, right, bottom, left = frame_insets(
+            frame_item.text_frame_preference&.first,
+          )
           TextEngine::Frame.new(
             x: box[:x],
             y: box[:y],
             width: box[:width],
             height: box[:height],
-            inset_top: pref&.inset_top,
-            inset_bottom: pref&.inset_bottom,
-            inset_left: pref&.inset_left,
-            inset_right: pref&.inset_right,
+            inset_top: top,
+            inset_bottom: bottom,
+            inset_left: left,
+            inset_right: right,
           )
         end
         private_class_method :layout_frame
 
+        # Insets from Properties > InsetSpacing (spec examples
+        # 31/32): one unit value applies to all sides; a list
+        # carries [top, right, bottom, left]. Missing sides are 0.
+        def self.frame_insets(pref)
+          props = pref&.properties
+          spacing = props.first&.inset_spacing if props
+          return Array.new(4, 0.0) unless spacing
+
+          side_or_zero(spacing)
+        end
+
+        def self.side_or_zero(spacing)
+          [0, 1, 2, 3].map do |index|
+            spacing.sides[index] || 0.0
+          end
+        end
+        private_class_method :frame_insets
+
         # Walks the chain state's paragraphs/runs and emits one
         # `canvas.text` per line via the Shaper → LineBreaker →
         # Justifier → VerticalLayout pipeline. Cursor y descends

data/lib/idml/render/text_wrap_resolver.rb

@@ -159,28 +159,6 @@ module Idml
       end
       private :interval_side_adjustment
 
-      # Returns the total horizontal overlap of all contours with a
-      # text line at the given y range within the given x range.
-      # Sum, not max — multiple overlapping contours compound.
-      # Returns 0.0 when there's no overlap. Inverse contours
-      # reduce by the frame width minus their own width (text may
-      # only flow inside).
-      def overlap_width(line_y, line_height, frame_x, frame_right)
-        @contours.sum do |contour|
-          width = if contour.is_a?(WrapContour::Shape)
-                    WrapContour.overlap_width(contour, line_y,
-                                              line_height, frame_x,
-                                              frame_right)
-                  else
-                    line_overlap(contour, line_y, line_height,
-                                 frame_x, frame_right)[:width]
-                  end
-          next width unless contour.inverse
-
-          (frame_right - frame_x) - width
-        end
-      end
-
       # The wrap shape for an item: a bounding-box rectangle
       # (BoundingBoxTextWrap — the legacy "BoundingBox" spelling is
       # also accepted from early synthetic fixtures) or a flattened
@@ -250,13 +228,6 @@ module Idml
       end
       private_class_method :contour_mode?
 
-      def line_overlap(contour, line_y, line_height, frame_x, frame_right)
-        return { width: 0.0 } unless y_overlap?(contour, line_y, line_height)
-        return { width: 0.0 } unless x_overlap?(contour, frame_x, frame_right)
-
-        { width: x_overlap_width(contour, frame_x, frame_right) }
-      end
-
       def y_overlap?(contour, line_y, line_height)
         line_top = line_y + line_height
         line_bottom = line_y

data/lib/idml/schema/rnc.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Idml
+  module Schema
+    # Parses RelaxNG Compact element definitions into data:
+    # element name → wire attribute names. Handles the Adobe
+    # package schemas' shape (`NAME_Object = element Name { ... }`
+    # with balanced braces; attributes as `attribute X { type }`).
+    # Two consumers over this seam: the class generator script and
+    # the schema-conformance spec.
+    module Rnc
+      ELEMENT_DEF = /(\w+)\s*+=\s*+element\s*+([\w:]+)\s*+\{/
+      ATTRIBUTE_DEF = /attribute\s++(\w+)\s*+\{([^}]*)\}/
+
+      module_function
+
+      # { "Story" => [["Self", ...]], ... } for every element
+      # definition across the given RNC files. An element defined
+      # in several files keeps each definition as an alternative
+      # (array of attribute-name arrays) — a class conforms when
+      # its wire attributes equal ANY one alternative.
+      def element_attribute_map(paths)
+        definitions = Hash.new { |h, k| h[k] = [] }
+        each_element(paths) do |element_name, body|
+          definitions[element_name] << body_attributes(body)
+        end
+        definitions.to_h
+      end
+
+      # [xml_element_name, attrs_with_types] for one named
+      # definition (`Story_Object`) in one file; nil when absent.
+      # attrs_with_types: [["Self", "xsd:string"], ...].
+      def element_definition(path, definition_name)
+        src = File.read(path)
+        prefix = /#{Regexp.escape(definition_name)}\s*=\s*element\s+/
+        pattern = /#{prefix}([\w:]+)\s*\{/
+        match = src.match(pattern)
+        return nil unless match
+
+        body = balanced_body(src, match.end(0))
+        return nil unless body
+
+        attrs_with_types = body.scan(ATTRIBUTE_DEF)
+          .map { |name, type| [name, type.strip] }
+        [match[1], attrs_with_types]
+      end
+
+      def body_attributes(body)
+        body.scan(ATTRIBUTE_DEF).map(&:first).uniq
+      end
+
+      def each_element(paths, &block)
+        paths.each do |path|
+          scan_file(path, &block)
+        end
+      end
+
+      def scan_file(path)
+        src = File.read(path)
+        src.scan(ELEMENT_DEF) do
+          match = Regexp.last_match
+          body = balanced_body(src, match.end(0))
+          next unless body
+
+          element_name = match[2].sub(/^idPkg:/, "")
+          yield(element_name, body)
+        end
+      end
+
+      # The balanced-brace body starting just after `from` (which
+      # points past the opening brace); nil when unterminated.
+      def balanced_body(src, from)
+        depth = 1
+        i = from
+        while i < src.length && depth.positive?
+          case src[i]
+          when "{" then depth += 1
+          when "}" then depth -= 1
+          end
+          i += 1
+        end
+        return nil if depth.positive?
+
+        src[from...(i - 1)]
+      end
+    end
+  end
+end

data/lib/idml/schema.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Idml
+  # Namespace for adapters over the committed RelaxNG Compact
+  # schemas (`reference-docs/schemas/`). The RNC files are the
+  # authoritative interface of the Elements layer — this namespace
+  # turns them into data for the generator script and the
+  # conformance spec (two consumers, one seam).
+  module Schema
+    autoload :Rnc, "#{__dir__}/schema/rnc"
+  end
+end

data/lib/idml/version.rb

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

data/lib/idml.rb

@@ -18,6 +18,7 @@ module Idml
   autoload :Validation,         "#{__dir__}/idml/validation"
   autoload :Composition,        "#{__dir__}/idml/composition"
   autoload :Geometry,           "#{__dir__}/idml/geometry"
+  autoload :Schema,             "#{__dir__}/idml/schema"
   autoload :TextEngine,         "#{__dir__}/idml/text_engine"
   autoload :Render,             "#{__dir__}/idml/render"
   autoload :CLI,                "#{__dir__}/idml/cli"

data/scripts/rnc_to_lutaml.rb

@@ -10,21 +10,11 @@
 # Example:
 #   scripts/rnc_to_lutaml.rb reference-docs/schemas/package/Stories/Story.rnc Story_Object
 #
-# The script reads the named element definition (e.g.,
-# `Story_Object = element Story { ... }`), extracts every `attribute
-# Name { Type }?` line, and prints Ruby code suitable for pasting
-# into a Lutaml::Model::Serializable subclass.
-#
-# Generated output:
-#   attribute :self_attr, :string
-#   attribute :first_line_indent, :float
-#   # ... etc.
-#   xml do
-#     map_attribute "Self", to: :self_attr
-#     map_attribute "FirstLineIndent", to: :first_line_indent
-#   end
+# RNC parsing lives in Idml::Schema::Rnc (shared with the
+# schema-conformance spec); this script owns presentation only.
 
-require "strscan"
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+require "idml"
 
 RESERVED_RUBY_NAMES = %w[self class integer float string end do begin ensure
                          rescue retry next return break yield nil true false].freeze
@@ -56,59 +46,25 @@ def ruby_attr_name(xml_name)
   base
 end
 
-def extract_element(rnc_path, element_name)
-  src = File.read(rnc_path)
-  pattern = /#{Regexp.escape(element_name)}\s*=\s*element\s+([\w:]+)\s*\{/
-  match = src.match(pattern)
-  abort "#{element_name} not found in #{rnc_path}" unless match
-
-  xml_element_name = match[1]
-  start_pos = match.end(0)
-
-  # Walk the brace structure to find the matching close.
-  depth = 1
-  i = start_pos
-  while i < src.length && depth.positive?
-    case src[i]
-    when "{" then depth += 1
-    when "}" then depth -= 1
-    end
-    i += 1
-  end
-  body = src[start_pos...(i - 1)]
-
-  [xml_element_name, body]
-end
-
-def extract_attributes(body)
-  attrs = []
-  body.scan(/^\s*attribute\s+(\w+)\s*\{\s*([^}]+)\}/) do |name, type|
-    attrs << [name, type.strip]
-  end
-  attrs
-end
-
 rnc_path, element_name = ARGV
 abort "usage: #{$PROGRAM_NAME} <rnc-file> <ElementName>" unless rnc_path && element_name
 
-xml_root, body = extract_element(rnc_path, element_name)
-attrs = extract_attributes(body)
+xml_root, attrs = Idml::Schema::Rnc.element_definition(rnc_path, element_name)
+abort "#{element_name} not found in #{rnc_path}" unless xml_root
 
 puts "# xml root: <#{xml_root}>"
 puts "# source: #{rnc_path} (#{element_name})"
 puts "# #{attrs.length} attributes"
 puts
-puts "attribute :_placeholder_, :string # remove me"
-puts
-puts "xml do"
-puts "  root \"#{xml_root.sub(/^idPkg:/, '')}\""
-attrs.each do |name, _type| # rubocop:disable Style/HashEachMethods
-  puts %(  map_attribute "#{name}", to: :#{ruby_attr_name(name)}")
-end
-puts "end"
-puts
 puts "# attribute declarations:"
 attrs.each do |name, type|
   lutaml = lutaml_type(type.split(/\s/).first)
   puts "attribute :#{ruby_attr_name(name)}, :#{lutaml}"
 end
+puts
+puts "xml do"
+puts %(  root "#{xml_root.sub(/^idPkg:/, '')}")
+attrs.each do |name, _type| # rubocop:disable Style/HashEachMethods
+  puts %(  map_attribute "#{name}", to: :#{ruby_attr_name(name)})
+end
+puts "end"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idml
 version: !ruby/object:Gem::Version
-  version: 0.10.11
+  version: 0.10.13
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-29 00:00:00.000000000 Z
+date: 2026-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -214,6 +214,8 @@ files:
 - TODO.pdf/148-architecture-improvements.md
 - TODO.pdf/149-architecture-round-two.md
 - TODO.pdf/15-wire-spread-children.md
+- TODO.pdf/150-architecture-round-three.md
+- TODO.pdf/151-schema-conformance.md
 - TODO.pdf/16-typed-model-pipeline.md
 - TODO.pdf/17-shape-rendering.md
 - TODO.pdf/18-text-rendering.md
@@ -351,6 +353,7 @@ files:
 - lib/idml/elements/ink.rb
 - lib/idml/elements/inner_glow_setting.rb
 - lib/idml/elements/inner_shadow_setting.rb
+- lib/idml/elements/inset_spacing.rb
 - lib/idml/elements/layer.rb
 - lib/idml/elements/link.rb
 - lib/idml/elements/master_spread_object.rb
@@ -526,6 +529,8 @@ files:
 - lib/idml/render/style_resolver.rb
 - lib/idml/render/text_wrap_resolver.rb
 - lib/idml/render/wrap_contour.rb
+- lib/idml/schema.rb
+- lib/idml/schema/rnc.rb
 - lib/idml/text_engine.rb
 - lib/idml/text_engine/cjk_layout.rb
 - lib/idml/text_engine/justifier.rb