coradoc-adoc 2.0.23 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69bc04902f8020decc17928a5397de2876f060ed8ee36de95f0920ba6312e8b4
-  data.tar.gz: ca56574d1b78863a574551732397ff65944f2b012781def3bb4ea4bcf8b0aaf1
+  metadata.gz: d135f788f7205a03a242f7d1e9242b84fdc76994f6eff372579db29c9c420d51
+  data.tar.gz: 6eafdb8eb6a101650e48e6a29d5e719f729d8c7888c506a5e67a33511640db2f
 SHA512:
-  metadata.gz: 708cf53d7a9c6de58e15aac99a1e77343e004b7d014697335cd91f96143584b0701235e84030948a5ab6a09eba8612a361b215b1be9707ca07943d3f7179ad09
-  data.tar.gz: ff60d697d4fff0ec229ca5b597f1fe2f37d34129bff79f10276b72824ecd418f770d9229800dee6f143f95345af0c1432aceb100385b6c578fd08abb01a3767a
+  metadata.gz: cfe57d959c7d69cf47aadb30526cd826ac85720d1f3f4426c4f6fc4d769c2618ad2c31cd713e3b86b4480f79fdf41d473457623c145746eb7fc25155c47b2dfc
+  data.tar.gz: 07dcf6099269006d16c34a21f5ca9457227fe9e7fcd597607716511ddecf7a3a1b7d794d5f32a29c6542a4b4f93ced0f61b37ae7e06553d775a0068ad4f7f363

data/lib/coradoc/asciidoc/model/base.rb

@@ -35,6 +35,13 @@ module Coradoc
 
         attribute :id, :string
 
+        # 1-indexed source line where this element begins, when known.
+        # Populated by the Parslet transformer from the matched Slice's
+        # line_and_column. nil for programmatically constructed models.
+        # Single source of truth for source-position propagation through
+        # AsciiDoc::Model → CoreModel (Issue 1, STATUS-2026-06-28).
+        attribute :source_line, :integer
+
         # Element classification for spacing and serialization decisions.
         # Subclasses override these to declare their level.
         def block_level?

data/lib/coradoc/asciidoc/transform/element_transformers/admonition_styles.rb

@@ -13,7 +13,12 @@ module Coradoc
         # block-form transformer that needs to decide between an admonition
         # and the block's native type.
         module AdmonitionStyles
-          BUILTIN = %w[note tip warning caution important editor todo].freeze
+          # Generic `[admonition]` (capitalized as ADMONITION by
+          # +canonicalize+) is the spec-defined generic admonition style.
+          # It is rarely used directly but exists in the AsciiDoc spec;
+          # treating it as a real admonition prevents it from collapsing
+          # to an ExampleBlock when applied to a delimited block.
+          BUILTIN = %w[note tip warning caution important editor todo admonition].freeze
 
           @custom = []
 

data/lib/coradoc/asciidoc/transform/element_transformers/block_transformer.rb

@@ -8,10 +8,13 @@ module Coradoc
           class << self
             def transform_paragraph(para)
               children = ToCoreModel.transform_inline_content(para.content)
+              source_lines = ToCoreModel.extract_source_lines(para.content)
 
               Coradoc::CoreModel::ParagraphBlock.new(
                 id: para.id,
                 content: ToCoreModel.extract_text_content(para.content),
+                lines: source_lines,
+                source_line: para.source_line,
                 children: children
               )
             end
@@ -22,19 +25,15 @@ module Coradoc
             # lines are preserved. Treating these as paragraphs would collapse
             # whitespace and join consecutive lines into a single flowing text.
             def transform_verbatim_block(block, klass, language_override: nil)
-              non_break_lines = Array(block.lines).reject do |line|
-                line.is_a?(Coradoc::AsciiDoc::Model::LineBreak) ||
-                  line.is_a?(Coradoc::AsciiDoc::Model::Break::PageBreak)
-              end
-              content_lines = non_break_lines.map do |line|
-                ToCoreModel.extract_text_content(line)
-              end.join("\n")
+              source_lines = ToCoreModel.extract_source_lines(block.lines)
 
               klass.new(
                 id: block.id,
                 title: ToCoreModel.extract_title_text(block.title),
-                content: content_lines,
-                language: language_override || ToCoreModel.extract_block_language(block)
+                content: source_lines.join("\n"),
+                lines: source_lines,
+                language: language_override || ToCoreModel.extract_block_language(block),
+                source_line: block.source_line
               )
             end
 
@@ -74,7 +73,7 @@ module Coradoc
             # AsciiDoc spec, every delimited block accepts both admonition
             # labels and verbatim/stem casts in its attribute line. The cast
             # is resolved by +block_cast_semantic+ in MECE order:
-            # admonition > stem > verbatim > fallback.
+            # admonition > stem > verbatim > typed-cast > fallback.
             def transform_with_admonition_check(block, native_class)
               semantic = block_cast_semantic(block)
               case semantic
@@ -88,6 +87,9 @@ module Coradoc
                 transform_listing_from_open(block)
               when :literal
                 transform_literal_from_open(block)
+              when :typed_cast
+                style = first_positional_attr(block).to_s.downcase
+                transform_typed_block(block, TYPED_BLOCK_CAST_STYLES.fetch(style))
               else
                 transform_typed_block(block, native_class)
               end
@@ -119,11 +121,25 @@ module Coradoc
 
             VERBATILE_CAST_STYLES = %w[source listing literal].freeze
 
+            # Positional style → typed CoreModel class for blocks whose
+            # attribute line casts an open block into a richer semantic
+            # type (e.g. `[sidebar]\n--\n...\n--`). Single source of
+            # truth: adding a new style cast is one line here, no edits
+            # to dispatch (OCP).
+            TYPED_BLOCK_CAST_STYLES = {
+              'sidebar' => Coradoc::CoreModel::SidebarBlock,
+              'example' => Coradoc::CoreModel::ExampleBlock,
+              'quote' => Coradoc::CoreModel::QuoteBlock,
+              'abstract' => Coradoc::CoreModel::AbstractBlock,
+              'partintro' => Coradoc::CoreModel::PartintroBlock
+            }.freeze
+
             # Resolve a delimited block's cast from its first positional
             # attribute. Single source of truth for the cast ladder used
             # by every block-form transformer (example/sidebar/quote/open).
             # Returns one of: :admonition, :stem, :source, :listing,
-            # :literal, or nil (no cast — use the block's native class).
+            # :literal, :typed_cast, or nil (no cast — use the block's
+            # native class).
             def block_cast_semantic(block)
               style = first_positional_attr(block)
               return nil unless style
@@ -131,6 +147,7 @@ module Coradoc
               style_str = style.to_s.downcase
               return :admonition if AdmonitionStyles.admonition?(style)
               return :stem if STEM_STYLES.key?(style_str)
+              return :typed_cast if TYPED_BLOCK_CAST_STYLES.key?(style_str)
               return style_str.to_sym if VERBATILE_CAST_STYLES.include?(style_str)
 
               nil
@@ -163,7 +180,8 @@ module Coradoc
               Coradoc::CoreModel::AnnotationBlock.new(
                 annotation_type: canonical,
                 content: content_lines,
-                title: ToCoreModel.extract_title_text(block.title)
+                title: ToCoreModel.extract_title_text(block.title),
+                source_line: block.source_line
               )
             end
 
@@ -176,7 +194,7 @@ module Coradoc
             end
 
             def transform_block(block, semantic_type_or_delimiter)
-              content_lines = ToCoreModel.extract_block_lines(block)
+              source_lines = ToCoreModel.extract_source_lines(block.lines)
               semantic_type = if semantic_type_or_delimiter.is_a?(Symbol)
                                 semantic_type_or_delimiter
                               else
@@ -188,8 +206,10 @@ module Coradoc
                 delimiter_type: semantic_type_or_delimiter.is_a?(String) ? semantic_type_or_delimiter : nil,
                 id: block.id,
                 title: ToCoreModel.extract_title_text(block.title),
-                content: content_lines,
-                language: ToCoreModel.extract_block_language(block)
+                content: source_lines.join("\n"),
+                lines: source_lines,
+                language: ToCoreModel.extract_block_language(block),
+                source_line: block.source_line
               )
             end
 
@@ -216,6 +236,7 @@ module Coradoc
                   title: ToCoreModel.extract_title_text(block.title),
                   children: children,
                   language: ToCoreModel.extract_block_language(block),
+                  source_line: block.source_line,
                   **extra_attrs
                 )
               else
@@ -230,7 +251,8 @@ module Coradoc
                   inline = [Coradoc::CoreModel::TextContent.new(text: '')] if inline.empty?
                   Coradoc::CoreModel::ParagraphBlock.new(
                     content: ToCoreModel.extract_text_content(group),
-                    children: Array(inline)
+                    children: Array(inline),
+                    source_line: ToCoreModel.extract_source_line(group)
                   )
                 end
 
@@ -240,6 +262,7 @@ module Coradoc
                   content: content_lines,
                   children: children,
                   language: ToCoreModel.extract_block_language(block),
+                  source_line: block.source_line,
                   **extra_attrs
                 )
               end

data/lib/coradoc/asciidoc/transform/element_transformers/document_transformer.rb

@@ -12,7 +12,6 @@ module Coradoc
               children = ToCoreModel.transform(doc.sections || doc.contents || [])
               children = CalloutMerger.call(children)
               children = prepend_frontmatter(children, doc.frontmatter)
-              children = insert_title_heading_after_frontmatter(children, title_text)
               children = resolve_attribute_references(children, attributes)
 
               Coradoc::CoreModel::DocumentElement.new(
@@ -34,31 +33,6 @@ module Coradoc
               [block, *children]
             end
 
-            # Per the AsciiDoc spec, the document title (`= Title`) is the
-            # document's level-0 heading. Asciidoctor renders it as an
-            # <h1> at the top of the body by default. Emit a HeaderElement
-            # at level 0 so consumers that walk the body's children see the
-            # title (the standard ProseMirror/HTML rendering pattern)
-            # instead of having to read Document.title separately.
-            #
-            # The title attribute on DocumentElement is preserved for
-            # consumers that read it directly. The title heading is placed
-            # after any FrontmatterBlock (frontmatter is metadata that
-            # precedes the body).
-            def insert_title_heading_after_frontmatter(children, title_text)
-              return children if title_text.nil? || title_text.strip.empty?
-
-              title_heading = Coradoc::CoreModel::HeaderElement.new(
-                level: 0,
-                title: title_text,
-                content: title_text
-              )
-              frontmatter_count = children.count do |child|
-                child.is_a?(Coradoc::CoreModel::FrontmatterBlock)
-              end
-              children.insert(frontmatter_count, title_heading)
-            end
-
             # Resolve `{name}` attribute references in the body against the
             # document's own declared attributes. Single source of truth:
             # the resolver lives in core so other format gems can reuse it
@@ -86,7 +60,8 @@ module Coradoc
                 level: section.level,
                 title: title_text,
                 children: content_children + nested_sections,
-                attributes: section_metadata_from(section)
+                attributes: section_metadata_from(section),
+                source_line: section.source_line
               )
             end
 

data/lib/coradoc/asciidoc/transform/element_transformers/include_transformer.rb

@@ -21,7 +21,8 @@ module Coradoc
                 target: model.path.to_s,
                 options: options,
                 raw_options: raw,
-                line_break: model.line_break.to_s
+                line_break: model.line_break.to_s,
+                source_line: model.source_line
               )
             end
 

data/lib/coradoc/asciidoc/transform/element_transformers/inline_transformer.rb

@@ -9,14 +9,16 @@ module Coradoc
             def transform_inline(inline, format_type)
               klass = Coradoc::CoreModel::InlineElement.format_type_class(format_type)
               klass.new(
-                content: ToCoreModel.extract_text_content(inline.content)
+                content: ToCoreModel.extract_text_content(inline.content),
+                source_line: inline.source_line
               )
             end
 
             def transform_inline_text(inline, format_type)
               klass = Coradoc::CoreModel::InlineElement.format_type_class(format_type)
               klass.new(
-                content: inline.text.to_s
+                content: inline.text.to_s,
+                source_line: inline.source_line
               )
             end
 
@@ -24,28 +26,32 @@ module Coradoc
               parsed_content = ToCoreModel.parse_and_transform_inline(footnote.text.to_s)
               Coradoc::CoreModel::FootnoteElement.new(
                 target: footnote.id,
-                content: parsed_content
+                content: parsed_content,
+                source_line: footnote.source_line
               )
             end
 
             def transform_link(link)
               Coradoc::CoreModel::LinkElement.new(
                 target: link.path,
-                content: link.name || link.path
+                content: link.name || link.path,
+                source_line: link.source_line
               )
             end
 
             def transform_cross_reference(xref)
               Coradoc::CoreModel::CrossReferenceElement.new(
                 target: xref.href,
-                content: xref.args&.first || xref.href
+                content: xref.args&.first || xref.href,
+                source_line: xref.source_line
               )
             end
 
             def transform_stem(stem)
               Coradoc::CoreModel::StemElement.new(
                 content: stem.content,
-                stem_type: stem.type || 'stem'
+                stem_type: stem.type || 'stem',
+                source_line: stem.source_line
               )
             end
           end

data/lib/coradoc/asciidoc/transform/element_transformers/list_transformer.rb

@@ -16,11 +16,15 @@ module Coradoc
               end
 
               if marker_type == 'definition'
-                Coradoc::CoreModel::DefinitionList.new(items: items)
+                Coradoc::CoreModel::DefinitionList.new(
+                  items: items,
+                  source_line: list.source_line
+                )
               else
                 Coradoc::CoreModel::ListBlock.new(
                   marker_type: marker_type,
-                  items: items
+                  items: items,
+                  source_line: list.source_line
                 )
               end
             end
@@ -45,7 +49,8 @@ module Coradoc
                 term: ToCoreModel.extract_text_content(term_children),
                 definitions: [ToCoreModel.extract_text_content(def_children)],
                 term_children: term_children,
-                definition_children: def_children
+                definition_children: def_children,
+                source_line: item.source_line
               )
               di.id = item.id if item.id
 
@@ -63,7 +68,8 @@ module Coradoc
 
               li = Coradoc::CoreModel::ListItem.new(
                 content: ToCoreModel.extract_text_content(content_val),
-                marker: item.marker
+                marker: item.marker,
+                source_line: item.source_line
               )
               li.children = children
 

data/lib/coradoc/asciidoc/transform/element_transformers/other_transformer.rb

@@ -10,7 +10,8 @@ module Coradoc
               Coradoc::CoreModel::Term.new(
                 text: term.term.to_s,
                 type: term.type&.to_s || 'preferred',
-                lang: term.lang&.to_s || 'en'
+                lang: term.lang&.to_s || 'en',
+                source_line: term.source_line
               )
             end
 
@@ -19,7 +20,8 @@ module Coradoc
               children = ToCoreModel.transform_inline_content(admonition.content)
               block = Coradoc::CoreModel::AnnotationBlock.new(
                 annotation_type: canonical,
-                content: ToCoreModel.extract_text_content(admonition.content)
+                content: ToCoreModel.extract_text_content(admonition.content),
+                source_line: admonition.source_line
               )
               block.children = children
               block
@@ -35,7 +37,8 @@ module Coradoc
                 alt: image.alt, title: image.title, caption: image.caption,
                 width: image.width, height: image.height,
                 link: image.link, role: image.role,
-                inline: image.is_a?(Coradoc::AsciiDoc::Model::Image::InlineImage)
+                inline: image.is_a?(Coradoc::AsciiDoc::Model::Image::InlineImage),
+                source_line: image.source_line
               }
             end
 
@@ -53,7 +56,8 @@ module Coradoc
                 id: bib.id,
                 title: bib.title.to_s,
                 level: nil,
-                entries: entries
+                entries: entries,
+                source_line: bib.source_line
               )
             end
 
@@ -61,7 +65,8 @@ module Coradoc
               Coradoc::CoreModel::BibliographyEntry.new(
                 anchor_name: entry.anchor_name,
                 document_id: entry.document_id,
-                ref_text: entry.ref_text.to_s
+                ref_text: entry.ref_text.to_s,
+                source_line: entry.source_line
               )
             end
           end

data/lib/coradoc/asciidoc/transform/element_transformers/table_transformer.rb

@@ -14,7 +14,8 @@ module Coradoc
               Coradoc::CoreModel::Table.new(
                 id: table.id,
                 title: table.title&.to_s,
-                rows: rows
+                rows: rows,
+                source_line: table.source_line
               )
             end
 
@@ -24,7 +25,8 @@ module Coradoc
               end
               Coradoc::CoreModel::TableRow.new(
                 cells: cells,
-                header: row.header
+                header: row.header,
+                source_line: row.source_line
               )
             end
 
@@ -38,7 +40,8 @@ module Coradoc
                 colspan: cell.colspan,
                 rowspan: cell.rowspan,
                 style: cell.style_name,
-                children: children
+                children: children,
+                source_line: cell.source_line
               )
             end
           end

data/lib/coradoc/asciidoc/transform/from_core_model.rb

@@ -38,18 +38,12 @@ module Coradoc
                          Coradoc::AsciiDoc::Model::Header.new(title: '')
                        end
 
-              # Pull FrontmatterBlock out first so strip_title_heading sees
-              # the body children in their natural order (frontmatter →
-              # title heading → body). The reverse-direction strip then
-              # matches on a level-0 HeaderElement wherever it sits among
-              # the remaining children.
               without_frontmatter, frontmatter = extract_frontmatter(Array(element.children))
-              without_title = strip_title_heading(without_frontmatter, element.title)
 
               Coradoc::AsciiDoc::Model::Document.new(
                 id: element.id,
                 header: header,
-                sections: flatten_children(without_title),
+                sections: flatten_children(without_frontmatter),
                 frontmatter: frontmatter
               )
             when CoreModel::SectionElement
@@ -68,27 +62,6 @@ module Coradoc
             end
           end
 
-          # The forward direction (DocumentTransformer#insert_title_heading_after_frontmatter)
-          # emits a level-0 HeaderElement after any FrontmatterBlock so
-          # consumers that walk the children see the title. On the reverse
-          # path, that HeaderElement would round-trip back as a separate
-          # body element and the title would be emitted twice (once via
-          # the document header, once via the heading child). Drop it
-          # before serialization when it carries the same text as the
-          # document title.
-          def strip_title_heading(children, document_title)
-            return children unless document_title && !document_title.strip.empty?
-
-            index = children.find_index do |child|
-              child.is_a?(CoreModel::HeaderElement) &&
-                child.level.to_i.zero? &&
-                child.title.to_s == document_title.to_s
-            end
-            return children unless index
-
-            children.reject.with_index { |_, i| i == index }
-          end
-
           # Transforms each CoreModel child and flattens one level so a
           # transform that returns multiple siblings (e.g. a source block
           # followed by its re-expanded callout paragraphs) stays in

data/lib/coradoc/asciidoc/transform/inline_transform_visitor.rb

@@ -35,21 +35,39 @@ module Coradoc
           end
         end
 
+        # Folds soft source line breaks into a single text run: when two
+        # +Model::TextElement+s sit adjacent in the content array (the parser
+        # emits one per source line of a paragraph), a space is inserted
+        # between them so wrapped text renders as flowing prose rather than
+        # concatenated words.
+        #
+        # The previous item must ALSO be a TextElement — if a non-text
+        # inline (HardLineBreak, Passthrough, Image, etc.) sits between two
+        # TextElements, the source did not have a soft break there and no
+        # space should be synthesised. Without this guard, `foo +\nbar`
+        # would emit `["foo", hard_break, " ", "bar"]` (stray space) and
+        # `Before +pass:[RAW]+ after` would emit a double space around the
+        # passthrough.
         def visit_array(items)
           result = []
-          items.each_with_index do |item, idx|
+          previous = nil
+          items.each do |item|
             transformed = visit_content(item)
             next if transformed.empty?
 
-            needs_space = idx.positive? &&
-                          item.is_a?(Model::TextElement) &&
-                          item.line_break != '+'
-            result << CoreModel::TextContent.new(text: ' ') if needs_space
+            result << CoreModel::TextContent.new(text: ' ') if soft_break_before?(previous, item)
             result.concat(transformed)
+            previous = item
           end
           result
         end
 
+        def soft_break_before?(previous, current)
+          previous.is_a?(Model::TextElement) &&
+            current.is_a?(Model::TextElement) &&
+            current.line_break != '+'
+        end
+
         def visit_model(model)
           @to_core_model.transform(model)
         end

data/lib/coradoc/asciidoc/transform/to_core_model.rb

@@ -23,14 +23,38 @@ module Coradoc
             transformer ? transformer.call(model) : model
           end
 
+          # Returns the source-line view of an AsciiDoc content array as
+          # an Array<String>. Single source of truth for source-line
+          # extraction — every transformer that needs to populate
+          # CoreModel::Block#lines goes through here so the filtering
+          # rules (skip Model::LineBreak and Model::Break::PageBreak,
+          # which carry no renderable text) apply consistently.
+          def extract_source_lines(content)
+            Array(content).filter_map do |item|
+              next if item.is_a?(Coradoc::AsciiDoc::Model::LineBreak) ||
+                      item.is_a?(Coradoc::AsciiDoc::Model::Break::PageBreak)
+
+              extract_text_content(item).to_s
+            end
+          end
+
           def extract_block_lines(block)
-            non_break_lines = Array(block.lines).reject do |line|
-              line.is_a?(Coradoc::AsciiDoc::Model::LineBreak) ||
-                line.is_a?(Coradoc::AsciiDoc::Model::Break::PageBreak)
+            extract_source_lines(block.lines).join("\n")
+          end
+
+          # Extracts the source_line of the first AsciiDoc::Model::Base in
+          # +content+. Single source of truth for source-line propagation
+          # from AsciiDoc::Model trees into CoreModel objects built from
+          # grouped content (e.g., paragraphs inside typed blocks).
+          # Returns nil when no model carries a source_line.
+          def extract_source_line(content)
+            Array(content).each do |item|
+              next unless item.is_a?(Coradoc::AsciiDoc::Model::Base)
+
+              line = item.source_line
+              return line if line
             end
-            non_break_lines.map do |line|
-              extract_text_content(line)
-            end.join("\n")
+            nil
           end
 
           def extract_title_text(title)

data/lib/coradoc/asciidoc/transformer/block_rules.rb

@@ -23,7 +23,8 @@ module Coradoc
                 title: title,
                 delimiter_len: delimiter.size,
                 lines: lines,
-                ordering: ordering
+                ordering: ordering,
+                source_line: SourceLineExtractor.extract(block)
               }
               # Markdown fences carry the language tag inline (```ruby);
               # pass it through so the SourceCode classifier entry can set
@@ -34,7 +35,11 @@ module Coradoc
 
             # Example
             rule(example: sequence(:example)) do
-              Model::Block::Example.new(title: '', lines: example)
+              Model::Block::Example.new(
+                title: '',
+                lines: example,
+                source_line: SourceLineExtractor.extract(example)
+              )
             end
 
             # Admonition. Canonicalise the type to uppercase so round-trips
@@ -45,7 +50,11 @@ module Coradoc
               content: sequence(:content)
             ) do
               canonical = Coradoc::AsciiDoc::Transform::ElementTransformers::AdmonitionStyles.canonicalize(admonition_type.to_s)
-              Model::Admonition.new(content: content, type: canonical)
+              Model::Admonition.new(
+                content: content,
+                type: canonical,
+                source_line: SourceLineExtractor.extract(admonition_type)
+              )
             end
 
             # Block image
@@ -63,6 +72,7 @@ module Coradoc
                 src: path,
                 attributes: residual,
                 line_break: "\n",
+                source_line: SourceLineExtractor.extract(block_image),
                 **promoted
               )
             end

data/lib/coradoc/asciidoc/transformer/header_rules.rb

@@ -21,7 +21,10 @@ module Coradoc
               id = id.to_s unless id.nil?
               id = nil if id && id.empty?
 
-              Model::Header.new(id:, title:, author:, revision:)
+              Model::Header.new(
+                id:, title:, author:, revision:,
+                source_line: SourceLineExtractor.extract(header)
+              )
             end
 
             rule(header: simple(:header)) do
@@ -34,7 +37,10 @@ module Coradoc
               last_name: simple(:last_name),
               email: simple(:email)
             ) do
-              Model::Author.new(first_name:, last_name:, email:, middle_name: nil)
+              Model::Author.new(
+                first_name:, last_name:, email:, middle_name: nil,
+                source_line: SourceLineExtractor.extract(first_name)
+              )
             end
 
             # Revision
@@ -43,7 +49,10 @@ module Coradoc
               date: simple(:date),
               remark: simple(:remark)
             ) do
-              Model::Revision.new(number:, date:, remark:)
+              Model::Revision.new(
+                number:, date:, remark:,
+                source_line: SourceLineExtractor.extract(number)
+              )
             end
           end
         end

data/lib/coradoc/asciidoc/transformer/inline_rules.rb

@@ -22,7 +22,8 @@ module Coradoc
             rule(link: subtree(:link)) do
               Model::Inline::Link.new(
                 path: link[:path].to_s,
-                name: link[:text]&.to_s
+                name: link[:text]&.to_s,
+                source_line: SourceLineExtractor.extract(link)
               )
             end
 
@@ -31,7 +32,10 @@ module Coradoc
               href = xref[:href].to_s
               text = xref[:text]
               args = text ? [text.to_s] : []
-              Model::Inline::CrossReference.new(href:, args:)
+              Model::Inline::CrossReference.new(
+                href:, args:,
+                source_line: SourceLineExtractor.extract(xref)
+              )
             end
 
             # Inline image
@@ -43,6 +47,7 @@ module Coradoc
               Model::Image::InlineImage.new(
                 src: inline_image[:path],
                 attributes: residual,
+                source_line: SourceLineExtractor.extract(inline_image),
                 **promoted
               )
             end
@@ -54,13 +59,17 @@ module Coradoc
             rule(inline_passthrough: subtree(:passthrough)) do
               Model::Inline::Passthrough.new(
                 content: passthrough[:raw].to_s,
-                form: 'triple'
+                form: 'triple',
+                source_line: SourceLineExtractor.extract(passthrough)
               )
             end
 
             # Attribute reference
             rule(attribute_reference: simple(:name)) do
-              Model::Inline::AttributeReference.new(name:)
+              Model::Inline::AttributeReference.new(
+                name:,
+                source_line: SourceLineExtractor.extract(name)
+              )
             end
 
             # Hard line break (` +\n` or `\\n`). Emitted as a dedicated
@@ -68,8 +77,10 @@ module Coradoc
             # Model::LineBreak, which only represents paragraph-separator
             # blank lines. Hard breaks carry semantic meaning: HTML/Markdown
             # renderers map them to <br>.
-            rule(hard_line_break: simple(:_)) do
-              Model::Inline::HardLineBreak.new
+            rule(hard_line_break: simple(:hard_line_break)) do
+              Model::Inline::HardLineBreak.new(
+                source_line: SourceLineExtractor.extract(hard_line_break)
+              )
             end
 
             # Term
@@ -77,30 +88,45 @@ module Coradoc
               term_type: simple(:term_type),
               term: simple(:term)
             ) do
-              Coradoc::AsciiDoc::Model::Term.new(term:, type: term_type, lang: :en)
+              Coradoc::AsciiDoc::Model::Term.new(
+                term:, type: term_type, lang: :en,
+                source_line: SourceLineExtractor.extract(term_type)
+              )
             end
 
             # Footnote
             rule(footnote: simple(:footnote)) do
               text_str = footnote.to_s
-              Coradoc::AsciiDoc::Model::Inline::Footnote.new(text: text_str)
+              Coradoc::AsciiDoc::Model::Inline::Footnote.new(
+                text: text_str,
+                source_line: SourceLineExtractor.extract(footnote)
+              )
             end
 
             rule(footnote: simple(:footnote), id: simple(:id)) do
               text_str = footnote.to_s
-              Coradoc::AsciiDoc::Model::Inline::Footnote.new(text: text_str, id: id.to_s)
+              Coradoc::AsciiDoc::Model::Inline::Footnote.new(
+                text: text_str, id: id.to_s,
+                source_line: SourceLineExtractor.extract(footnote)
+              )
             end
 
             # Footnote with empty content (reference to named footnote)
             rule(footnote: sequence(:footnote), id: simple(:id)) do
               text_str = footnote.map(&:to_s).join
-              Coradoc::AsciiDoc::Model::Inline::Footnote.new(text: text_str, id: id.to_s)
+              Coradoc::AsciiDoc::Model::Inline::Footnote.new(
+                text: text_str, id: id.to_s,
+                source_line: SourceLineExtractor.extract(footnote)
+              )
             end
 
             # Footnote with empty content and no id
             rule(footnote: sequence(:footnote)) do
               text_str = footnote.map(&:to_s).join
-              Coradoc::AsciiDoc::Model::Inline::Footnote.new(text: text_str)
+              Coradoc::AsciiDoc::Model::Inline::Footnote.new(
+                text: text_str,
+                source_line: SourceLineExtractor.extract(footnote)
+              )
             end
 
             # Inline formatting rules generated from a single registry.
@@ -114,11 +140,17 @@ module Coradoc
 
               rule(constrained_key => subtree(:subtree)) do
                 content = Transformer.extract_inline_content(subtree)
-                klass.new(content: content, unconstrained: false)
+                klass.new(
+                  content: content, unconstrained: false,
+                  source_line: SourceLineExtractor.extract(subtree)
+                )
               end
               rule(unconstrained_key => subtree(:subtree)) do
                 content = Transformer.extract_inline_content(subtree)
-                klass.new(content: content, unconstrained: true)
+                klass.new(
+                  content: content, unconstrained: true,
+                  source_line: SourceLineExtractor.extract(subtree)
+                )
               end
             end
 
@@ -127,7 +159,8 @@ module Coradoc
               Model::Inline::Span.new(
                 text: span_constrained[:text],
                 unconstrained: false,
-                attributes: span_constrained[:attribute_list]
+                attributes: span_constrained[:attribute_list],
+                source_line: SourceLineExtractor.extract(span_constrained)
               )
             end
 
@@ -136,31 +169,42 @@ module Coradoc
               Model::Inline::Span.new(
                 text: span_unconstrained[:text],
                 unconstrained: true,
-                attributes: span_unconstrained[:attribute_list]
+                attributes: span_unconstrained[:attribute_list],
+                source_line: SourceLineExtractor.extract(span_unconstrained)
               )
             end
 
             # Superscript
             rule(superscript: subtree(:superscript)) do
               content = Transformer.extract_simple_inline_content(superscript)
-              Model::Inline::Superscript.new(content:)
+              Model::Inline::Superscript.new(
+                content:,
+                source_line: SourceLineExtractor.extract(superscript)
+              )
             end
 
             # Subscript
             rule(subscript: subtree(:subscript)) do
               content = Transformer.extract_simple_inline_content(subscript)
-              Model::Inline::Subscript.new(content:)
+              Model::Inline::Subscript.new(
+                content:,
+                source_line: SourceLineExtractor.extract(subscript)
+              )
             end
 
             # Highlight (simple)
             rule(highlight: simple(:text)) do
-              Model::Highlight.new(content: text)
+              Model::Highlight.new(
+                content: text,
+                source_line: SourceLineExtractor.extract(text)
+              )
             end
             # Stem
             rule(stem: subtree(:stem)) do
               Coradoc::AsciiDoc::Model::Inline::Stem.new(
                 type: stem[:stem_type],
-                content: stem[:content]
+                content: stem[:content],
+                source_line: SourceLineExtractor.extract(stem)
               )
             end
           end

data/lib/coradoc/asciidoc/transformer/list_rules.rb

@@ -74,7 +74,8 @@ module Coradoc
               end
 
               Model::List::Item.new(
-                content: content, id:, marker:, attached:, nested:, line_break:
+                content: content, id:, marker:, attached:, nested:, line_break:,
+                source_line: SourceLineExtractor.extract(list_item)
               )
             end
 
@@ -85,26 +86,40 @@ module Coradoc
 
             # Unordered list
             rule(unordered: sequence(:list_items)) do
-              Model::List::Unordered.new(items: list_items)
+              Model::List::Unordered.new(
+                items: list_items,
+                source_line: SourceLineExtractor.extract(list_items)
+              )
             end
 
             rule(
               attribute_list: simple(:attribute_list),
               unordered: sequence(:list_items)
             ) do
-              Model::List::Unordered.new(items: list_items, attrs: attribute_list)
+              Model::List::Unordered.new(
+                items: list_items,
+                attrs: attribute_list,
+                source_line: SourceLineExtractor.extract(attribute_list)
+              )
             end
 
             # Ordered list
             rule(ordered: sequence(:list_items)) do
-              Model::List::Ordered.new(items: list_items)
+              Model::List::Ordered.new(
+                items: list_items,
+                source_line: SourceLineExtractor.extract(list_items)
+              )
             end
 
             rule(
               attribute_list: simple(:attribute_list),
               ordered: sequence(:list_items)
             ) do
-              Model::List::Ordered.new(items: list_items, attrs: attribute_list)
+              Model::List::Ordered.new(
+                items: list_items,
+                attrs: attribute_list,
+                source_line: SourceLineExtractor.extract(attribute_list)
+              )
             end
 
             # Definition list term (with optional anchor)

data/lib/coradoc/asciidoc/transformer/misc_rules.rb

@@ -12,16 +12,25 @@ module Coradoc
                    comment_text: simple(:comment_text),
                    line_break: simple(:line_break)
                  }) do
-              Model::CommentLine.new(text: comment_text, line_break: line_break)
+              Model::CommentLine.new(
+                text: comment_text,
+                line_break: line_break,
+                source_line: SourceLineExtractor.extract(comment_text)
+              )
             end
 
             rule(comment_block: { comment_text: simple(:comment_text) }) do
-              Model::CommentBlock.new(text: comment_text)
+              Model::CommentBlock.new(
+                text: comment_text,
+                source_line: SourceLineExtractor.extract(comment_text)
+              )
             end
 
             # Page break
             rule(page_break: simple(:page_break)) do
-              Model::Break::PageBreak.new
+              Model::Break::PageBreak.new(
+                source_line: SourceLineExtractor.extract(page_break)
+              )
             end
 
             # Tag
@@ -30,7 +39,8 @@ module Coradoc
                 name: tag[:name],
                 attrs: tag[:attribute_list],
                 line_break: tag[:line_break],
-                prefix: tag[:prefix]
+                prefix: tag[:prefix],
+                source_line: SourceLineExtractor.extract(tag)
               )
             end
 
@@ -45,7 +55,7 @@ module Coradoc
             end
 
             rule(positional: simple(:positional)) do
-              positional.to_s
+              positional
             end
 
             rule(attribute_array: nil) do
@@ -53,11 +63,16 @@ module Coradoc
             end
 
             rule(attribute_array: sequence(:attributes)) do
-              attr_list = Model::AttributeList.new
+              attr_list = Model::AttributeList.new(
+                source_line: SourceLineExtractor.extract(attributes)
+              )
               attributes.each do |a|
-                if a.is_a?(String)
+                case a
+                when Parslet::Slice
+                  attr_list.add_positional(a.to_s)
+                when String
                   attr_list.add_positional(a)
-                elsif a.is_a?(Model::Attribute)
+                when Model::Attribute
                   attr_list.add_named(a.key, a.value)
                 end
               end
@@ -104,7 +119,8 @@ module Coradoc
               Model::Include.new(
                 path: path.to_s,
                 attributes: attribute_list,
-                line_break: line_break
+                line_break: line_break,
+                source_line: SourceLineExtractor.extract(path)
               )
             end
 
@@ -119,7 +135,8 @@ module Coradoc
               Model::Audio.new(
                 src: path.to_s,
                 attributes: attribute_list,
-                line_break: line_break
+                line_break: line_break,
+                source_line: SourceLineExtractor.extract(path)
               )
             end
 
@@ -134,7 +151,8 @@ module Coradoc
               Model::Video.new(
                 src: path.to_s,
                 attributes: attribute_list,
-                line_break: line_break
+                line_break: line_break,
+                source_line: SourceLineExtractor.extract(path)
               )
             end
 
@@ -162,7 +180,8 @@ module Coradoc
                 date: attrs[:date],
                 from: attrs[:from],
                 to: attrs[:to],
-                content: Transformer.lines_to_text_elements(lines)
+                content: Transformer.lines_to_text_elements(lines),
+                source_line: SourceLineExtractor.extract(reviewer_note)
               )
             end
           end

data/lib/coradoc/asciidoc/transformer/source_line_extractor.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'parslet'
+
+module Coradoc
+  module AsciiDoc
+    class Transformer < Parslet::Transform
+      # Walks a Parslet AST subtree (Hash/Array/Slice/String/Model) and
+      # returns the 1-indexed source line of the first +Parslet::Slice+
+      # or Model::Base#source_line it finds.
+      #
+      # Parslet preserves byte offsets on every matched slice
+      # (+slice.line_and_column+ returns +[line, column]+); the
+      # transformer receives these slices in the AST but most rules
+      # discard the position when building Model objects. This helper
+      # recovers the start line of any subtree so transformer rules
+      # can populate +Model::Base#source_line+ without changing the
+      # parser.
+      #
+      # Handles two distinct shapes:
+      #   * Pre-transform AST (Hash/Array of Parslet::Slice) — used by
+      #     rules that bind raw slices via +simple(:x)+.
+      #   * Post-transform Model tree (Model::Base instances whose
+      #     +source_line+ was populated by an earlier rule) — used by
+      #     rules that bind via +subtree(:x)+ and receive already-
+      #     transformed content.
+      #
+      # Returns nil when no position is found (programmatic input,
+      # already-stripped ASTs, etc.) — callers should treat nil as
+      # "source position unavailable".
+      module SourceLineExtractor
+        module_function
+
+        def extract(node)
+          case node
+          when Parslet::Slice then line_of(node)
+          when Coradoc::AsciiDoc::Model::Base then node.source_line
+          when Hash then extract_from_hash(node)
+          when Array then extract_from_array(node)
+          else nil
+          end
+        end
+
+        def line_of(slice)
+          line, _column = slice.line_and_column
+          line
+        end
+
+        def extract_from_hash(hash)
+          hash.each_value do |value|
+            line = extract(value)
+            return line if line
+          end
+          nil
+        end
+
+        def extract_from_array(array)
+          array.each do |value|
+            line = extract(value)
+            return line if line
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/asciidoc/transformer/structural_rules.rb

@@ -72,6 +72,7 @@ module Coradoc
               opts = { rows: Transformer.regroup_table_rows(rows, attrs), attrs: attrs }
               opts[:id] = id if id
               opts[:title] = title unless title.nil? || title.empty?
+              opts[:source_line] = SourceLineExtractor.extract(table)
               Model::Table.new(**opts)
             end
 
@@ -84,7 +85,8 @@ module Coradoc
               Model::Title.new(
                 content: text,
                 level_int: level.size - 1,
-                line_break: line_break
+                line_break: line_break,
+                source_line: SourceLineExtractor.extract(level)
               )
             end
 
@@ -98,7 +100,8 @@ module Coradoc
                 content: text,
                 level_int: level.size - 1,
                 line_break: line_break,
-                id: name
+                id: name,
+                source_line: SourceLineExtractor.extract(name)
               )
             end
 
@@ -117,7 +120,8 @@ module Coradoc
                 id: id,
                 attribute_list: attribute_list,
                 contents: contents,
-                sections: sections
+                sections: sections,
+                source_line: SourceLineExtractor.extract(section)
               )
             end
 

data/lib/coradoc/asciidoc/transformer/text_rules.rb

@@ -9,7 +9,10 @@ module Coradoc
           transformer_class.class_eval do
             # Text Model
             rule(text: simple(:text)) do
-              Model::TextElement.new(content: text.to_s)
+              Model::TextElement.new(
+                content: text.to_s,
+                source_line: Transformer::SourceLineExtractor.extract(text)
+              )
             end
 
             rule(text_string: subtree(:text_string)) do
@@ -17,19 +20,34 @@ module Coradoc
             end
 
             rule(text: simple(:text), line_break: simple(:line_break)) do
-              Model::TextElement.new(content: text.to_s, line_break: line_break)
+              Model::TextElement.new(
+                content: text.to_s,
+                line_break: line_break,
+                source_line: Transformer::SourceLineExtractor.extract(text)
+              )
             end
 
             rule(text: sequence(:text), line_break: simple(:line_break)) do
-              Model::TextElement.new(content: text, line_break: line_break)
+              Model::TextElement.new(
+                content: text,
+                line_break: line_break,
+                source_line: Transformer::SourceLineExtractor.extract(text)
+              )
             end
 
             rule(id: simple(:id), text: simple(:text)) do
-              Model::TextElement.new(content: text.to_s, id: id.to_s)
+              Model::TextElement.new(
+                content: text.to_s,
+                id: id.to_s,
+                source_line: Transformer::SourceLineExtractor.extract(id)
+              )
             end
 
             rule(text: sequence(:text)) do
-              Model::TextElement.new(content: text)
+              Model::TextElement.new(
+                content: text,
+                source_line: Transformer::SourceLineExtractor.extract(text)
+              )
             end
 
             rule(
@@ -40,7 +58,8 @@ module Coradoc
               Model::TextElement.new(
                 content: text.to_s,
                 id: id.to_s,
-                line_break: line_break
+                line_break: line_break,
+                source_line: Transformer::SourceLineExtractor.extract(id)
               )
             end
 
@@ -52,13 +71,17 @@ module Coradoc
               Model::TextElement.new(
                 content: text,
                 id: id.to_s,
-                line_break: line_break
+                line_break: line_break,
+                source_line: Transformer::SourceLineExtractor.extract(id)
               )
             end
 
             # Line break
             rule(line_break: simple(:line_break)) do
-              Model::LineBreak.new(line_break:)
+              Model::LineBreak.new(
+                line_break:,
+                source_line: Transformer::SourceLineExtractor.extract(line_break)
+              )
             end
 
             # Unparsed text
@@ -72,7 +95,8 @@ module Coradoc
                 content: Transformer.lines_to_text_elements(paragraph[:lines]),
                 id: paragraph[:id],
                 attributes: paragraph[:attribute_list],
-                title: paragraph[:title]
+                title: paragraph[:title],
+                source_line: Transformer::SourceLineExtractor.extract(paragraph)
               )
             end
           end

data/lib/coradoc/asciidoc/transformer.rb

@@ -33,6 +33,7 @@ module Coradoc
       autoload :BlockTypeClassifier, "#{__dir__}/transformer/block_type_classifier"
       autoload :TableLayout, "#{__dir__}/transformer/table_layout"
       autoload :TableCellBuilder, "#{__dir__}/transformer/table_cell_builder"
+      autoload :SourceLineExtractor, "#{__dir__}/transformer/source_line_extractor"
 
       # Apply all rule modules (triggers autoload)
       HeaderRules.apply(self)
@@ -139,7 +140,11 @@ module Coradoc
                           text_content
                         end
 
-          Model::TextElement.new(content: transformed, line_break: line[:line_break])
+          Model::TextElement.new(
+            content: transformed,
+            line_break: line[:line_break],
+            source_line: SourceLineExtractor.extract(line)
+          )
         end
       end
 

data/lib/coradoc/asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module AsciiDoc
-    VERSION = '2.0.23'
+    VERSION = '2.0.24'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-adoc
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.24
 platform: ruby
 authors:
 - Ribose Inc.
@@ -343,6 +343,7 @@ files:
 - lib/coradoc/asciidoc/transformer/inline_rules.rb
 - lib/coradoc/asciidoc/transformer/list_rules.rb
 - lib/coradoc/asciidoc/transformer/misc_rules.rb
+- lib/coradoc/asciidoc/transformer/source_line_extractor.rb
 - lib/coradoc/asciidoc/transformer/structural_rules.rb
 - lib/coradoc/asciidoc/transformer/table_cell_builder.rb
 - lib/coradoc/asciidoc/transformer/table_layout.rb