idml 0.10.14 → 0.10.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f5eb099cc78c69be52672e179bc0d2c10b102554bb74b28272b04d0ed904c6
-  data.tar.gz: c7936ca3c76fef90639d532cc70c0deb7423b2dcd9cd3d73ce6b88bff5a1257c
+  metadata.gz: 578a2a0fbd712f1931eaff74db316971441be4a967afd67d47ab55ecdc9679d1
+  data.tar.gz: e93c08f8694da2e0522a787ff0f58b4f607952f7024a0dd0d54bab42599ac8e9
 SHA512:
-  metadata.gz: 354bb00de55fe629d84853a8e1dfdc2c8b821f708fc15584cf9ac509ba3489a56f92f48f71698cfcf9b28c9f3814b4c0366f3a88d40aa3e2e05b33b242e20a60
-  data.tar.gz: 52cc665c20cdf7c8c766593e38fd18b847f15da0ac3a09b1accfd5dbbe2b48614a7eadb5452b8f4b295bff1870c7a2acb1a48a0c03174f15916f681d62c4a16c
+  metadata.gz: 260e3fdbcd2339d2e461aae7f2992b311120a0b15544d48b65c39d915dee9fd0219fcb3ee6d9e07ce40eaeb9bf68846fa72bdf2475d9ce12d1982cdd1503afd5
+  data.tar.gz: 6d760f50d28216bbe1a620aa4ba2b43028ab3051384e0fee559764892f8495b04f5623b2a3ba14698f89cf6bf1e3de9f0426be158e3e7faf0d8d7a3b639e289e

data/TODO.pdf/154-vertical-keep-windows.md

@@ -0,0 +1,21 @@
+# TODO PDF 154: Vertical keep windows
+
+## Status: COMPLETE (approximation) — implemented 2026-09-01
+
+## Problem
+
+KeepFirstLines / KeepLastLines windows (TODO 133) applied only to
+the horizontal engine; vertical paragraphs ignored them.
+
+## Solution
+
+`VerticalEmit`'s pre-placement keep check (TODO 153) also honors
+the windows on the same column-count approximation: a splitting
+paragraph (needed columns > available) defers when fewer than
+KeepFirstLines columns fit, or when the stranded tail would hold
+fewer than KeepLastLines columns.
+
+## Files
+
+- `lib/idml/render/renderers/vertical_emit.rb`
+- `spec/idml/render/vertical_render_spec.rb`

data/TODO.pdf/155-next-column-jump.md

@@ -0,0 +1,29 @@
+# TODO PDF 155: NextColumn column jumping in multi-column frames
+
+## Status: COMPLETE — implemented 2026-09-01
+
+## Problem
+
+NextColumnTextWrap approximated as JumpObject-below (TODO 146):
+in a multi-column frame, InDesign moves the text to the NEXT
+COLUMN, not below the object.
+
+## Solution
+
+The wrap contour carries the mode: `jump` (JumpObjectTextWrap)
+vs `next_column` (NextColumnTextWrap). Both block the full column
+width; the renderer chooses the response —
+`TextFrameRenderer#next_column_jump?` abandons the column when a
+NextColumn contour blocks the run's band in a multi-column frame:
+the cursor drops to the bottom limit mid-run, the unplaced runs
+return to the chain state, and the next column (or frame)
+resumes them. Single-column frames and JumpObject keep the
+skip-below path (`jump_contour_bottom` reports the resume point
+for both flavors).
+
+## Files
+
+- `lib/idml/render/text_wrap_resolver.rb`
+- `lib/idml/render/renderers/text_frame_renderer.rb`
+- `spec/idml/render/text_wrap_resolver_spec.rb`
+- `spec/idml/render/jump_object_render_spec.rb` (end-to-end)

data/TODO.pdf/61-known-limitations.md

@@ -1,6 +1,6 @@
 # TODO PDF 61: Known limitations and future work
 
-## Status: DOCUMENTED — refreshed 2026-08-31
+## Status: DOCUMENTED — refreshed 2026-09-01
 
 Previously listed limitations (font embedding, tagged PDF, per-run
 styling, dead code) were resolved by TODOs 52/53/55/67/76 long ago;
@@ -27,11 +27,10 @@ this list reflects the current state.
   odd/even page parity.
 - **Text wrap**: BoundingBoxTextWrap, Contour, and Inverse modes
   render (TODOs 130-131) with TextWrapSide side-awareness for both
-  box contours and Contour shapes (TODOs 138/147); JumpObject and
-  NextColumn move text below the object (TODOs 143/146) — NextColumn
-  in a MULTI-column frame should jump to the next column instead
-  (chain integration, future); spine variants approximate as
-  BothSides.
+  box contours and Contour shapes (TODOs 138/147); JumpObject moves
+  text below the object (TODO 143); NextColumn jumps to the next
+  column in multi-column frames and below the object otherwise
+  (TODOs 146/155); spine variants approximate as BothSides.
 
 ### CJK
 - **Mojikumi**: script spacing (TODO 125, now actually wired),
@@ -40,9 +39,8 @@ this list reflects the current state.
   Desired applies per class pair) are applied; Minimum/Maximum
   aki bounds and CompressionPriority are parsed but unused.
 - **Vertical mode**: Latin runs rotate as one group per segment
-  (TODO 142); ruby placement is beside-column; KeepAllLines /
-  KeepWithNext apply with a column-count approximation (TODO 153);
-  keep windows are horizontal-only.
+  (TODO 142); ruby placement is beside-column; keep options apply
+  with a column-count approximation (TODOs 153-154).
 
 ### Structural features
 - **Endnotes** (TODO 117): reference markers render and endnote TEXT
@@ -62,7 +60,5 @@ this list reflects the current state.
 ## Future enhancements
 
 - Hyphenation dictionary integration
-- NextColumn wrap via column-jump chaining (multi-column frames)
 - Minimum/Maximum mojikumi aki bounds + CompressionPriority
 - ToBinding / kashida Arabic justification
-- Vertical keep windows (KeepFirstLines / KeepLastLines)

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

@@ -543,6 +543,11 @@ module Idml
               context, layout_frame, cursor_y, run
             )
             run_wrap -= wrap_reduction
+            if next_column_jump?(context, layout_frame, cursor_y, run,
+                                 run_wrap)
+              cursor_y = bottom_limit
+              break
+            end
             cursor_y, run_wrap, wrap_shift = skip_below_jump_object(
               context, layout_frame, cursor_y, run, run_wrap, wrap_shift,
               wrap_reduction, bottom_limit
@@ -612,6 +617,37 @@ module Idml
         end
         private_class_method :render_footnote_entries
 
+        # NextColumnTextWrap in a multi-column frame (TODO 155):
+        # abandon the column — the unplaced runs return to the
+        # chain state and the next column resumes them. Falls
+        # through to skip-below everywhere else (single-column
+        # frames included).
+        def self.next_column_jump?(context, layout_frame, cursor_y, run,
+                                   run_wrap)
+          size = run.point_size || DEFAULT_SIZE
+          return false unless run_wrap < size
+          return false unless multi_column_frame?(context)
+
+          blocked_in_band?(context, layout_frame, cursor_y, size)
+        end
+
+        def self.multi_column_frame?(context)
+          text_column_count(context).to_i > 1
+        end
+        private_class_method :multi_column_frame?
+
+        def self.blocked_in_band?(context, layout_frame, cursor_y, size)
+          resolver = context.text_wrap_resolver
+          return false unless resolver
+
+          frame_x = layout_frame.x + (layout_frame.inset_left || 0)
+          frame_right = layout_frame.x + layout_frame.width -
+            (layout_frame.inset_right || 0)
+          resolver.next_column_block?(cursor_y, size, frame_x, frame_right)
+        end
+        private_class_method :blocked_in_band?
+        private_class_method :next_column_jump?
+
         # JumpObjectTextWrap blocks the full column width: when the
         # run's band is fully blocked, move the cursor below the
         # object's bottom edge and re-measure once. InDesign's

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

@@ -71,9 +71,10 @@ module Idml
           return false unless keep_flagged?(paragraph)
 
           needed = [paragraph.runs.length, 1].max
-          return true if paragraph.keep_all_lines_together &&
-            needed > vertical_room(layout_frame, paragraph, left_limit,
-                                   next_column)
+          room = vertical_room(layout_frame, paragraph, left_limit,
+                               next_column)
+          return true if keep_all_deferred?(paragraph, needed, room)
+          return true if window_deferred?(paragraph, needed, room)
 
           with_next_deferred?(paragraph, next_paragraph, layout_frame,
                               left_limit, next_column, needed)
@@ -81,7 +82,29 @@ module Idml
 
         def keep_flagged?(paragraph)
           paragraph.keep_all_lines_together ||
-            !paragraph.keep_with_next.nil?
+            !paragraph.keep_with_next.nil? ||
+            paragraph.keep_first_lines ||
+            paragraph.keep_last_lines
+        end
+
+        def keep_all_deferred?(paragraph, needed, room)
+          paragraph.keep_all_lines_together && needed > room
+        end
+
+        # Keep windows on the same column-count approximation:
+        # defer a splitting paragraph when fewer than
+        # KeepFirstLines columns fit, or when the stranded tail
+        # would hold fewer than KeepLastLines columns.
+        def window_deferred?(paragraph, needed, room)
+          return false unless needed > room
+
+          if paragraph.keep_first_lines &&
+              room < paragraph.keep_first_lines
+            return true
+          end
+
+          paragraph.keep_last_lines &&
+            (needed - room) < paragraph.keep_last_lines
         end
 
         def with_next_deferred?(paragraph, next_paragraph, layout_frame,

data/lib/idml/render/text_wrap_resolver.rb

@@ -18,7 +18,7 @@ module Idml
     class TextWrapResolver
       # A wrap contour: a PDF-coordinate rectangle the text avoids.
       Contour = Struct.new(
-        :x, :y, :width, :height, :inverse, :side, :jump,
+        :x, :y, :width, :height, :inverse, :side, :jump, :next_column,
         keyword_init: true
       )
 
@@ -100,9 +100,10 @@ module Idml
         return [0.0, 0.0] if overlap.zero?
 
         # JumpObject / NextColumn: text never flows beside the
-        # object — the full frame width is blocked and the renderer
-        # skips the run below the object's bottom edge.
-        return [frame_right - frame_x, 0.0] if contour.jump
+        # object — the full frame width is blocked. The renderer
+        # either skips below (JumpObject) or jumps column
+        # (NextColumn in multi-column frames).
+        return [frame_right - frame_x, 0.0] if blocks_full_width?(contour)
 
         interval_side_adjustment(contour.side, contour.x,
                                  contour.x + contour.width, overlap,
@@ -115,7 +116,7 @@ module Idml
       # jump contour blocks the band.
       def jump_contour_bottom(line_y, line_height, frame_x, frame_right)
         bottoms = @contours.filter_map do |contour|
-          next unless box_contour?(contour) && contour.jump
+          next unless skip_contour?(contour)
           next unless y_overlap?(contour, line_y, line_height) &&
             x_overlap?(contour, frame_x, frame_right)
 
@@ -124,6 +125,25 @@ module Idml
         bottoms.min
       end
 
+      # Contours whose block resolves as skip-below (both jump
+      # flavors report a resume point; the renderer chooses).
+      def skip_contour?(contour)
+        box_contour?(contour) &&
+          (contour.jump || contour.next_column)
+      end
+      private :skip_contour?
+
+      # True when a NextColumn contour blocks the given band: in a
+      # multi-column frame the renderer abandons the column and
+      # the chain resumes in the next one.
+      def next_column_block?(line_y, line_height, frame_x, frame_right)
+        @contours.any? do |contour|
+          box_contour?(contour) && contour.next_column &&
+            y_overlap?(contour, line_y, line_height) &&
+            x_overlap?(contour, frame_x, frame_right)
+        end
+      end
+
       def box_contour?(contour)
         !contour.is_a?(WrapContour::Shape)
       end
@@ -136,6 +156,14 @@ module Idml
       # shift); RightSide moves text past its right edge (reduce +
       # shift); LargestArea picks the roomier side; BothSides and
       # the spine variants reduce by `overlap` only.
+      # JumpObject / NextColumn both forbid text beside the
+      # object; the renderer decides between skip-below and
+      # column jump.
+      def blocks_full_width?(contour)
+        contour.jump || contour.next_column
+      end
+      private :blocks_full_width?
+
       def interval_side_adjustment(side, obj_left, obj_right, overlap,
                                    frame_x, frame_right)
         case side
@@ -185,11 +213,13 @@ module Idml
 
         rect = Geometry.placement_rect(bounds, item.item_transform,
                                        page_height)
+        mode = pref&.text_wrap_mode
         Contour.new(
           x: rect[:x], y: rect[:y],
           width: rect[:width], height: rect[:height],
           side: pref&.text_wrap_side,
-          jump: JUMP_MODES.include?(pref&.text_wrap_mode)
+          jump: mode == "JumpObjectTextWrap",
+          next_column: mode == "NextColumnTextWrap"
         )
       end
       private_class_method :box_contour

data/lib/idml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idml
 version: !ruby/object:Gem::Version
-  version: 0.10.14
+  version: 0.10.15
 platform: ruby
 authors:
 - Ribose
@@ -218,6 +218,8 @@ files:
 - TODO.pdf/151-schema-conformance.md
 - TODO.pdf/152-rtl-alignment.md
 - TODO.pdf/153-vertical-keeps.md
+- TODO.pdf/154-vertical-keep-windows.md
+- TODO.pdf/155-next-column-jump.md
 - TODO.pdf/16-typed-model-pipeline.md
 - TODO.pdf/17-shape-rendering.md
 - TODO.pdf/18-text-rendering.md