idml 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf6a3aba5bbe199af39e5addabae082b795dfef1583dd14f33a9d7415086ead
-  data.tar.gz: eb1a78bd1a11fdc7500543b903b4d927114a96a70fea97a7e8b4c62db813451e
+  metadata.gz: 27df11baaefb3de6bfc6198404a9b3ad10b54b53de8a44cbe58658afdfdf4d4b
+  data.tar.gz: 4274cf4d1869bab1457da1427d8ba96d27cf64ced0140174923b7492ee283dd8
 SHA512:
-  metadata.gz: e47ca1b121cd27336a516f8b0cb863d5ad03edbdc43455bfa3efcb41807865a1dae4aec35ccbf380e003dc383d9f0d3704b42e23efa0d56c6925f316b68030c1
-  data.tar.gz: 3ac803ec48c5a0e2a2e3eec6f17845993a2a3194ddb8046bd5e8ea7225fcd8709abef22817684c12c51814b26a6ca9d3e07f2b4a735b519b9cb3d99e9eaaec5c
+  metadata.gz: '02936232be8a99effaf2f417d765281700c8f6b89004bab18e462d29d8b60b12259a715780fd0c2c1b68d41e5f82cd087b2933753551c72f3235d5cfbe3e3640'
+  data.tar.gz: e92764f18f109a4ae66dabb4ebfcb3a991cd2926c22e7836de42e99d7c1b45e931cd0aa4f22678193564fb82bdbf24eeccd593405a1ada0322cda7f5ce54f32d

data/TODO.pdf/103-drop-caps.md

@@ -1,13 +1,12 @@
 # TODO PDF 103: Drop caps (DropCapLines, DropCapCharacters)
 
-## Status: PARTIAL — `Render::DropCap` helper computes drop-cap
-geometry (font_size = base × lines, width via font_metrics.measure_text,
-height = leading × lines). TextFrameRenderer.emit_drop_cap emits the
-drop cap as an enlarged glyph at the paragraph's top-left when the
-paragraph declares DropCapLines/DropCapCharacters > 0 and is the
-chain's first paragraph.
-
-Wrap-around text is NOT yet implemented — the drop cap renders as an
+## Status: DONE — `Render::DropCap` helper computes drop-cap geometry.
+TextFrameRenderer.emit_drop_cap emits the enlarged glyph, strips the
+drop cap characters from the first run (no double render), and
+applies reduced wrap width for the first `drop_cap_lines` runs so
+text wraps around the drop cap. Approximation: treats each run as
+one line (real per-line tracking would require line-count-aware
+wrapping).
 enlarged glyph; subsequent paragraph text flows normally and may
 overlap the drop cap. Real wrap-around (indent lines 1..M to the
 right of the drop cap) requires per-line wrap-width control in

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

@@ -1,9 +1,10 @@
 # TODO PDF 115: Bullet and numbered list rendering
 
-## 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.
+## Status: DONE — markers are prepended inline AND a hanging indent
+(18pt) is applied so wrapped lines align with text after the marker.
+The indent is approximate (fixed width) since tab-stop measurement
+requires font metrics at style-resolution time; future refinement
+would measure the actual marker width.
 
 ## Problem
 

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

@@ -306,18 +306,44 @@ module Idml
 
           emit_paragraph_top_rule(canvas, paragraph, context, cursor_y,
                                   frame_left, frame_right, first_paragraph)
-          emit_drop_cap(canvas, paragraph, context, frame_left, cursor_y,
-                        first_paragraph)
+          drop_cap = emit_drop_cap(canvas, paragraph, context, frame_left,
+                                   cursor_y, first_paragraph)
 
+          effective_runs = prepare_runs_for_drop_cap(runs, drop_cap)
+          dc_width = drop_cap&.wrap_offset || 0
+          dc_lines = drop_cap&.lines || 0
+
+          rendered, cursor_y, char_cursor = iterate_paragraph_runs(
+            canvas, paragraph, effective_runs, context, layout_frame,
+            font, wrap_width, cursor_y, bottom_limit, char_cursor,
+            first_paragraph, para_attrs, dc_width, dc_lines
+          )
+
+          remaining_runs = effective_runs[rendered..]
+          cursor_y = emit_paragraph_bottom_rule(canvas, paragraph, context,
+                                                cursor_y, frame_left,
+                                                frame_right, para_attrs,
+                                                remaining_runs)
+          [remaining_runs, cursor_y, char_cursor]
+        end
+        private_class_method :render_runs_for_paragraph
+
+        def self.iterate_paragraph_runs(canvas, paragraph, runs, context,
+                                        layout_frame, font, wrap_width,
+                                        cursor_y, bottom_limit, char_cursor,
+                                        first_paragraph, para_attrs,
+                                        dc_width, dc_lines)
           rendered_count = 0
           runs.each do |run|
             break if cursor_y < bottom_limit
 
             space_before = paragraph_space_before(para_attrs, first_paragraph,
                                                   rendered_count)
+            run_wrap = drop_cap_wrap_width(wrap_width, dc_width,
+                                           dc_lines, rendered_count)
             positioned, next_y = layout_run(
               canvas, run, paragraph, context, layout_frame, font,
-              wrap_width, cursor_y, space_before,
+              run_wrap, cursor_y, space_before,
               para_attrs[:first_line_indent], para_attrs[:left_indent],
               char_cursor
             )
@@ -325,15 +351,43 @@ module Idml
             cursor_y = next_y
             rendered_count += 1
           end
+          [rendered_count, cursor_y, char_cursor]
+        end
+        private_class_method :iterate_paragraph_runs
 
-          remaining_runs = runs[rendered_count..]
-          cursor_y = emit_paragraph_bottom_rule(canvas, paragraph, context,
-                                                cursor_y, frame_left,
-                                                frame_right, para_attrs,
-                                                remaining_runs)
-          [remaining_runs, cursor_y, char_cursor]
+        # Strips drop cap characters from the first run so they don't
+        # render twice (once as the enlarged drop cap, once as normal
+        # text). Returns a new run list with the first run's text
+        # adjusted. If stripping empties the first run, removes it.
+        def self.prepare_runs_for_drop_cap(runs, drop_cap)
+          return runs unless drop_cap
+          return runs if runs.empty?
+
+          stripped_count = drop_cap.text.length
+          first = runs.first
+          return runs if first.text.length < stripped_count
+
+          remaining_text = first.text[stripped_count..]
+          return runs.drop(1) if remaining_text.nil? || remaining_text.empty?
+
+          stripped_run = first.dup
+          stripped_run.text = remaining_text
+          [stripped_run] + runs[1..]
         end
-        private_class_method :render_runs_for_paragraph
+        private_class_method :prepare_runs_for_drop_cap
+
+        # Returns reduced wrap width for runs within the drop cap zone
+        # (first `drop_cap_lines` runs). After the zone, returns full
+        # width. Approximation: treats each run as one line. Proper
+        # implementation would track actual line count per run.
+        def self.drop_cap_wrap_width(full_width, drop_cap_width,
+                                      drop_cap_lines, run_index)
+          return full_width if drop_cap_width.zero? || drop_cap_lines.zero?
+          return full_width if run_index >= drop_cap_lines
+
+          full_width - drop_cap_width
+        end
+        private_class_method :drop_cap_wrap_width
 
         # Renders the drop cap for a paragraph (when declared and the
         # first paragraph of the chain). Wrap-around text is not yet

data/lib/idml/render/style_resolver.rb

@@ -249,9 +249,12 @@ module Idml
       end
       private_class_method :alignment_for
 
+      HANGING_INDENT_WIDTH = 18.0
+
       # 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.
+      # a list. Also applies a hanging indent so wrapped lines align
+      # with the text after the marker, not with the marker itself.
       def self.prepend_list_marker(paragraph)
         marker = ListMarker.marker_for(paragraph)
         return unless marker
@@ -259,9 +262,21 @@ module Idml
 
         first_run = paragraph.runs.first
         first_run.text = "#{marker}#{first_run.text}"
+        apply_hanging_indent(paragraph)
       end
       private_class_method :prepend_list_marker
 
+      # Adjusts left_indent and first_line_indent for a hanging
+      # indent effect: first line starts at the original left edge
+      # (with the marker), wrapped lines indent by HANGING_INDENT_WIDTH.
+      def self.apply_hanging_indent(paragraph)
+        current_left = paragraph.left_indent || 0
+        current_first = paragraph.first_line_indent || 0
+        paragraph.left_indent = current_left + HANGING_INDENT_WIDTH
+        paragraph.first_line_indent = current_first - HANGING_INDENT_WIDTH
+      end
+      private_class_method :apply_hanging_indent
+
       # 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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idml
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-10 00:00:00.000000000 Z
+date: 2026-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal