coradoc-markdown 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8787bd4fa185e797413467515c62bcd103651592e9ef33a6c6d9afe07f087c5c
-  data.tar.gz: e63120ad791f193d3a09711da9345788482ae6076bc8a173d97b863b6273b69f
+  metadata.gz: 45a195eaddedba173983f2ba2ab08ce81044fe089124b8287b4a643262dbc6f8
+  data.tar.gz: b163677948cdc8459692c411c2840f2bfa0cfe401e47453d61e88d156bbfc910
 SHA512:
-  metadata.gz: 707ffce48956d79723b12c6112ff9237f5149037f830f37b32ad2905e6ea1ad8b0456d888ce7d4cf74315d54e9e4fab37287e44cb7d38d363318bae9f13d8a25
-  data.tar.gz: 5ef6ac646dac9047440649ad153e0bbd8300caa29633c8b41e1bcf58c09e5eee034a2aec0e63be3e4c4d5c423dca02a488d6f9912711f576f9a9d8288b3b4541
+  metadata.gz: 3b6c63bf4e97c80a63c4f6289576f80577434d6aa8176aafd3067c026abbad4c9ab72fbe509e936933f60ef6cf02c7e3b6087efab353f541618ffe75d6c93ad1
+  data.tar.gz: 0a7a78dc0d92fd3c03344df7a6063429b443dcacfc760686a7d3080b6df7daff9b873251a1576d73307bbacfa8e642e08e02561625f6cfcd2d493f524843dd4b

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

@@ -27,14 +27,13 @@ module Coradoc
       # Mixed inline content (strings and inline model objects) carried
       # from the CoreModel children so serializers can preserve cross
       # references, code spans, etc. When empty, fall back to `content`.
-      attr_reader :children
+      attribute :children, Coradoc::Markdown::Base, collection: true, default: []
 
-      def initialize(admonition_type:, content:, title: nil, children: [], **rest)
-        super
-        @admonition_type = admonition_type.to_s.downcase
-        @content = content
-        @title = title
-        @children = Array(children)
+      # Normalize type on assignment. Callers can pass "NOTE", "Note",
+      # or "note" — storage is always lowercase so downstream comparison
+      # and CSS class generation don't need to repeat the normalization.
+      def admonition_type=(value)
+        super(value.to_s.downcase)
       end
     end
   end

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

@@ -11,11 +11,6 @@ module Coradoc
     #
     class Blockquote < Base
       attribute :content, :string
-
-      def initialize(content: '')
-        super()
-        @content = content
-      end
     end
   end
 end

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

@@ -13,12 +13,6 @@ module Coradoc
     class CodeBlock < Base
       attribute :language, :string
       attribute :code, :string
-
-      def initialize(language: nil, code: '')
-        super()
-        @language = language
-        @code = code
-      end
     end
   end
 end

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

@@ -11,4 +11,4 @@ module Coradoc
       attribute :text, :string
     end
   end
-end
+end

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

@@ -24,14 +24,6 @@ module Coradoc
       # 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, text_children: [], **rest)
-        super
-        @text = text
-        @definitions = definitions
-        @nested = nested
-        @text_children = Array(text_children)
-      end
     end
   end
 end

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

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

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

@@ -11,12 +11,6 @@ module Coradoc
       attribute :level, :integer, default: 1
       attribute :text, :string
 
-      def initialize(level: 1, text: '')
-        super()
-        @level = level
-        @text = text
-      end
-
       # Generate an auto ID from the heading text
       #
       # @return [String] A slugified version of the text suitable for use as an ID

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

@@ -8,22 +8,7 @@ module Coradoc
       attribute :text, :string
       attribute :checked, :boolean # For task lists (- [ ] or - [x])
       attribute :sublist, Coradoc::Markdown::List # Nested list
-
-      # Mixed content (strings and inline model objects)
-      # @return [Array] mixed content array
-      attr_reader :children
-
-      def initialize(args = {})
-        super()
-        @text = args[:text] || ''
-        @checked = args[:checked]
-        @sublist = args[:sublist]
-        @children = args.fetch(:children, [])
-      end
-
-      def children=(value)
-        @children = value || []
-      end
+      attribute :children, Coradoc::Markdown::Base, collection: true, default: []
     end
   end
 end

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

@@ -11,11 +11,6 @@ module Coradoc
     # Markdown: indented code block (4 leading spaces per line).
     class Literal < Base
       attribute :content, :string
-
-      def initialize(content:, **rest)
-        super
-        @content = content
-      end
     end
   end
 end

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

@@ -12,11 +12,6 @@ module Coradoc
     #   - With id/classes    → emit `<div id="...">...</div>` wrapper
     class OpenBlock < Base
       attribute :children, Coradoc::Markdown::Base, collection: true, default: []
-
-      def initialize(children: [], **rest)
-        super
-        @children = Array(children)
-      end
     end
   end
 end

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

@@ -9,20 +9,7 @@ module Coradoc
     #
     class Paragraph < Base
       attribute :text, :string
-
-      # Mixed content (strings and inline model objects)
-      # @return [Array] mixed content array
-      attr_reader :children
-
-      def initialize(text: '', children: [])
-        super()
-        @text = text
-        @children = children
-      end
-
-      def children=(value)
-        @children = value || []
-      end
+      attribute :children, Base, collection: true, default: []
     end
   end
 end

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

@@ -11,11 +11,6 @@ module Coradoc
     # inside a `nomarkdown` kramdown extension or raw HTML passthrough.
     class Pass < Base
       attribute :content, :string
-
-      def initialize(content:, **rest)
-        super
-        @content = content
-      end
     end
   end
 end

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

@@ -13,13 +13,6 @@ module Coradoc
       attribute :content, :string
       attribute :title, :string
       attribute :children, Coradoc::Markdown::Base, collection: true, default: []
-
-      def initialize(content:, title: nil, children: [], **rest)
-        super
-        @content = content
-        @title = title
-        @children = Array(children)
-      end
     end
   end
 end

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

@@ -15,13 +15,6 @@ module Coradoc
       attribute :content, :string
       attribute :attribution, :string
       attribute :citetitle, :string
-
-      def initialize(content:, attribution: nil, citetitle: nil, **rest)
-        super
-        @content = content
-        @attribution = attribution
-        @citetitle = citetitle
-      end
     end
   end
 end

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

@@ -13,9 +13,7 @@ module Coradoc
             marker = element.ordered ? '1.' : '-'
             element.items.flat_map do |item|
               lines = [render_item(item, marker, _ctx)]
-              if item.sublist
-                lines += call(item.sublist, _ctx).split("\n").map { |l| "    #{l}" }
-              end
+              lines += call(item.sublist, _ctx).split("\n").map { |l| "    #{l}" } if item.sublist
               lines
             end.join("\n")
           end

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

@@ -35,7 +35,7 @@ module Coradoc
               end
 
               def render_term(term)
-                dt = "<dt>#{term.text.to_s}</dt>"
+                dt = "<dt>#{term.text}</dt>"
                 dds = term.definitions.map { |d| render_dd(d) }.join
                 nested = term.nested ? "\n  #{render_dl(term.nested)}" : ''
                 "#{dt}\n#{dds}#{nested unless nested.empty?}"

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

@@ -219,7 +219,7 @@ module Coradoc
           def transform_verse_block(block)
             Coradoc::Markdown::Verse.new(
               content: block.flat_text,
-              attribution: block.respond_to?(:attribution) ? block.attribution : nil
+              attribution: block.is_a?(Coradoc::CoreModel::VerseBlock) ? block.attribution : nil
             )
           end
 
@@ -272,10 +272,17 @@ module Coradoc
 
           def transform_admonition_block(block, default_type: 'note')
             children = transform_inline_array(block.renderable_content)
+            if block.is_a?(Coradoc::CoreModel::AnnotationBlock)
+              adm_type = block.annotation_type || default_type
+              adm_label = block.annotation_label
+            else
+              adm_type = default_type
+              adm_label = nil
+            end
             Coradoc::Markdown::Admonition.new(
-              admonition_type: block.respond_to?(:annotation_type) ? (block.annotation_type || default_type) : default_type,
+              admonition_type: adm_type,
               content: block.flat_text,
-              title: block.respond_to?(:annotation_label) ? block.annotation_label : nil,
+              title: adm_label,
               children: children
             )
           end
@@ -374,7 +381,7 @@ module Coradoc
             )
           end
 
-          CALLOUT_MARKER_IN_CELL = /\s*<\d+>(?=\s|\z)/.freeze
+          CALLOUT_MARKER_IN_CELL = /\s*<\d+>(?=\s|\z)/
 
           def strip_cell_callouts(text)
             text.to_s.gsub(CALLOUT_MARKER_IN_CELL, '')
@@ -428,21 +435,52 @@ module Coradoc
           end
 
           def transform_definition_list(dl)
-            items = Array(dl.items).map do |item|
-              definition = build_definition_item(item)
+            # flat_map because each CoreModel DefinitionItem may emit
+            # multiple Markdown DefinitionTerms (multi-term `<dt>`).
+            items = Array(dl.items).flat_map do |item|
+              definitions = [build_definition_item(item)]
+              # `+`-continuation blocks attached to the dd become
+              # additional definitions in Markdown (each renders as
+              # `: line` in the Flat serializer). One DefinitionItem
+              # per attached block, preserving their distinct content
+              # without jamming them into the primary definition's text.
+              definitions.concat(Array(item.attached_children).map { |b| build_attached_definition_item(b) })
               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,
-                text_children: term_children,
-                definitions: [definition],
-                nested: nested
-              )
+              # Multi-term `<dt>`: emit one Markdown DefinitionTerm per
+              # term string. Inline children map 1:1 to the FIRST term
+              # (matches the mirror handler's behaviour; multi-term
+              # with inline markup on later terms is rare and the
+              # parser doesn't capture per-term children today).
+              terms = terms_for(item)
+              if terms.empty?
+                # Defensive: term and terms both empty — emit nothing.
+                next
+              end
+
+              terms.each_with_index.map do |term_text, idx|
+                Coradoc::Markdown::DefinitionTerm.new(
+                  text: term_text.to_s,
+                  text_children: idx.zero? ? term_children : [],
+                  definitions: definitions,
+                  nested: nested
+                )
+              end
             end
 
             Coradoc::Markdown::DefinitionList.new(items: items)
           end
 
+          # Source of truth for "the terms on this <dt>": the `terms`
+          # collection when populated, else `[term]` for legacy callers.
+          def terms_for(item)
+            collection = item.terms if item.is_a?(Coradoc::CoreModel::DefinitionItem)
+            return Array(collection) unless collection.nil? || collection.empty?
+
+            primary = item.term
+            primary.to_s.empty? ? [] : [primary.to_s]
+          end
+
           def build_definition_item(item)
             children = Array(item.definition_children)
             if children.empty?
@@ -457,6 +495,19 @@ module Coradoc
             )
           end
 
+          # Build a DefinitionItem from a single attached block (e.g.
+          # paragraph from a `+`-continuation). Flat-text extraction
+          # via ChildrenContent is the single source of truth — every
+          # attached block in CoreModel includes ChildrenContent.
+          def build_attached_definition_item(block)
+            content = if block.is_a?(Coradoc::CoreModel::ChildrenContent)
+                        block.flat_text
+                      else
+                        block.to_s
+                      end
+            Coradoc::Markdown::DefinitionItem.new(content: content)
+          end
+
           def transform_footnote(fn)
             Coradoc::Markdown::Footnote.new(
               id: fn.id.to_s,

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

@@ -30,14 +30,20 @@ module Coradoc
           end
 
           def transform_definition_list(dl)
-            items = Array(dl.items).map do |item|
+            # flat_map because multi-term `<dt>`'s emit multiple
+            # DefinitionTerms per CoreModel DefinitionItem.
+            items = Array(dl.items).flat_map do |item|
               definitions = Array(item.definitions).map do |defn|
                 Coradoc::Markdown::DefinitionItem.new(content: defn.to_s)
               end
-              Coradoc::Markdown::DefinitionTerm.new(
-                text: item.term.to_s,
-                definitions: definitions
-              )
+              terms = item.terms
+              term_strings = terms.nil? || terms.empty? ? [item.term.to_s] : terms.map(&:to_s)
+              term_strings.map do |term_text|
+                Coradoc::Markdown::DefinitionTerm.new(
+                  text: term_text,
+                  definitions: definitions
+                )
+              end
             end
 
             Coradoc::Markdown::DefinitionList.new(items: items)

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

@@ -80,7 +80,7 @@ module Coradoc
           def transform_bibliography_entry(entry)
             FromCoreModel.transform_bibliography_entry(entry)
           end
-end
+        end
 
         # Register with FromCoreModel
         FromCoreModel.register(CoreModel::StructuralElement, method(:transform_structural_element))

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

@@ -165,7 +165,9 @@ module Coradoc
               cells = if row.is_a?(Array)
                         row.map { |c| Coradoc::CoreModel::TableCell.new(content: c.to_s, header: false) }
                       else
-                        row.to_s.split(' | ').map { |c| Coradoc::CoreModel::TableCell.new(content: c.to_s, header: false) }
+                        row.to_s.split(' | ').map do |c|
+                          Coradoc::CoreModel::TableCell.new(content: c.to_s, header: false)
+                        end
                       end
               rows << Coradoc::CoreModel::TableRow.new(cells: cells)
             end

data/lib/coradoc/markdown/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module Markdown
-    VERSION = '1.0.9'
+    VERSION = '1.0.10'
   end
 end

metadata

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