idml 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83554bfc44e2eb23732f64f5283c221965a70823f48db100abdcb953306681e2
-  data.tar.gz: c3a13c6b72cd20fb5280f863db1712c10df2e636adbb777dd0d393a3042fe5cb
+  metadata.gz: bfe99408096a550d69277aae9bf709c0dcb0257f17756fcef498c9ea3982a603
+  data.tar.gz: 83fc58f40dccb82324b6098aab6665765cd0e1a08b12ade7e08f6d600c6e69c3
 SHA512:
-  metadata.gz: 798716bc9426f8ad558255e8cdca0130bc9fbc4df0b982bf052108c8ad985d8512acc478fe420c629a6823e9b474864dd6570942a95db95ecd91277dba60a36a
-  data.tar.gz: c3e14713c820726f1bc07ebbad6186a4f9d5f3e8a163a175f3b2905ca4183be595f5ccadf219647859fa172e754407f11fa137a6cea64074156d209ad3a31d36
+  metadata.gz: 8b9646bd611f3618e6a7c3c689a402b368b231f66f6f06430098f9357179d4b79ae0884058b20c92df03dce6e65aa7cf74c245bb8100a772a9454c37f310b4bd
+  data.tar.gz: 7b639edc906f60c9e82128bf599966cd37e2fb0458e06e62158d14767d2293d918bed5fe75163cd2caa2cb20fed7174a0c18a709ac722a673b9099532e8f5b33

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    idml (0.4.7)
+    idml (0.4.8)
       bigdecimal
       lutaml-model (~> 0.8.18)
       pdfrb
@@ -183,7 +183,7 @@ CHECKSUMS
   ffi (1.17.4-x86_64-darwin) sha256=aa70390523cf3235096cf64962b709b4cfbd5c082a2cb2ae714eb0fe2ccda496
   ffi (1.17.4-x86_64-linux-gnu) sha256=9d3db14c2eae074b382fa9c083fe95aec6e0a1451da249eab096c34002bc752d
   ffi (1.17.4-x86_64-linux-musl) sha256=3fdf9888483de005f8ef8d1cf2d3b20d86626af206cbf780f6a6a12439a9c49e
-  idml (0.4.7)
+  idml (0.4.8)
   json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
   language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87

data/TODO.pdf/84-schema-faithful-table.md

@@ -48,15 +48,21 @@ The existing `Elements::Table`/`TableRow`/`TableCell` classes
 `table_renderer_spec.rb` test. They are not removed because no
 real IDML uses them and removing them would break the existing test.
 
-## Future work
-
-- Migrate `TableRenderer` to use the schema-faithful `cell`/`row`
-  collections instead of legacy `table_row`. The renderer is the
-  last consumer of the legacy structure.
-- Render Tables discovered in Stories (currently only Spread-level
-  tables are dispatched to TableRenderer; CSR-embedded Tables are
-  skipped — they need TextFrameRenderer integration to render in
-  place).
+## What was completed in this round
+
+- `TableRenderer` migrated to auto-detect schema-faithful
+  (`cell`/`row` siblings) vs legacy (`table_row`/`table_cell`
+  nested) layout. New `SchemaLayout` Struct computes per-cell rects
+  from `Row#single_row_height` and `Cell#col_row` max col + 1.
+- `TextFrameRenderer` discovers inline Tables via
+  `Story > PSR > CSR > Table` and renders each within the frame's
+  bounds via `TableRenderer.render_in_box`. This is the path that
+  real IDML fixtures use (Tables live in Stories, not Spreads).
+- New `TableRenderer.render_in_box(canvas, table, box, context)`
+  API accepts caller-supplied bounds (real Tables have no own
+  geometry).
+- The sample-with-table-more fixture's Table now renders 83 cell
+  rectangles end-to-end (verified by spec).
 
 ## Current state vs schema
 

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

@@ -30,6 +30,17 @@ module Idml
           box = Placement.box(table, context.page_height)
           return unless box
 
+          render_in_box(canvas, table, box, context)
+        end
+
+        # Renders a Table using caller-supplied bounds (no
+        # Placement.box lookup). Used by TextFrameRenderer to
+        # render Tables inlined in a story — real IDML Tables
+        # have no own geometry, so the containing TextFrame's
+        # bounds stand in for the Table's bounds.
+        def self.render_in_box(canvas, table, box, context)
+          return if table.visible == false
+
           canvas.save_graphics_state do
             if schema_faithful?(table)
               render_schema_faithful(canvas, table, box, context)

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

@@ -20,13 +20,41 @@ module Idml
           story = context.package&.story_by_id(frame.parent_story)
           return unless story
 
+          box = frame_box(frame, context.page_height)
+          render_inline_tables(canvas, story, box, context)
+
           runs = StyleResolver.extract_runs(story)
           return if runs.empty?
 
-          box = frame_box(frame, context.page_height)
           render_text(canvas, runs, context, box)
         end
 
+        # Discovers Tables inlined in the story (Story > PSR > CSR >
+        # Table — the real IDML structure) and renders each within
+        # the frame's bounds. Real IDML Tables have no own geometry,
+        # so the containing TextFrame's box stands in. Synthetic
+        # spread-level Tables dispatch separately via
+        # PageItemRenderer.
+        def self.render_inline_tables(canvas, story, box, context)
+          tables = tables_in_story(story)
+          return if tables.empty?
+
+          tables.each do |table|
+            TableRenderer.render_in_box(canvas, table, box, context)
+          end
+        end
+        private_class_method :render_inline_tables
+
+        def self.tables_in_story(story)
+          inner = story&.inner
+          return [] unless inner
+
+          inner.paragraph_style_range.flat_map do |psr|
+            psr.character_style_range.flat_map(&:table)
+          end.compact
+        end
+        private_class_method :tables_in_story
+
         def self.render_text(canvas, runs, context, box)
           font = context.font_metrics
           if font

data/lib/idml/version.rb

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

metadata

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