idml 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73b6eace594144002b5d513bb823512ff44a018e90dffb83188167674e839975
-  data.tar.gz: bcdebe8d9ba4c525d0b9f0bb0c47e10dcb08edb15d22c145031bb0cdbb796b7d
+  metadata.gz: 64f0fb65e931a0ba911043cdc0a885dab5d79257519b519896c07f8a8de9cc14
+  data.tar.gz: c25ece7b2f8d61ee13e7e572a3e4089cda665f307e20831a7a46cfa7c7c2ff52
 SHA512:
-  metadata.gz: d9637751e91a71db94cc5ab3ede0843eecde0aa35323a128309d21a4e4c3c0c7c88f08e887d7b9d67a081454747e14d85954b43b9e0e3429325f9e39c1bf0b17
-  data.tar.gz: d92faf74e08e0f82c9c4265ea0f1532a7d73c25b4195c992a984eedce7625f7cac1d51c367bb35fbcfa7563c77d701e0f7134438aea5bd3d0d2a359a47d1e639
+  metadata.gz: e2113e93725afbf9d5c025b1d0b50d698b4bd0ef47815f7fda87a703e007627b769bbb1118b924ce6d932cf78aff23877d20de303b60f3a9df1cd51f53947849
+  data.tar.gz: 856b9aa6fad47550fd6da61a1ebbc348be2752cde9eb5a1a165beadfd8b16c5d2ed763d0b5af68af6252b2631561b1c521200cadae00bfdafb0a15a0807d702e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    idml (0.4.5)
+    idml (0.4.6)
       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.5)
+  idml (0.4.6)
   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

@@ -1,35 +1,62 @@
 # TODO PDF 84: Schema-faithful Table/Cell/Row structure
 
-## Status: PARTIAL — Cell and Row elements added; full restructure deferred
+## Status: DONE — schema-faithful model validated against real fixture
 
-## What was added
+## What was done
 
-Schema-faithful element classes alongside the legacy non-standard
-ones, so existing fixtures continue to work:
+Schema-faithful element classes match the real IDML structure
+(validated against `spec/fixtures/sample-with-table-more/`):
 
 - **`Elements::Cell`** — matches `Cell_Object` RNC. Captures Self,
-  Name, RowSpan, ColumnSpan, insets, FillColor, FillTint,
-  VerticalJustification, and inline `CharacterStyleRange` children.
-  `text_content` walks inline CSRs. `col_row` decodes the
-  `"col_row"` Name format.
+  Name (col:row encoding like "0:0"), RowSpan, ColumnSpan,
+  ColumnType, CellType, TextTopInset/TextLeftInset/etc.,
+  FillColor, FillTint, VerticalJustification, AppliedCellStyle,
+  and inline `ParagraphStyleRange` children. `text_content` walks
+  inline PSRs. `col_row` decodes the `"col:row"` Name format.
 - **`Elements::Row`** — matches `Row_Object` RNC. Captures Self,
-  Name, insets, FillColor, height constraints.
-- **`Elements::Table`** now declares `cell` and `row` collections
+  Name (row index), TextTopInset/TextLeftInset/etc., FillColor,
+  SingleRowHeight, MinimumHeight, MaximumHeight.
+- **`Elements::Table`** declares `cell` and `row` collections
   alongside the legacy `table_row`. Both parse correctly from XML.
-
-## What remains deferred
-
-The full schema-faithful refactor — moving Table out of SpreadObject
-(per RNC, Tables live in Stories, not Spreads) and removing the
-legacy `Elements::TableRow`/`TableCell` classes — requires a real
-IDML fixture with tables to validate.
-
-Until then:
-- The legacy `Table > TableRow > TableCell` path handles the
-  existing synthetic test fixture.
-- The schema-faithful `Table > {Cell, Row}` path is available for
-  future fixtures.
-- `TableRenderer` still uses the legacy path.
+- **`Elements::CharacterStyleRange`** now has a `table` collection
+  so CSR > Table > {Cell, Row} parses end-to-end (per RNC, Tables
+  appear inside CSRs in Stories, not in Spreads).
+
+## Real-fixture validation
+
+`spec/fixtures/sample-with-table-more/sample-with-table-more.idml`
+is a 3-spread IDML with a single Table in `Story_u1b7`:
+
+- Table Self=`u1b7i1cc`, 9 Row children, 83 Cell children.
+- First cell Name=`"0:0"`, content=`"H1"` (header).
+- Cell Name increments col within a row (`"0:0"`, `"1:0"`, `"2:0"`).
+
+`spec/idml/fixtures/sample_with_table_more_spec.rb` covers:
+- Package structure (3 spreads, 10 stories).
+- Table discovery via story → PSR → CSR > Table.
+- Table Self, row count, cell count.
+- Row Self pattern (Table Self + `Row<N>`).
+- Cell Name format and col_row decoding.
+- Cell text_content from inline PSR > CSR > Content.
+- Cell column_type (HeaderColumn).
+- End-to-end PDF render.
+
+## Legacy preserved
+
+The existing `Elements::Table`/`TableRow`/`TableCell` classes
+(synthetic, non-schema-faithful) remain for the existing synthetic
+`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).
 
 ## Current state vs schema
 

data/lib/idml/elements/cell.rb

@@ -13,13 +13,16 @@ module Idml
     # existing synthetic test fixture — see TODO 84.
     #
     # The cell's `Name` attribute encodes its column/row position
-    # (e.g., `"0_0"` for column 0, row 0). Carries text content via
-    # inline `<CharacterStyleRange>` children.
+    # as `"col:row"` (e.g., `"0:0"`, `"1:2"`). Carries text content
+    # via inline `<ParagraphStyleRange>` → `<CharacterStyleRange>`
+    # → `<Content>` children, the same structure as a Story.
     class Cell < Lutaml::Model::Serializable
       attribute :self_attr, :string
       attribute :name, :string
       attribute :row_span, :integer
       attribute :column_span, :integer
+      attribute :column_type, :string
+      attribute :cell_type, :string
       attribute :top_inset, :float
       attribute :left_inset, :float
       attribute :bottom_inset, :float
@@ -31,7 +34,8 @@ module Idml
       attribute :vertical_justification, :string
       attribute :paragraph_spacing_limit, :float
       attribute :rotation_angle, :float
-      attribute :character_style_range, Idml::Elements::CharacterStyleRange,
+      attribute :applied_cell_style, :string
+      attribute :paragraph_style_range, Idml::Elements::ParagraphStyleRange,
                 collection: true
 
       xml do
@@ -40,30 +44,33 @@ module Idml
         map_attribute "Name", to: :name
         map_attribute "RowSpan", to: :row_span
         map_attribute "ColumnSpan", to: :column_span
-        map_attribute "TopInset", to: :top_inset
-        map_attribute "LeftInset", to: :left_inset
-        map_attribute "BottomInset", to: :bottom_inset
-        map_attribute "RightInset", to: :right_inset
+        map_attribute "ColumnType", to: :column_type
+        map_attribute "CellType", to: :cell_type
+        map_attribute "TextTopInset", to: :top_inset
+        map_attribute "TextLeftInset", to: :left_inset
+        map_attribute "TextBottomInset", to: :bottom_inset
+        map_attribute "TextRightInset", to: :right_inset
         map_attribute "FillColor", to: :fill_color
         map_attribute "FillTint", to: :fill_tint
         map_attribute "OverprintFill", to: :overprint_fill
-        map_attribute "ClipContentToCell", to: :clip_content_to_cell
+        map_attribute "ClipContentToTextCell", to: :clip_content_to_cell
         map_attribute "VerticalJustification", to: :vertical_justification
         map_attribute "ParagraphSpacingLimit", to: :paragraph_spacing_limit
         map_attribute "RotationAngle", to: :rotation_angle
-        map_element "CharacterStyleRange", to: :character_style_range
+        map_attribute "AppliedCellStyle", to: :applied_cell_style
+        map_element "ParagraphStyleRange", to: :paragraph_style_range
       end
 
       def text_content
-        character_style_range.filter_map(&:text_content).join
+        paragraph_style_range.filter_map(&:text_content).join
       end
 
-      # Cell name format is "column_row" (e.g., "0_0", "1_2").
+      # Cell name format is "col:row" (e.g., "0:0", "1:2").
       # Returns [col, row] integers or nil if Name is malformed.
       def col_row
         return nil unless name
 
-        parts = name.split("_")
+        parts = name.split(":")
         return nil unless parts.length == 2
 
         [parts[0].to_i, parts[1].to_i]

data/lib/idml/elements/character_style_range.rb

@@ -298,6 +298,7 @@ module Idml
       attribute :content, Idml::Elements::Content, collection: true
       attribute :hyperlink_text_source, Idml::Elements::HyperlinkTextSource,
                 collection: true
+      attribute :table, Idml::Elements::Table, collection: true
       attribute :xml_element, Idml::Elements::XmlElement, collection: true
 
       xml do
@@ -652,6 +653,7 @@ module Idml
         map_element "CharacterStyleRange", to: :character_style_range
         map_element "Content", to: :content
         map_element "HyperlinkTextSource", to: :hyperlink_text_source
+        map_element "Table", to: :table
         map_element "XMLElement", to: :xml_element
       end
 

data/lib/idml/elements/row.rb

@@ -23,6 +23,7 @@ module Idml
       attribute :fill_color, :string
       attribute :fill_tint, :float
       attribute :overprint_fill, :boolean
+      attribute :clip_content_to_cell, :boolean
       attribute :single_row_height, :float
       attribute :minimum_height, :float
       attribute :maximum_height, :float
@@ -31,13 +32,14 @@ module Idml
         root "Row"
         map_attribute "Self", to: :self_attr
         map_attribute "Name", to: :name
-        map_attribute "TopInset", to: :top_inset
-        map_attribute "LeftInset", to: :left_inset
-        map_attribute "BottomInset", to: :bottom_inset
-        map_attribute "RightInset", to: :right_inset
+        map_attribute "TextTopInset", to: :top_inset
+        map_attribute "TextLeftInset", to: :left_inset
+        map_attribute "TextBottomInset", to: :bottom_inset
+        map_attribute "TextRightInset", to: :right_inset
         map_attribute "FillColor", to: :fill_color
         map_attribute "FillTint", to: :fill_tint
         map_attribute "OverprintFill", to: :overprint_fill
+        map_attribute "ClipContentToTextCell", to: :clip_content_to_cell
         map_attribute "SingleRowHeight", to: :single_row_height
         map_attribute "MinimumHeight", to: :minimum_height
         map_attribute "MaximumHeight", to: :maximum_height

data/lib/idml/version.rb

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

metadata

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