coradoc-adoc 2.0.25 → 2.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ecb988af13f918e49f0249e3691e22fd98f21beffd3f0e2d6c98affc39d64dc
-  data.tar.gz: 4db6ab5b2227364c2092f00b40167fa054ed1dd43592150baf1c745e39f98a09
+  metadata.gz: ac328212768fb69c29726e260db2af252ebb60fff81682bb7eed8ad9984bee1a
+  data.tar.gz: 4b5af72762fcbf96fe40594cd4b849e328b2fe03cc027aa37e08435869656c1c
 SHA512:
-  metadata.gz: 26ea9aeac36925a4ce0df0221ffba1e0c5ba41fc33de0b8c0937229e353f2f758e101a873e0eab76ed46408fe71990c0001088612ecef50c0f3a22fba17646db
-  data.tar.gz: 2a7a709b48e9c0764c12b5a54be0846ecd08551245e92dd6028deb881c1ebff634514445a72cf28d24a6e31a5bdd90b12c6519e523e440977a7bfe9f767949a5
+  metadata.gz: 26ad434a7f144350750011ccca8a932c193ed9687c001080ce6549edcbdb1c16f2d072eb3d62dd0fa825eb744707beae7cb24be4876e03ac1054b2dffa2eaecf
+  data.tar.gz: bf54821072c38fc983b68be86fca0d0cd46b6358b6b2239d84697cff44aadf3ab4cc5cc88a03760b29d78929568c874367a90cb9ad9c0d3c6405fa512795ea05

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

@@ -3,19 +3,29 @@
 module Coradoc
   module AsciiDoc
     module Parser
-      # Single Responsibility: parse the optional header that precedes a block.
+      # Single Responsibility: parse the optional header that precedes a
+      # structural element (block or section).
       #
-      # Encapsulates the canonical AsciiDoc block-header grammar in one place
-      # (DRY, MECE, single source of truth). Before this module existed, every
-      # block-like rule (block, table, section, paragraph, block_image) inlined
-      # its own header rule with subtly different slot orderings — and several
-      # of them captured the same Parslet key more than once in a single
-      # sequence, which triggered Parslet's "Duplicate subtrees while merging
-      # result" warning and silently discarded one of the captured values.
+      # Encapsulates the canonical AsciiDoc header grammar in one place
+      # (DRY, MECE, single source of truth). Two flavours live here because
+      # blocks and sections have different header grammars:
       #
-      # Canonical header shape, each component at most once:
+      #   block_header   = block_title? >> element_id? >> attribute_blocks?
+      #   section_header =                    element_id? >> attribute_blocks?
       #
-      #   block_title? >> element_id? >> attribute_blocks?
+      # Asciidoctor does NOT permit `.Title` to apply to a section — sections
+      # accept `[role]` attribute lists and `[[id]]` anchors but not block
+      # titles. The section's heading IS its title. Mixing the two shapes
+      # into one rule caused `section_block` to admit `.Foo` lines that
+      # collided with `section_title`'s `:title` capture, triggering
+      # Parslet's "Duplicate subtrees while merging result … (keys:
+      # [:title])" warning and silently dropping the block title.
+      #
+      # Before this module existed, every block-like rule inlined its own
+      # header rule with subtly different slot orderings — and several
+      # captured the same Parslet key more than once in a single sequence,
+      # which triggered Parslet's "Duplicate subtrees" warning and silently
+      # discarded one of the captured values.
       #
       # `attribute_blocks` accepts one or more consecutive `[...]` attribute
       # lists, captured as a Parslet sequence under the :attribute_list key.
@@ -31,8 +41,11 @@ module Coradoc
       # every attribute and lets the transformer merge them into a single
       # Coradoc::AsciiDoc::Model::AttributeList downstream.
       module BlockHeader
-        # Canonical block header rule. Single canonical order; each of title,
-        # id, and attribute_blocks is optional and matched at most once.
+        # Canonical block header rule. Includes the block title — every
+        # real block (delimited block, table, paragraph, image) accepts
+        # an optional `.Title` line before its body. Single canonical
+        # order; each of title, id, and attribute_blocks is optional and
+        # matched at most once.
         # @return [Parslet::Atoms::Base]
         def block_header
           block_title.maybe >>
@@ -40,6 +53,16 @@ module Coradoc
             attribute_blocks.maybe
         end
 
+        # Section header rule. Asciidoctor does not permit `.Title` on
+        # sections — the section heading itself is the title. Sections
+        # still accept the same element_id and attribute_blocks slots
+        # that blocks do (`[[anchor]]`, `[appendix]`, `[role=x]`, etc.).
+        # @return [Parslet::Atoms::Base]
+        def section_header
+          element_id.maybe >>
+            attribute_blocks.maybe
+        end
+
         # One or more consecutive attribute_list + newline sequences, captured
         # as a Parslet sequence under :attribute_list. When multiple `[...]`
         # blocks precede a delimiter, all of them reach the transformer; when

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

@@ -71,7 +71,7 @@ module Coradoc
 
         def monospace_constrained
           (str('`') >>
-            match('[^`\n]').repeat(1).as(:text).repeat(1, 1) >>
+            constrained_span_content('`').as(:text).repeat(1, 1) >>
              str('`') >> str('`').absent?
           ).as(:monospace_constrained)
         end
@@ -236,6 +236,27 @@ module Coradoc
           ).repeat(1)
         end
 
+        # Content model for a constrained inline span (`` `…` ``, `*…*`,
+        # `_…_`, `#…#`). Allows the corresponding unconstrained marker
+        # pair (`` `` ``, `**`, `__`, `##`) to appear inside the content
+        # rather than terminating the span at the first marker character.
+        #
+        # Asciidoctor treats the contents of a constrained span as an
+        # inline literal — nested constrained markers do not close the
+        # span. Without this allowance, `` `<<\`\`x\`\`>>` `` fails to
+        # match as a single monospace span: the parser sees the inner
+        # `` `` `` as a failed single-backtick close attempt, backtracks
+        # out of `monospace_constrained`, and the `<<…>>` payload then
+        # fires the `cross_reference` rule with the backticks glued
+        # onto the target.
+        #
+        # Single source of truth for every constrained rule's content
+        # model — adding a new constrained marker reuses this helper
+        # rather than re-spelling the alternation (DRY).
+        def constrained_span_content(marker)
+          (match("[^#{marker}\n]") | str(marker * 2)).repeat(1)
+        end
+
         def text_formatted
           (inline_chars? >> inline)
         end

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

@@ -27,7 +27,7 @@ module Coradoc
         def section_block(level = 2)
           return nil if level > 8
 
-          block_header >>
+          section_header >>
             section_title(level).as(:title) >>
             contents.as(:contents).maybe
         end

data/lib/coradoc/asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module AsciiDoc
-    VERSION = '2.0.25'
+    VERSION = '2.0.27'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-adoc
 version: !ruby/object:Gem::Version
-  version: 2.0.25
+  version: 2.0.27
 platform: ruby
 authors:
 - Ribose Inc.