idml 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66e6127aeed8e54926e01cacb67c81445565c1e43a558015fd9740e022c12372
-  data.tar.gz: 20b6dcdef5ee316ca394a2b062ed0dac2db9137e08e28f7649944623420e3938
+  metadata.gz: a713a0a63c6af7b6090c9a6260467db40ee9a7c497f37561dccf2526ceadaa71
+  data.tar.gz: a6695a7318b96ed6664e15b9e2a99e40d2da6ef05139154ba7ccfab73e3eeecf
 SHA512:
-  metadata.gz: 94180fd8ac2231198178f40f2051d4e1bd9c56d917cd271808fc87f7de66746739c4ecad65e23f6bbb57be539f061ff5ef9abfda56e71a2bb23ddc403ac3d9a5
-  data.tar.gz: 353fcc512f92ed689fc1e41cabf4fe9310bcb5ce0464be24b0be6a452c1559f860201c7132318bb3fd4be9c510eed63ebb98f056b927b9e781bffcfc2123f632
+  metadata.gz: 92e8aff4adbb8935c2e3ec7b7ead236458ec2f7171a2923eee9de63b4b4f0ed96d95f7f39c9c184d97643b0aa9096e3aa1b40e890610e82d514bb36b17c6f14b
+  data.tar.gz: 88c470bb2d55962f57a950fe6c1ef526d34ce36d7fafe38ed045d4f7019821586a9045d1f027e28eb304a1d0a57da9f157256603a83e48e873decd3f2620554c

data/TODO.pdf/115-bullet-numbered-lists.md

@@ -1,6 +1,9 @@
 # TODO PDF 115: Bullet and numbered list rendering
 
-## Status: OPEN — gap identified in 2026-08-10 audit
+## Status: DONE for inline marker emission. Hanging-indent layout
+(bullet in a left gutter with wrapped lines indented to align with
+text after marker) is a follow-up — currently the marker sits inline
+before the first run's text.
 
 ## Problem
 

data/TODO.pdf/116-applied-style-resolution.md

@@ -0,0 +1,62 @@
+# TODO PDF 116: AppliedParagraphStyle / AppliedCharacterStyle resolution from Resources/Styles.xml
+
+## Status: OPEN — critical gap identified in 2026-08-10 audit
+
+## Problem
+
+In real IDML documents, the `<ParagraphStyleRange>` element often
+carries ONLY an `AppliedParagraphStyle` reference and NO inline
+formatting attributes. The actual formatting (Justification,
+SpaceBefore, PointSize, etc.) lives in the referenced
+`<ParagraphStyle>` definition in `Resources/Styles.xml`.
+
+Example from the sample-with-table-more fixture:
+```xml
+<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/$ID/NormalParagraphStyle">
+  <CharacterStyleRange AppliedCharacterStyle="CharacterStyle/$ID/[No character style]">
+    ...
+  </CharacterStyleRange>
+</ParagraphStyleRange>
+```
+
+The PSR has NO inline Justification, SpaceBefore, etc. Those values
+are on `ParagraphStyle Self="ParagraphStyle/$ID/NormalParagraphStyle"`
+in Styles.xml.
+
+Today StyleResolver reads attributes directly from the PSR element.
+When the PSR has only a style reference (common in real documents),
+the renderer uses default values for everything.
+
+## Impact
+
+For the `sample-with-table-more` fixture, every PSR uses
+`NormalParagraphStyle` — which in InDesign maps to 12pt Regular with
+left alignment. The renderer happens to produce approximately right
+output because the defaults match. But for documents that use custom
+paragraph styles (Heading 1 = 24pt Bold Centered, Body Text = 11pt
+Justified with 6pt SpaceAfter), the output would be wrong.
+
+## What needs to happen
+
+1. `Render::StyleResolver` resolves `AppliedParagraphStyle` to a
+   `ParagraphStyle` from `Parts::Style` (Resources/Styles.xml).
+2. PSR inline attributes override the style's attributes (when both
+   are present — this is the IDML "local override" mechanism).
+3. Same for `AppliedCharacterStyle` → `CharacterStyle` resolution.
+4. The merged attributes become the Paragraph/StyledRun's values.
+
+Architecture: `Parts::Style` already parses `<ParagraphStyle>` and
+`<CharacterStyle>` entries. StyleResolver needs access to the style
+part (via `context.package.styles` or similar).
+
+## Acceptance criteria
+
+- [ ] PSR with only AppliedParagraphStyle resolves formatting from
+      the referenced ParagraphStyle.
+- [ ] PSR inline attributes override style attributes.
+- [ ] CharacterStyle resolution for CSR's AppliedCharacterStyle.
+- [ ] Spec: fixture with custom paragraph style renders correctly.
+
+## Dependencies
+
+- None — pure feature work on existing models.

data/TODO.pdf/99-table-column-widths.md

@@ -1,10 +1,10 @@
-# TODO PDF 99: Table column widths from ColumnAttributes
+# TODO PDF 99: Table column widths from Column elements
 
-## Status: DONE — Table now models `column_count` and
-`single_column_width`; SchemaLayout uses SingleColumnWidth when
-declared, else falls back to even division. (IDML has no separate
-ColumnAttributes element — column widths live on Table directly
-when uniform.)
+## Status: DONE — Table now models both `single_column_width`
+(uniform) and per-column `<Column>` elements with individual
+`SingleColumnWidth` values. SchemaLayout uses per-column widths
+when `<Column>` children are present; falls back to uniform when
+not.
 
 ## Problem
 

data/lib/idml/elements/column.rb

@@ -0,0 +1,45 @@
+# frozen_string: true
+
+module Idml
+  module Elements
+    # `<Column>` — a column definition within an IDML Table. Carries
+    # the column's width (SingleColumnWidth), type (HeaderColumn /
+    # BodyColumn), insets, and visual properties (fill, diagonal lines).
+    #
+    # Schema: `Column_Object` in
+    # `reference-docs/schemas/package/Stories/Story.rnc`. Real IDML
+    # tables have `<Column>` children alongside `<Row>` and `<Cell>`
+    # siblings. The `Name` attribute is the column index as a string
+    # (e.g., "0", "1", "2").
+    #
+    # The renderer's SchemaLayout reads `SingleColumnWidth` per column
+    # to compute per-column x positions and widths (replaces the
+    # even-division / uniform-width fallback).
+    class Column < Lutaml::Model::Serializable
+      attribute :self_attr, :string
+      attribute :name, :string
+      attribute :single_column_width, :float
+      attribute :column_type, :string
+      attribute :fill_color, :string
+      attribute :fill_tint, :float
+
+      xml do
+        root "Column"
+        map_attribute "Self", to: :self_attr
+        map_attribute "Name", to: :name
+        map_attribute "SingleColumnWidth", to: :single_column_width
+        map_attribute "ColumnType", to: :column_type
+        map_attribute "FillColor", to: :fill_color
+        map_attribute "FillTint", to: :fill_tint
+      end
+
+      # Column Name is a string integer (e.g., "0", "1").
+      # Returns the integer index or nil if Name is missing/invalid.
+      def index
+        return nil unless name
+
+        Integer(name, 10, exception: false) # rubocop:disable Style/RescueModifier
+      end
+    end
+  end
+end

data/lib/idml/elements/table.rb

@@ -46,6 +46,7 @@ module Idml
       attribute :table_row, Idml::Elements::TableRow, collection: true
       attribute :cell, Idml::Elements::Cell, collection: true
       attribute :row, Idml::Elements::Row, collection: true
+      attribute :column, Idml::Elements::Column, collection: true
       attribute :properties, Idml::Elements::Properties, collection: true
 
       xml do
@@ -77,6 +78,7 @@ module Idml
         map_element "TableRow", to: :table_row
         map_element "Cell", to: :cell
         map_element "Row", to: :row
+        map_element "Column", to: :column
         map_element "Properties", to: :properties
       end
 

data/lib/idml/elements.rb

@@ -17,6 +17,7 @@ module Idml
     autoload :ButtonPreference, "idml/elements/pref_button_preference"
     autoload :Bookmark, "idml/elements/bookmark"
     autoload :Cell, "idml/elements/cell"
+    autoload :Column, "idml/elements/column"
     autoload :Condition, "idml/elements/condition"
     autoload :CellStyle, "idml/elements/cell_style"
     autoload :CellStyleGroup, "idml/elements/cell_style_group"

data/lib/idml/render/list_marker.rb

@@ -0,0 +1,63 @@
+# frozen_string: true
+
+module Idml
+  module Render
+    # Produces a list-marker string for a paragraph (bullet glyph or
+    # numbered-list expression). IDML stores the resolved marker
+    # directly on the PSR (BulletCharacterValue as a Unicode codepoint,
+    # NumberingExpression as the rendered text), so the renderer
+    # doesn't need to maintain its own counter.
+    #
+    # Used by `StyleResolver` to prepend the marker to the paragraph's
+    # first run's text. The marker becomes part of the run's natural
+    # text flow — no special positioning needed for MVP.
+    #
+    # Hanging-indent layout (bullet aligned in a left gutter with
+    # wrapped lines indented to align with text after the marker) is
+    # a follow-up; for now the marker sits inline before the text.
+    module ListMarker
+      DEFAULT_BULLET = "•".freeze # BULLET
+      DEFAULT_TEXT_AFTER = "\t".freeze
+
+      # Returns the marker string for the paragraph, or nil when the
+      # paragraph isn't part of a list.
+      def self.marker_for(paragraph)
+        return nil unless paragraph
+
+        case paragraph.bullets_and_numbering_list_type
+        when "BulletList" then bullet_marker(paragraph)
+        when "NumberedList" then numbered_marker(paragraph)
+        end
+      end
+
+      def self.bullet_marker(paragraph)
+        bullet = bullet_char(paragraph)
+        suffix = text_after(paragraph)
+        "#{bullet}#{suffix}"
+      end
+      private_class_method :bullet_marker
+
+      def self.numbered_marker(paragraph)
+        expr = paragraph.numbering_expression
+        return nil if expr.nil? || expr.empty?
+
+        suffix = text_after(paragraph)
+        "#{expr}#{suffix}"
+      end
+      private_class_method :numbered_marker
+
+      def self.bullet_char(paragraph)
+        codepoint = paragraph.bullet_character_value
+        return DEFAULT_BULLET unless codepoint&.positive?
+
+        [codepoint].pack("U")
+      end
+      private_class_method :bullet_char
+
+      def self.text_after(paragraph)
+        paragraph.bullets_text_after || DEFAULT_TEXT_AFTER
+      end
+      private_class_method :text_after
+    end
+  end
+end

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

@@ -243,7 +243,8 @@ module Idml
                 mark_covered(covered, col_idx, row_idx, col_span, row_span)
 
                 yield cell_x(col_idx), cell_y(row_idx, col_span, row_span),
-                      cell_w(col_span), cell_h(row_idx, row_span), cell
+                      cell_w(col_idx, col_span), cell_h(row_idx, row_span),
+                      cell
               end
             end
           end
@@ -286,7 +287,7 @@ module Idml
           private :mark_covered
 
           def cell_x(col)
-            box[:x] + (col * per_col_width)
+            box[:x] + cumulative_col_width(col)
           end
 
           # PDF-coordinate bottom y of the cell's rectangle. For a
@@ -297,9 +298,11 @@ module Idml
             box[:y] + total_height - cumulative_height(last_row + 1)
           end
 
-          # Width covered by `span` columns starting at the cell's col.
-          def cell_w(span)
-            per_col_width * (span || 1)
+          # Width covered by `span` columns starting at `col`. Uses
+          # per-column widths from Column elements when available;
+          # falls back to uniform width when not.
+          def cell_w(col, span)
+            span.to_i.times.sum { |i| column_width_at(col + i) }
           end
 
           # Total height covered by `span` rows starting at `row_idx`.
@@ -318,6 +321,41 @@ module Idml
                              end
           end
 
+          # Returns per-column widths from Column elements when
+          # present; empty array otherwise. When non-empty, the
+          # renderer uses per-column widths for x positions and
+          # span widths instead of uniform per_col_width.
+          def per_column_widths
+            return @per_column_widths if defined?(@per_column_widths)
+
+            cols = table.column
+            @per_column_widths = if cols.empty?
+                                   []
+                                 else
+                                   cols.filter_map do |col|
+                                     w = col.single_column_width
+                                     w&.positive? ? w : nil
+                                   end
+                                 end
+          end
+
+          # Width of a single column at index `idx`. Uses per-column
+          # widths when available; falls back to uniform.
+          def column_width_at(idx)
+            return per_col_width if per_column_widths.empty?
+            return per_col_width unless idx.between?(0, per_column_widths.length - 1)
+
+            per_column_widths[idx]
+          end
+
+          # Cumulative width from column 0 up to (but not including)
+          # column `col`. Used for x positioning.
+          def cumulative_col_width(col)
+            return col * per_col_width if per_column_widths.empty?
+
+            col.times.sum { |i| column_width_at(i) }
+          end
+
           def row_height(idx)
             return 0.0 unless idx.between?(0, row_count - 1)
 

data/lib/idml/render/style_resolver.rb

@@ -55,6 +55,10 @@ module Idml
         :right_indent,
         :auto_leading,
         :drop_cap_lines,
+        :bullets_and_numbering_list_type,
+        :bullet_character_value,
+        :bullets_text_after,
+        :numbering_expression,
         :drop_cap_characters,
         # RuleAbove / RuleBelow — paragraph rules (horizontal lines
         # above/below the paragraph block). Driven by PSR attributes.
@@ -115,7 +119,7 @@ module Idml
           runs = csr_runs(psr, condition_filter: condition_filter)
           next if runs.empty?
 
-          Paragraph.new(
+          paragraph = Paragraph.new(
             runs: runs,
             alignment: runs.first.alignment,
             space_before: psr.space_before,
@@ -126,6 +130,10 @@ module Idml
             auto_leading: psr.auto_leading,
             drop_cap_lines: psr.drop_cap_lines,
             drop_cap_characters: psr.drop_cap_characters,
+            bullets_and_numbering_list_type: psr.bullets_and_numbering_list_type,
+            bullet_character_value: psr.bullet_character_value,
+            bullets_text_after: psr.bullets_text_after,
+            numbering_expression: psr.numbering_expression,
             rule_above: psr.rule_above,
             rule_above_line_weight: psr.rule_above_line_weight,
             rule_above_color: psr.stroke_color,
@@ -143,6 +151,8 @@ module Idml
             rule_below_right_indent: psr.rule_below_right_indent,
             rule_below_width: psr.rule_below_width,
           )
+          prepend_list_marker(paragraph)
+          paragraph
         end
       end
 
@@ -193,6 +203,19 @@ module Idml
       end
       private_class_method :alignment_for
 
+      # Prepends the list marker (bullet glyph or numbered expression)
+      # to the paragraph's first run when the paragraph is part of
+      # a list. Mutates the first run's text in place.
+      def self.prepend_list_marker(paragraph)
+        marker = ListMarker.marker_for(paragraph)
+        return unless marker
+        return if paragraph.runs.empty?
+
+        first_run = paragraph.runs.first
+        first_run.text = "#{marker}#{first_run.text}"
+      end
+      private_class_method :prepend_list_marker
+
       # Concatenate runs into a single block. Used when the renderer
       # can't handle per-run styling (e.g., no font metrics available).
       def self.concatenate(runs)

data/lib/idml/render.rb

@@ -16,6 +16,7 @@ module Idml
     autoload :CharacterStyle,      "#{__dir__}/render/character_style"
     autoload :ParagraphRules,      "#{__dir__}/render/paragraph_rules"
     autoload :DropCap,             "#{__dir__}/render/drop_cap"
+    autoload :ListMarker,          "#{__dir__}/render/list_marker"
     autoload :StoryChainController, "#{__dir__}/render/story_chain_controller"
     autoload :LayerFilter,         "#{__dir__}/render/layer_filter"
     autoload :ConditionFilter,     "#{__dir__}/render/condition_filter"

data/lib/idml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idml
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Ribose
@@ -172,6 +172,7 @@ files:
 - TODO.pdf/113-multi-column-text-frames.md
 - TODO.pdf/114-text-wrap-around-shapes.md
 - TODO.pdf/115-bullet-numbered-lists.md
+- TODO.pdf/116-applied-style-resolution.md
 - TODO.pdf/12-idml-to-pdf-pipeline.md
 - TODO.pdf/13-cjk-text-layout.md
 - TODO.pdf/14-page-item-element-models.md
@@ -280,6 +281,7 @@ files:
 - lib/idml/elements/character_style_group.rb
 - lib/idml/elements/character_style_range.rb
 - lib/idml/elements/color.rb
+- lib/idml/elements/column.rb
 - lib/idml/elements/condition.rb
 - lib/idml/elements/content.rb
 - lib/idml/elements/content_transparency_setting.rb
@@ -444,6 +446,7 @@ files:
 - lib/idml/render/image.rb
 - lib/idml/render/image_collector.rb
 - lib/idml/render/layer_filter.rb
+- lib/idml/render/list_marker.rb
 - lib/idml/render/metadata_builder.rb
 - lib/idml/render/page_item_renderer.rb
 - lib/idml/render/paragraph_rules.rb