metanorma-document 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afb9ddd75c55018b0ff15fb41d06a1eddc5fe7448a3841a5a7fd4d4061965756
-  data.tar.gz: 52550547f425bbcab7fb88b940eda4798ae842240ec9b53e8c7052737128cfcd
+  metadata.gz: 27e82b07d3f2f3edd230cf27c0b18671597160bca302e2f06ac848210d2a667b
+  data.tar.gz: ebab43042eaadc336ad64bb5d46389ff0e82262bbd9ecfa1e7035ed369219023
 SHA512:
-  metadata.gz: effae9a6cd899788ea8f22a3fe78583a18094001d38e322f96c0a99cd8c78c1b24084f7ceb7514158474117dea01e471325a78c2ad0ffef30314ce2eca1f7157
-  data.tar.gz: bdbd96deb4acee546290fbb5f3fbbb2ea7a2a9a608d0d34800c8fe6dfffc57b9063ac8ec00c7bdec5cedc5b1bccb7bfe0e5593f5ca642c3bc6aca19eaa4bc279
+  metadata.gz: f99ecc2897bbfef8283a6bddf89bfdb0d5a95010e2158eec5a7bc874ff5cef73f87bd317c507c5610acb30461274ad58e32693b72ed829e0efc696fc12c49d9e
+  data.tar.gz: 9f1fdf2062229aa79771f4cddbe7146c399a86d0474e9bf4f3a72031e1337d51c156d87dc424c614a46d216294e68f0c07987dae2ce1ebb27e763a609142654b

data/lib/metanorma/document/version.rb

@@ -2,7 +2,7 @@
 
 module Metanorma
   module Document
-    VERSION = "0.2.4"
+    VERSION = "0.2.6"
     Version = VERSION
   end
 end

data/lib/metanorma/html/base_renderer.rb

@@ -94,7 +94,7 @@ module Metanorma
           render_definition_list render_sourcecode render_table
           render_figure render_quote render_formula render_note
           render_image render_stem_content register_figure_entry
-          render_liquid
+          render_liquid render_block_children
         ].freeze
 
         def initialize(renderer)
@@ -109,7 +109,7 @@ module Metanorma
 
         def method_missing(method_name, *args, **kwargs, &block)
           if DELEGATED_METHODS.include?(method_name)
-            @renderer.send(method_name, *args, **kwargs, &block)
+            @renderer.public_send(method_name, *args, **kwargs, &block)
           else
             super
           end
@@ -476,7 +476,7 @@ module Metanorma
         return escape_html(node) if node.is_a?(String)
 
         method = lookup_dispatch(node.class, :render_registry)
-        method ? send(method, node, **) : ""
+        method ? public_send(method, node, **) : ""
       end
 
       # Dispatch to the appropriate inline render method via type registry.
@@ -486,7 +486,7 @@ module Metanorma
 
         method = lookup_dispatch(element.class, :inline_registry)
         if method
-          send(method, element)
+          public_send(method, element)
         elsif element.is_a?(Lutaml::Model::Serializable) && element.mixed?
           render_mixed_inline(element)
         end
@@ -567,13 +567,11 @@ module Metanorma
       register_inline_render Metanorma::Document::Components::Inline::FmtIdentifierElement, :render_mixed_inline
       register_inline_render Metanorma::Document::Components::Inline::FmtSourcecodeElement, :render_mixed_inline
 
-      private
-
       def lookup_dispatch(type_class, registry_method)
         self.class.ancestors.each do |ancestor|
-          next unless ancestor.respond_to?(registry_method)
+          next unless ancestor.is_a?(Class) && (ancestor == BaseRenderer || ancestor < BaseRenderer)
 
-          registry = ancestor.send(registry_method)
+          registry = ancestor.public_send(registry_method)
           method_name = registry[type_class]
           return method_name if method_name
         end
@@ -876,6 +874,51 @@ module Metanorma
         @output << %(<a id="#{escape_html(safe_attr(bookmark, :id).to_s)}"></a>)
       end
 
+      # Renders the typed child collections of a block element (paragraphs,
+      # lists, nested blocks) in a standard order.  Used by Drops and section
+      # rendering to avoid duplicating the enumeration in each consumer.
+      #
+      # +children+ is a Hash mapping attr names to render-method symbols:
+      #   { paragraphs: :render_paragraph, ul: :render_unordered_list, ... }
+      #
+      # Each key is sent to +model+ via safe_attr; non-nil results are
+      # dispatched to the corresponding render method.
+      def render_block_children(model, children:)
+        children.each do |attr, render_method|
+          values = safe_attr(model, attr)
+          next if values.nil?
+
+          Array(values).each { |v| public_send(render_method, v) }
+        end
+      end
+
+      # Standard child set for container blocks (example, note, etc.)
+      BLOCK_CHILDREN = {
+        paragraphs: :render_paragraph,
+        ul: :render_unordered_list,
+        ol: :render_ordered_list,
+        dl: :render_definition_list,
+        sourcecode: :render_sourcecode,
+        table: :render_table,
+        figure: :render_figure,
+        quote: :render_quote,
+        formula: :render_formula,
+      }.freeze
+
+      # Minimal child set for simple blocks (admonition, note with content only)
+      SIMPLE_CHILDREN = {
+        paragraphs: :render_paragraph,
+      }.freeze
+
+      # Note-style child set (paragraphs + lists + dl, no nested blocks)
+      NOTE_CHILDREN = {
+        paragraphs: :render_paragraph,
+        ul: :render_unordered_list,
+        ol: :render_ordered_list,
+        dl: :render_definition_list,
+        quote: :render_quote,
+      }.freeze
+
       # --- Section rendering ---
 
       def render_basic_section(section, level: 1, **_opts)
@@ -962,7 +1005,7 @@ module Metanorma
             # Apply optional filter (used by semx to skip semantic attrs)
             next if allow_filter && !allow_filter.include?(attr_name)
 
-            coll = node.send(attr_name)
+            coll = node.public_send(attr_name)
             obj = if coll.is_a?(Array)
                     idx = indices[attr_name]
                     indices[attr_name] += 1
@@ -1056,8 +1099,9 @@ module Metanorma
 
       def raw_content_node?(node)
         node.is_a?(Lutaml::Model::Serializable) &&
-          node.respond_to?(:content) &&
           node.content.is_a?(String)
+      rescue NoMethodError
+        false
       end
 
       # Iterate element_order directly, preserving whitespace text nodes
@@ -1432,7 +1476,7 @@ module Metanorma
               return stem.math.to_xml
             rescue StandardError
               math_items = Array(stem.math)
-              return math_items.map { |m| m.is_a?(Lutaml::Model::Serializable) ? m.content.to_s : m.to_s }.join
+              return math_items.join
             end
           end
           if stem.asciimath
@@ -1494,7 +1538,9 @@ module Metanorma
       end
 
       def safe_attr(obj, method_name)
-        obj.public_send(method_name) if obj.respond_to?(method_name)
+        obj.public_send(method_name)
+      rescue NoMethodError
+        nil
       end
 
       def collect_index_term(element)

data/lib/metanorma/html/drops/admonition_drop.rb

@@ -9,7 +9,8 @@ module Metanorma
           id = renderer.safe_attr(admonition, :id)
 
           content_html = renderer.capture_output do
-            admonition.paragraphs&.each { |para| renderer.render_paragraph(para) }
+            renderer.render_block_children(admonition,
+                                           children: BaseRenderer::SIMPLE_CHILDREN)
           end
 
           new(

data/lib/metanorma/html/drops/example_drop.rb

@@ -9,17 +9,8 @@ module Metanorma
           label = renderer.extract_block_label(example, "EXAMPLE")
 
           content_html = renderer.capture_output do
-            if example.paragraphs && !example.paragraphs.empty?
-              example.paragraphs.each { |para| renderer.render_paragraph(para) }
-            end
-            example.ul&.each { |ul| renderer.render_unordered_list(ul) }
-            example.ol&.each { |ol| renderer.render_ordered_list(ol) }
-            example.dl&.each { |dl| renderer.render_definition_list(dl) }
-            example.sourcecode&.each { |sc| renderer.render_sourcecode(sc) }
-            example.table&.each { |t| renderer.render_table(t) }
-            example.figure&.each { |f| renderer.render_figure(f) }
-            example.quote&.each { |q| renderer.render_quote(q) }
-            example.formula&.each { |f| renderer.render_formula(f) }
+            renderer.render_block_children(example,
+                                           children: BaseRenderer::BLOCK_CHILDREN)
           end
 
           new(

data/lib/metanorma/html/drops/note_drop.rb

@@ -14,9 +14,8 @@ module Metanorma
             else
               renderer.render_mixed_inline(note)
             end
-            note.ul&.each { |ul| renderer.render_unordered_list(ul) }
-            note.ol&.each { |ol| renderer.render_ordered_list(ol) }
-            note.dl&.then { |dl| renderer.render_definition_list(dl) }
+            renderer.render_block_children(note,
+                                           children: BaseRenderer::NOTE_CHILDREN)
           end
 
           new(

data/lib/metanorma/html/iso_renderer.rb

@@ -154,8 +154,6 @@ module Metanorma
         val.strip.empty? ? nil : val
       end
 
-      private
-
       # --- Top-level document rendering ---
 
       def render_document(doc, **_opts)

data/lib/metanorma/html/standard_renderer.rb

@@ -19,8 +19,6 @@ module Metanorma
       register_render Metanorma::StandardDocument::Sections::FloatingTitle, :render_floating_title
       register_render Metanorma::StandardDocument::Blocks::AmendBlock, :render_amend_block
 
-      private
-
       # --- Top-level document rendering ---
 
       def render_standard_document(doc, **_opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-document
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-06 00:00:00.000000000 Z
+date: 2026-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model