coradoc-adoc 2.0.15 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 258eb5dcb2991ad51c70456519c056ae29672aeee86cde93e5eeb20a32d5427d
-  data.tar.gz: c19119a118adc0121d5d627287bd435349a09647636729a57dd0ce005de5a2f1
+  metadata.gz: e3b72474cf0652bc8f5702011009cab0caeb9dd5180a6f17510a2e081286951d
+  data.tar.gz: 8218895ed5672fe9932747a025c54621ba02870daea6f964b1cc28d506968a1d
 SHA512:
-  metadata.gz: e7defb7e91f6db2f0b09d1a433d4f662254ebcb93c01125a419127881b9e15854c3f78c226b203dc8d818fc3c8d5f8615c05edfed2afced0f4f273881078b150
-  data.tar.gz: 17cc53fb4f42adcd77e2817a04087c2f49eec3643010905fecf1dfab887b936780a7a1b9e665bcbdd90a296b3fbaa7a070a7e98098364e87b7dda25d1d8879d9
+  metadata.gz: 46c11254ea13b32498f66d11eb0ead0d13df136f7a0cca65e701373cf48f1edf9d9e1beb447553ddc1a14e4459052d559038aa1b6edb580731a6f91d27969616
+  data.tar.gz: 3d6b4701f38cfd0042bcd14d77d094c6c48626bc85ffab3557a274f2fd90041d1df95f37a156a18ef7a73e8d2d9d4900f8048c8c8d021425ddd8ec38a587db84

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

@@ -35,11 +35,16 @@ module Coradoc
 
         # Walks the input children left-to-right. When a paragraph whose
         # content is composed entirely of `<N> text` lines follows a
-        # verbatim block (SourceBlock or ListingBlock), each `<N>` line
-        # becomes a Callout attached to that block instead of a separate
-        # paragraph.
+        # verbatim block (SourceBlock, ListingBlock, LiteralBlock), each
+        # `<N>` line becomes a Callout attached to that block instead of
+        # a separate paragraph.
         #
-        # Annotations that do not follow a verbatim block are preserved
+        # Annotations that follow any other block (e.g. a Table) cannot
+        # attach as Callouts — those blocks don't carry callouts. Convert
+        # the paragraph to an ordered ListBlock so the downstream
+        # serializer renders `1. text` instead of leaking `<N>` markers.
+        #
+        # Annotations with no preceding block at all are preserved
         # verbatim — they may be legitimate prose.
         def merge(children)
           children.each.with_object([]) do |child, result|
@@ -47,6 +52,8 @@ module Coradoc
             target = annotations && preceding_verbatim_block(result)
             if target
               target.callouts.concat(annotations)
+            elsif annotations && result.any?
+              result << callout_list(annotations)
             else
               result << child
             end
@@ -55,6 +62,21 @@ module Coradoc
 
         private
 
+        def callout_list(annotations)
+          ordered = annotations.sort_by { |c| c.index || Float::INFINITY }
+          items = ordered.map do |callout|
+            Coradoc::CoreModel::ListItem.new(
+              marker: '.',
+              content: callout.content.to_s
+            )
+          end
+          Coradoc::CoreModel::ListBlock.new(
+            marker_type: 'ordered',
+            marker_level: 1,
+            items: items
+          )
+        end
+
         # Returns an Array of Callout if the paragraph is entirely
         # callout annotations, otherwise nil.
         def extract_annotations(child)

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

@@ -150,10 +150,19 @@ module Coradoc
                 )
               else
                 content_lines = lines.map { |line| ToCoreModel.extract_text_content(line) }.join("\n")
+                children = lines.map do |line|
+                  inline = ToCoreModel.transform_inline_content(line)
+                  inline = [Coradoc::CoreModel::TextContent.new(text: "")] if inline.empty?
+                  Coradoc::CoreModel::ParagraphBlock.new(
+                    content: ToCoreModel.extract_text_content(line),
+                    children: Array(inline)
+                  )
+                end
                 klass.new(
                   id: block.id,
                   title: ToCoreModel.extract_title_text(block.title),
                   content: content_lines,
+                  children: children,
                   language: ToCoreModel.extract_block_language(block),
                   **extra_attrs
                 )

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

@@ -426,6 +426,8 @@ module Coradoc
               content
             when Array
               content.map { |item| safe_content_to_string(item) }.join
+            when Coradoc::CoreModel::Base
+              content.flat_text
             when Lutaml::Model::Serializable
               if content.is_a?(Coradoc::AsciiDoc::Model::Base)
                 content.to_adoc

data/lib/coradoc/asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module AsciiDoc
-    VERSION = '2.0.15'
+    VERSION = '2.0.16'
   end
 end

metadata

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