coradoc-adoc 2.0.23 → 2.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69bc04902f8020decc17928a5397de2876f060ed8ee36de95f0920ba6312e8b4
-  data.tar.gz: ca56574d1b78863a574551732397ff65944f2b012781def3bb4ea4bcf8b0aaf1
+  metadata.gz: 4ecb988af13f918e49f0249e3691e22fd98f21beffd3f0e2d6c98affc39d64dc
+  data.tar.gz: 4db6ab5b2227364c2092f00b40167fa054ed1dd43592150baf1c745e39f98a09
 SHA512:
-  metadata.gz: 708cf53d7a9c6de58e15aac99a1e77343e004b7d014697335cd91f96143584b0701235e84030948a5ab6a09eba8612a361b215b1be9707ca07943d3f7179ad09
-  data.tar.gz: ff60d697d4fff0ec229ca5b597f1fe2f37d34129bff79f10276b72824ecd418f770d9229800dee6f143f95345af0c1432aceb100385b6c578fd08abb01a3767a
+  metadata.gz: 26ea9aeac36925a4ce0df0221ffba1e0c5ba41fc33de0b8c0937229e353f2f758e101a873e0eab76ed46408fe71990c0001088612ecef50c0f3a22fba17646db
+  data.tar.gz: 2a7a709b48e9c0764c12b5a54be0846ecd08551245e92dd6028deb881c1ebff634514445a72cf28d24a6e31a5bdd90b12c6519e523e440977a7bfe9f767949a5

data/lib/coradoc/asciidoc/builder/detection.rb

@@ -70,10 +70,10 @@ module Coradoc
             return false
           end
 
-          key = "#{format_type}_constrained".to_sym
+          key = :"#{format_type}_constrained"
           return true if ast.key?(key)
 
-          unconstrained_key = "#{format_type}_unconstrained".to_sym
+          unconstrained_key = :"#{format_type}_unconstrained"
           return false if ast.key?(unconstrained_key)
 
           true
@@ -158,8 +158,8 @@ module Coradoc
         def extract_inline_content(ast, format_type)
           content_key = format_type.to_sym
           content = ast[content_key] ||
-                    ast["#{format_type}_constrained".to_sym] ||
-                    ast["#{format_type}_unconstrained".to_sym]
+                    ast[:"#{format_type}_constrained"] ||
+                    ast[:"#{format_type}_unconstrained"]
 
           extract_text_content(content)
         end

data/lib/coradoc/asciidoc/model/attribute_list/matchers.rb

@@ -5,8 +5,8 @@ module Coradoc
     module Model
       class AttributeList < Base
         module Matchers
-          def one(*args)
-            One.new(*args)
+          def one(*)
+            One.new(*)
           end
 
           class One
@@ -19,8 +19,8 @@ module Coradoc
             end
           end
 
-          def many(*args)
-            Many.new(*args)
+          def many(*)
+            Many.new(*)
           end
 
           # NOTE: The Many matcher validates that all values in an array/string match

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/model/block/core.rb

@@ -54,7 +54,7 @@ module Coradoc
           include Coradoc::AsciiDoc::Model::Anchorable
 
           attribute :id, :string
-          attribute :title, :string, default: -> { nil } # Polymorphic: string or array of Model objects
+          attribute :title, :string, default: -> {} # Polymorphic: string or array of Model objects
           attribute :attributes, Coradoc::AsciiDoc::Model::AttributeList, default: lambda {
             Coradoc::AsciiDoc::Model::AttributeList.new
           }

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

@@ -86,8 +86,8 @@ module Coradoc
         # @example Iterate
         #   content.each { |item| puts item }
         #
-        def each(&block)
-          @items.each(&block)
+        def each(&)
+          @items.each(&)
         end
 
         # Add an item to the content
@@ -199,8 +199,8 @@ module Coradoc
         # @example Map
         #   content.map(&:class) # => [String, Bold, String]
         #
-        def map(&block)
-          @items.map(&block)
+        def map(&)
+          @items.map(&)
         end
 
         # Select items matching predicate
@@ -211,8 +211,8 @@ module Coradoc
         # @example Select strings
         #   content.select { |i| i.is_a?(String) }
         #
-        def select(&block)
-          @items.select(&block)
+        def select(&)
+          @items.select(&)
         end
 
         # Reject items matching predicate
@@ -220,8 +220,8 @@ module Coradoc
         # @yield [Object] Each item
         # @return [Array] Remaining items
         #
-        def reject(&block)
-          @items.reject(&block)
+        def reject(&)
+          @items.reject(&)
         end
 
         # Check if content includes an item

data/lib/coradoc/asciidoc/model/inline/bold.rb

@@ -25,7 +25,7 @@ module Coradoc
         class Bold < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/inline/highlight.rb

@@ -23,7 +23,7 @@ module Coradoc
         class Highlight < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/inline/italic.rb

@@ -25,7 +25,7 @@ module Coradoc
         class Italic < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/inline/monospace.rb

@@ -26,7 +26,7 @@ module Coradoc
         class Monospace < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/inline/strikethrough.rb

@@ -25,12 +25,12 @@ module Coradoc
         class Strikethrough < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array
                     ]
-          attribute :text, :string, default: -> { nil }
+          attribute :text, :string, default: -> {}
           attribute :unconstrained, :boolean, default: -> { false }
         end
       end

data/lib/coradoc/asciidoc/model/inline/subscript.rb

@@ -21,7 +21,7 @@ module Coradoc
         class Subscript < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/inline/superscript.rb

@@ -21,7 +21,7 @@ module Coradoc
         class Superscript < Base
           attribute :content,
                     Lutaml::Model::Serializable,
-                    default: -> { nil },
+                    default: -> {},
                     polymorphic: [
                       Lutaml::Model::Type::String,
                       :array

data/lib/coradoc/asciidoc/model/serialization/asciidoc_mapping.rb

@@ -6,8 +6,7 @@ module Coradoc
       module Serialization
         # Define the DSL for defining mappings in Asciidoc format
         class AsciidocMapping < Lutaml::Model::Mapping
-          attr_reader :mappings
-          attr_writer :mappings
+          attr_accessor :mappings
 
           def initialize
             super
@@ -33,8 +32,8 @@ module Coradoc
 
           private
 
-          def add_mapping(name, to, **options)
-            @mappings << AsciidocMappingRule.new(name, to: to, **options)
+          def add_mapping(name, to, **)
+            @mappings << AsciidocMappingRule.new(name, to: to, **)
           end
         end
       end

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

@@ -3,6 +3,16 @@
 module Coradoc
   module AsciiDoc
     module Model
+      # Single source of truth for the markers AsciiDoc uses to terminate
+      # a TextElement. Exposed as a module so the transformer can compare
+      # against the constant without hand-writing string literals across
+      # the codebase (DRY), and so future markers (e.g. a hypothetical
+      # backslash-style hard break) extend one place.
+      module LineBreakMarker
+        HARD = '+'
+      end
+      private_constant :LineBreakMarker
+
       class TextElement < Base
         def inline?
           true
@@ -18,6 +28,18 @@ module Coradoc
                   ]
         attribute :line_break, :string, default: -> { '' }
 
+        # Semantic predicates over the line-break marker. Consumers (the
+        # transformer, the serializer) call these instead of comparing
+        # line_break against literal strings, so the wire format for
+        # hard breaks is owned by the model layer (SRP).
+        def hard_break?
+          line_break == LineBreakMarker::HARD
+        end
+
+        def soft_break?
+          line_break.to_s.empty?
+        end
+
         def self.escape_keychars(string)
           subs = { '*' => '\*', '_' => '\_' }
           string

data/lib/coradoc/asciidoc/parser/block.rb

@@ -73,14 +73,14 @@ module Coradoc
           closing_fence = dynamic do |_s, c|
             str(c.captures[capture_key].to_s.strip)
           end
-          language = (space? >> match("[A-Za-z0-9_+.-]").repeat(1).as(:language)).maybe
+          language = (space? >> match('[A-Za-z0-9_+.-]').repeat(1).as(:language)).maybe
 
           block_content_with_closing = dynamic do |_s, c|
-            fence_str = c.captures[capture_key].to_s.strip
+            c.captures[capture_key].to_s.strip
             closing_pattern = closing_fence >> space? >> newline
 
             content = text_line(false, unguarded: true, verbatim: true) |
-                        empty_line.as(:line_break)
+                      empty_line.as(:line_break)
 
             (closing_pattern.absent? >> content).repeat(1)
           end

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