coradoc-markdown 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 007d0f6cb59531d5677c8775118fa2e676f811b067b725170963a64d727235da
-  data.tar.gz: ca79c3da61050874894e5815cf03c5cce54711781ae51c5c4971cb5b56d36040
+  metadata.gz: bdce5853004d12a0dde16c5e512cdb8ce689babaa65b64ec2b64c6dd69b0b245
+  data.tar.gz: 27c0c58e7ca3b4ed423fc072730442915be12d435f5eb09e58181e15824ba45f
 SHA512:
-  metadata.gz: e551c841bc950973c7a96274e77f31b450916cfcd4bc989dd6f425688d493898318f6ac545dc537b1cf584fa7f6d3d8d8fa9c7a00b47750d7407abf2419494b9
-  data.tar.gz: c75199d663605c880367231f1f3779480ac7582610d55983a0bedced93b513041bedf8d190066c8d6bacd3220ec6646b9a7b0e57ceb00bbde7ed138dd462cae0
+  metadata.gz: 32fdb2bf2484781c0d704300eba6b7d60e15c3980f6468252c621f3884b8abee17a5da7283fd0197a1c76f84a3d033538d41f818f2f1ae356071a602a30a203b
+  data.tar.gz: 72b5e70e3aec45b3670727fcff8439cb0ef520d2019f91c71c753b3dfb14e39648e3e3c66ed02429f3bb099465e61dc0568c4ef496745680b1b3d870c9b0a946

data/lib/coradoc/markdown/model/definition_item.rb

@@ -14,8 +14,10 @@ module Coradoc
       # The definition content (text or nested blocks)
       attribute :content, :string
 
-      # Inline content can be an array of text/inline elements
-      attribute :inline_content, :string, collection: true
+      # Inline content as typed Markdown elements (Code, Strong, Text, etc.).
+      # When present, the Flat serializer renders these via
+      # `ctx.serialize_inline_join` so inline formatting is preserved.
+      attribute :inline_content, Coradoc::Markdown::Base, collection: true, default: []
 
       # Nested block content (paragraphs, code blocks, lists, etc.)
       attribute :blocks, :string, collection: true

data/lib/coradoc/markdown/model/definition_term.rb

@@ -15,16 +15,22 @@ module Coradoc
       attribute :text, :string
       attribute :definitions, Coradoc::Markdown::DefinitionItem, collection: true, default: []
 
+      # Typed inline children for the term (Code, Strong, Text, etc.).
+      # When present, the Flat serializer renders these via
+      # `ctx.serialize_inline_join` so inline formatting is preserved.
+      attribute :text_children, Coradoc::Markdown::Base, collection: true, default: []
+
       # Optional nested definition list under this term.
       # When present, the flat-PHP-Markdown-Extra syntax is no longer
       # sufficient and the serializer falls back to HTML <dl>/<dt>/<dd>.
       attribute :nested, Coradoc::Markdown::DefinitionList
 
-      def initialize(text: '', definitions: [], nested: nil, **rest)
+      def initialize(text: '', definitions: [], nested: nil, text_children: [], **rest)
         super
         @text = text
         @definitions = definitions
         @nested = nested
+        @text_children = Array(text_children)
       end
     end
   end

data/lib/coradoc/markdown/model/example_block.rb

@@ -15,11 +15,13 @@ module Coradoc
     class ExampleBlock < Base
       attribute :content, :string
       attribute :caption, :string
+      attribute :children, Coradoc::Markdown::Base, collection: true, default: []
 
-      def initialize(content:, caption: nil, **rest)
+      def initialize(content:, caption: nil, children: [], **rest)
         super
         @content = content
         @caption = caption
+        @children = Array(children)
       end
     end
   end

data/lib/coradoc/markdown/serializer/serializers/example_block.rb

@@ -15,23 +15,31 @@ module Coradoc
           handles_type ::Coradoc::Markdown::ExampleBlock
 
           def call(element, ctx)
+            body = render_body(element, ctx)
             if ctx.config.admonition_style == :container
-              render_container(element)
+              render_container(element, body)
             else
-              render_html(element)
+              render_html(element, body)
             end
           end
 
           private
 
-          def render_html(element)
+          def render_body(element, ctx)
+            return element.content.to_s if element.children.nil? || element.children.empty?
+
+            element.children.map { |c| ctx.serialize(c) }.join("\n\n")
+          end
+
+          def render_html(element, body)
             caption_html = element.caption ? %(<h4>Example: #{element.caption}</h4>\n) : ''
-            %(<div class="example">\n#{caption_html}<p>#{element.content.to_s}</p>\n</div>)
+            inner = element.children&.any? ? body : "<p>#{body}</p>"
+            %(<div class="example">\n#{caption_html}#{inner}\n</div>)
           end
 
-          def render_container(element)
+          def render_container(element, body)
             title = element.caption ? " Example: #{element.caption}" : ''
-            ":::details#{title}\n#{element.content.to_s}\n:::"
+            ":::details#{title}\n#{body}\n:::"
           end
         end
       end

data/lib/coradoc/markdown/serializer/strategies/definition_list/flat.rb

@@ -24,11 +24,11 @@ module Coradoc
                 list.items.none? { |term| term.nested }
               end
 
-              def render(list, _ctx)
+              def render(list, ctx)
                 list.items.map do |term|
-                  lines = [term.text.to_s]
+                  lines = [render_term(term, ctx)]
                   term.definitions.each do |defn|
-                    content_str = defn.content.to_s
+                    content_str = render_definition(defn, ctx)
                     content_str.lines.each_with_index do |line, i|
                       stripped = line.rstrip
                       next if i.positive? && stripped.empty?
@@ -39,6 +39,22 @@ module Coradoc
                   lines.join("\n")
                 end.join("\n\n")
               end
+
+              private
+
+              def render_term(term, ctx)
+                children = term.text_children
+                return term.text.to_s if children.nil? || children.empty?
+
+                ctx.serialize_inline_join(children)
+              end
+
+              def render_definition(defn, ctx)
+                children = defn.inline_content
+                return defn.content.to_s if children.nil? || children.empty?
+
+                ctx.serialize_inline_join(children)
+              end
             end
           end
         end

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

@@ -232,9 +232,11 @@ module Coradoc
           end
 
           def transform_example_block(block)
+            children = Array(block.children).map { |c| transform(c) }.flat_map { |c| flatten_result(c) }
             Coradoc::Markdown::ExampleBlock.new(
               content: block.flat_text,
-              caption: block.title.to_s
+              caption: block.title.to_s,
+              children: children
             )
           end
 
@@ -410,13 +412,13 @@ module Coradoc
 
           def transform_definition_list(dl)
             items = Array(dl.items).map do |item|
-              definitions = Array(item.definitions).map do |defn|
-                Coradoc::Markdown::DefinitionItem.new(content: defn.to_s)
-              end
+              definition = build_definition_item(item)
               nested = item.nested ? transform_definition_list(item.nested) : nil
+              term_children = Array(item.term_children).map { |c| transform_inline_content(c) }
               Coradoc::Markdown::DefinitionTerm.new(
                 text: item.term.to_s,
-                definitions: definitions,
+                text_children: term_children,
+                definitions: [definition],
                 nested: nested
               )
             end
@@ -424,6 +426,20 @@ module Coradoc
             Coradoc::Markdown::DefinitionList.new(items: items)
           end
 
+          def build_definition_item(item)
+            children = Array(item.definition_children)
+            if children.empty?
+              content = item.definitions&.first&.to_s
+              return Coradoc::Markdown::DefinitionItem.new(content: content)
+            end
+
+            inline = children.map { |c| transform_inline_content(c) }
+            Coradoc::Markdown::DefinitionItem.new(
+              content: item.definitions&.first&.to_s,
+              inline_content: inline
+            )
+          end
+
           def transform_footnote(fn)
             Coradoc::Markdown::Footnote.new(
               id: fn.id.to_s,

data/lib/coradoc/markdown/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module Markdown
-    VERSION = '1.0.4'
+    VERSION = '1.0.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-markdown
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Ribose Inc.