metanorma-document 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a15c5f341f9fbc477322f57c757f26896b1ba2bd3e80a89815ba6942a44c5c6c
-  data.tar.gz: 95f0e2d121bc523f38600fe0d5e3e058f7c6b8212b4e5e8b4ab4654d06b10a83
+  metadata.gz: d03f7b4977f3220a59c871eb1e62e2f00042fd2b56164a41ed6361b18ddb1fd2
+  data.tar.gz: 274a96e49ab7923362edbcf4733214f7fdca6aa75699623da8c065c8958d5cb3
 SHA512:
-  metadata.gz: 01eee74753ce15ebf8bd68a3523130d7231eee75c42c2bb3551b67b30fd79e022c8e12858a1aae6d6fc03baf6bbac511b5b5e62db0b054487ee5c1bb62650c2c
-  data.tar.gz: 499dc86b2c426e22f107443b8939eead6e2861ab985b9dd427c54a2572531f11ab9c09114b7aa44e9c2fd0dd16eb5dfd36366dbc4f8b2c7c2c713994d6e53aa2
+  metadata.gz: 06a95eb083a619c0eb43c0acd394e171fa812d2e9eb9b592fa0f551568f6eae25f5ec824e787354d8e1c2bb95ad10aedaa10615e0bcb31b2a022bde8f212025a
+  data.tar.gz: da8eb0c5a86def7f9cd05e173957404a1ca047270d4ee12043cf696687e9ae9a38b01c91fbec7097af074ed3df697e75bf46d934d9a22d1ed0b74a957ee29b1d

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-04-22 12:28:09 UTC using RuboCop version 1.86.1.
+# on 2026-05-06 04:06:53 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,114 +13,220 @@ Gemspec/RequiredRubyVersion:
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-Layout/ClosingParenthesisIndentation:
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
   Exclude:
-    - 'lib/metanorma/html/renderer.rb'
+    - 'lib/metanorma/html/component/index_term_collector.rb'
 
-# Offense count: 1
+# Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
-Layout/FirstArgumentIndentation:
+Layout/EmptyLineAfterGuardClause:
   Exclude:
-    - 'lib/metanorma/html/renderer.rb'
+    - 'lib/metanorma/html/generator.rb'
+    - 'lib/metanorma/iso_document/metadata/iso_localized_title.rb'
 
-# Offense count: 580
+# Offense count: 11
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
+Layout/EmptyLinesAroundClassBody:
+  Exclude:
+    - 'lib/metanorma/html/bipm_renderer.rb'
+    - 'lib/metanorma/html/cc_renderer.rb'
+    - 'lib/metanorma/html/iec_renderer.rb'
+    - 'lib/metanorma/html/ieee_renderer.rb'
+    - 'lib/metanorma/html/ietf_renderer.rb'
+    - 'lib/metanorma/html/iho_renderer.rb'
+    - 'lib/metanorma/html/itu_renderer.rb'
+    - 'lib/metanorma/html/ogc_renderer.rb'
+    - 'lib/metanorma/html/oiml_renderer.rb'
+    - 'lib/metanorma/html/pdfa_renderer.rb'
+    - 'lib/metanorma/html/ribose_renderer.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
+Layout/ExtraSpacing:
+  Exclude:
+    - 'lib/metanorma/html/bipm_renderer.rb'
+    - 'lib/metanorma/html/generator.rb'
+    - 'lib/metanorma/html/iho_renderer.rb'
+    - 'lib/metanorma/html/theme.rb'
+
+# Offense count: 718
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Enabled: false
 
-# Offense count: 1
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineMethodCallBraceLayout:
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator, EnforcedStyleForRationalLiterals.
+# SupportedStylesForExponentOperator: space, no_space
+# SupportedStylesForRationalLiterals: space, no_space
+Layout/SpaceAroundOperators:
   Exclude:
-    - 'lib/metanorma/html/renderer.rb'
+    - 'lib/metanorma/html/bipm_renderer.rb'
+    - 'lib/metanorma/html/iho_renderer.rb'
+    - 'lib/metanorma/html/theme.rb'
 
-# Offense count: 2
+# Offense count: 1
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'spec/metanorma/html/renderer/class_ownership_spec.rb'
+
+# Offense count: 4
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
 Lint/DuplicateBranch:
   Exclude:
-    - 'lib/metanorma/html/index_generator.rb'
-    - 'lib/metanorma/html/renderer.rb'
+    - 'lib/metanorma/html/base_renderer.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
   Exclude:
+    - 'lib/metanorma/html/drops/formula_drop.rb'
     - 'spec/metanorma/iso_document/metadata/title_roundtrip_spec.rb'
 
+# Offense count: 2
+# Configuration parameters: AllowedParentClasses.
+Lint/MissingSuper:
+  Exclude:
+    - 'lib/metanorma/html/drops/block_element_drop.rb'
+    - 'lib/metanorma/html/drops/footnote_drop.rb'
+
 # Offense count: 1
-# Configuration parameters: AllowedPatterns.
-# AllowedPatterns: (?-mix:(exactly|at_least|at_most)\(\d+\)\.times)
-Lint/UnreachableLoop:
+Lint/StructNewOverride:
+  Exclude:
+    - 'lib/metanorma/html/component/index_term_collector.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
+# NotImplementedExceptions: NotImplementedError
+Lint/UnusedMethodArgument:
   Exclude:
-    - 'lib/metanorma/html/renderer.rb'
+    - 'lib/metanorma/html/component/index_section.rb'
+    - 'lib/metanorma/html/generator.rb'
 
 # Offense count: 1
 Lint/UselessConstantScoping:
   Exclude:
-    - 'lib/metanorma/html/renderer.rb'
+    - 'lib/metanorma/html/base_renderer.rb'
 
-# Offense count: 26
+# Offense count: 85
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
-  Exclude:
-    - 'lib/metanorma/document/components/lists/list_item.rb'
-    - 'lib/metanorma/html/index_generator.rb'
-    - 'lib/metanorma/html/renderer.rb'
-    - 'lib/metanorma/html/transformer.rb'
+  Enabled: false
 
-# Offense count: 11
+# Offense count: 22
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 139
+  Max: 66
 
 # Offense count: 2
 # Configuration parameters: CountBlocks, CountModifierForms.
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 31
+# Offense count: 64
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
     - 'lib/metanorma/document/components/lists/list_item.rb'
-    - 'lib/metanorma/html/index_generator.rb'
-    - 'lib/metanorma/html/renderer.rb'
-    - 'lib/metanorma/html/transformer.rb'
+    - 'lib/metanorma/html/base_renderer.rb'
+    - 'lib/metanorma/html/bipm_renderer.rb'
+    - 'lib/metanorma/html/component/index_term_collector.rb'
+    - 'lib/metanorma/html/drops/example_drop.rb'
+    - 'lib/metanorma/html/drops/figure_drop.rb'
+    - 'lib/metanorma/html/drops/formula_drop.rb'
+    - 'lib/metanorma/html/drops/note_drop.rb'
+    - 'lib/metanorma/html/generator.rb'
+    - 'lib/metanorma/html/iso_renderer.rb'
+    - 'lib/metanorma/html/ogc_renderer.rb'
+    - 'lib/metanorma/html/standard_renderer.rb'
+    - 'lib/metanorma/html/theme.rb'
     - 'lib/metanorma/iso_document/metadata/iso_localized_title.rb'
 
-# Offense count: 33
+# Offense count: 89
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 141
+  Max: 104
 
-# Offense count: 24
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
+Metrics/ParameterLists:
+  Max: 7
+
+# Offense count: 55
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
     - 'lib/metanorma/document/components/lists/list_item.rb'
-    - 'lib/metanorma/html/index_generator.rb'
-    - 'lib/metanorma/html/renderer.rb'
-    - 'lib/metanorma/html/transformer.rb'
+    - 'lib/metanorma/html/base_renderer.rb'
+    - 'lib/metanorma/html/bipm_renderer.rb'
+    - 'lib/metanorma/html/component/index_term_collector.rb'
+    - 'lib/metanorma/html/drops/example_drop.rb'
+    - 'lib/metanorma/html/drops/figure_drop.rb'
+    - 'lib/metanorma/html/drops/formula_drop.rb'
+    - 'lib/metanorma/html/drops/note_drop.rb'
+    - 'lib/metanorma/html/generator.rb'
+    - 'lib/metanorma/html/iso_renderer.rb'
+    - 'lib/metanorma/html/ogc_renderer.rb'
+    - 'lib/metanorma/html/standard_renderer.rb'
+    - 'lib/metanorma/html/theme.rb'
+    - 'lib/metanorma/iso_document/metadata/iso_localized_title.rb'
 
-# Offense count: 1
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, BlockForwardingName.
+# SupportedStyles: anonymous, explicit
+Naming/BlockForwarding:
+  Exclude:
+    - 'lib/metanorma/html/component/footnote_collector.rb'
+
+# Offense count: 22
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
   Exclude:
-    - 'lib/metanorma/html/renderer.rb'
+    - 'lib/metanorma/html/base_renderer.rb'
+    - 'lib/metanorma/html/component/footnote_collector.rb'
+    - 'lib/metanorma/html/drops/sourcecode_drop.rb'
+    - 'lib/metanorma/html/iso_renderer.rb'
+    - 'spec/metanorma/html/renderer/footnote_collector_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
+# AllowedMethods: call
+# WaywardPredicates: infinite?, nonzero?
+Naming/PredicateMethod:
+  Exclude:
+    - 'lib/metanorma/html/base_renderer.rb'
 
-# Offense count: 10
+# Offense count: 1
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros, UseSorbetSigs.
+# NamePrefix: is_, has_, have_, does_
+# ForbiddenPrefixes: is_, has_, have_, does_
+# AllowedMethods: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicatePrefix:
+  Exclude:
+    - 'lib/metanorma/html/standard_renderer.rb'
+
+# Offense count: 13
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
   Exclude:
     - 'spec/metanorma/document_spec.rb'
+    - 'spec/metanorma/html/renderer/class_ownership_spec.rb'
+    - 'spec/metanorma/html/renderer/dead_code_removal_spec.rb'
+    - 'spec/metanorma/html/renderer/section_rendering_spec.rb'
     - 'spec/metanorma/iso_document/metadata/title_roundtrip_spec.rb'
     - 'spec/metanorma/iso_document/roundtrip/bipm_roundtrip_spec.rb'
     - 'spec/metanorma/iso_document/roundtrip/cc_roundtrip_spec.rb'
@@ -131,36 +237,108 @@ RSpec/DescribeClass:
     - 'spec/metanorma/iso_document/roundtrip/oiml_collection_roundtrip_spec.rb'
     - 'spec/metanorma/iso_document/roundtrip/oiml_roundtrip_spec.rb'
 
-# Offense count: 1
+# Offense count: 4
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 6
+  Max: 8
+
+# Offense count: 1
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/metanorma/html/renderer/class_ownership_spec.rb'
 
 # Offense count: 1
 RSpec/MultipleDescribes:
   Exclude:
     - 'spec/metanorma/document_spec.rb'
 
-# Offense count: 279
+# Offense count: 286
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
   Enabled: false
 
-# Offense count: 16
+# Offense count: 25
 # Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
 # SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
   Enabled: false
 
 # Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowOnlyRestArgument, UseAnonymousForwarding, RedundantRestArgumentNames, RedundantKeywordRestArgumentNames, RedundantBlockArgumentNames.
+# RedundantRestArgumentNames: args, arguments
+# RedundantKeywordRestArgumentNames: kwargs, options, opts
+# RedundantBlockArgumentNames: blk, block, proc
+Style/ArgumentsForwarding:
+  Exclude:
+    - 'lib/metanorma/html/component/footnote_collector.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# AllowedMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'lib/metanorma/iso_document/metadata/iso_bibliographic_item.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+Style/ComparableClamp:
+  Exclude:
+    - 'lib/metanorma/html/base_renderer.rb'
+    - 'lib/metanorma/html/iso_renderer.rb'
+    - 'lib/metanorma/html/standard_renderer.rb'
+
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-Style/IdenticalConditionalBranches:
+# Configuration parameters: InverseMethods, InverseBlocks.
+Style/InverseMethods:
   Exclude:
-    - 'lib/metanorma/html/index_generator.rb'
+    - 'lib/metanorma/html/component/index_term_collector.rb'
 
 # Offense count: 1
-# Configuration parameters: Max.
-Style/SafeNavigationChainLength:
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'lib/metanorma/html/base_renderer.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/NegatedIfElseCondition:
+  Exclude:
+    - 'lib/metanorma/iso_document/metadata/iso_localized_title.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantRegexpArgument:
+  Exclude:
+    - 'lib/metanorma/html/bipm_renderer.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/RescueModifier:
+  Exclude:
+    - 'lib/metanorma/html/generator.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
+# AllowedMethods: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'lib/metanorma/html/bipm_renderer.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
+Style/TrailingCommaInArguments:
   Exclude:
-    - 'lib/metanorma/html/renderer.rb'
+    - 'lib/metanorma/html/component/footnote_collector.rb'
+    - 'lib/metanorma/html/component/index_term_collector.rb'

data/lib/metanorma/document/version.rb

@@ -2,7 +2,7 @@
 
 module Metanorma
   module Document
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
     Version = VERSION
   end
 end

data/lib/metanorma/html/base_renderer.rb

@@ -2,6 +2,7 @@
 
 require "liquid"
 require "nokogiri"
+require "cgi"
 require_relative "drops/footnote_drop"
 
 module Metanorma
@@ -141,11 +142,14 @@ module Metanorma
 
       # --- Document Assembly ---
 
-      TEMPLATE_CACHE = Hash.new { |h, k| h[k] = Liquid::Template.parse(File.read(k)) }
+      TEMPLATE_CACHE = {}
+      TEMPLATE_CACHE_MUTEX = Mutex.new
 
       def render_liquid(template_name, assigns)
         template_path = File.join(TEMPLATES_ROOT, template_name)
-        template = TEMPLATE_CACHE[template_path]
+        template = TEMPLATE_CACHE_MUTEX.synchronize do
+          TEMPLATE_CACHE[template_path] ||= Liquid::Template.parse(File.read(template_path))
+        end
         assigns = assigns.transform_keys(&:to_s) if assigns.is_a?(Hash)
         template.render(assigns)
       end
@@ -192,11 +196,6 @@ module Metanorma
         raw.length > 60 ? "#{raw[0, 57]}..." : raw
       end
 
-      # Reader controls — kept for backward compat with flavor renderers
-      def build_reader_controls
-        ""
-      end
-
       def build_publisher_logos
         publishers = flavor_publishers(extract_primary_doc_id)
         logo_map = publisher_logo_map
@@ -216,10 +215,6 @@ module Metanorma
         end.join("\n")
       end
 
-      def detect_publishers
-        flavor_publishers(extract_primary_doc_id)
-      end
-
       def load_logo_svg(filename, height: 32)
         path = File.join(LOGO_DIR, filename)
         return nil unless File.exist?(path)
@@ -989,7 +984,9 @@ module Metanorma
       end
 
       def raw_content_node?(node)
-        node.is_a?(Metanorma::IsoDocument::RawParagraph)
+        node.is_a?(Lutaml::Model::Serializable) &&
+          node.respond_to?(:content) &&
+          node.content.is_a?(String)
       end
 
       # Iterate element_order directly, preserving whitespace text nodes
@@ -1427,32 +1424,34 @@ module Metanorma
         parts.join
       end
 
+      BLOCK_TYPES = Set[
+        Metanorma::Document::Components::Paragraphs::ParagraphBlock,
+        Metanorma::Document::Components::Tables::TableBlock,
+        Metanorma::Document::Components::Lists::UnorderedList,
+        Metanorma::Document::Components::Lists::OrderedList,
+        Metanorma::Document::Components::Lists::DefinitionList,
+        Metanorma::Document::Components::AncillaryBlocks::FigureBlock,
+        Metanorma::Document::Components::Blocks::NoteBlock,
+        Metanorma::Document::Components::AncillaryBlocks::ExampleBlock,
+        Metanorma::Document::Components::AncillaryBlocks::SourcecodeBlock,
+        Metanorma::Document::Components::AncillaryBlocks::FormulaBlock,
+        Metanorma::Document::Components::MultiParagraph::QuoteBlock,
+        Metanorma::Document::Components::MultiParagraph::AdmonitionBlock,
+        Metanorma::Document::Components::Sections::HierarchicalSection,
+        Metanorma::Document::Components::Sections::BasicSection,
+        Metanorma::Document::Components::Sections::ContentSection,
+      ].freeze
+
       def html_class_for_span(xml_class)
         SPAN_ROLE_CLASSES[xml_class] || "span-#{xml_class}"
       end
 
       def block_element?(obj)
-        obj.is_a?(Metanorma::Document::Components::Paragraphs::ParagraphBlock) ||
-          obj.is_a?(Metanorma::Document::Components::Tables::TableBlock) ||
-          obj.is_a?(Metanorma::Document::Components::Lists::UnorderedList) ||
-          obj.is_a?(Metanorma::Document::Components::Lists::OrderedList) ||
-          obj.is_a?(Metanorma::Document::Components::Lists::DefinitionList) ||
-          obj.is_a?(Metanorma::Document::Components::AncillaryBlocks::FigureBlock) ||
-          obj.is_a?(Metanorma::Document::Components::Blocks::NoteBlock) ||
-          obj.is_a?(Metanorma::Document::Components::AncillaryBlocks::ExampleBlock) ||
-          obj.is_a?(Metanorma::Document::Components::AncillaryBlocks::SourcecodeBlock) ||
-          obj.is_a?(Metanorma::Document::Components::AncillaryBlocks::FormulaBlock) ||
-          obj.is_a?(Metanorma::Document::Components::MultiParagraph::QuoteBlock) ||
-          obj.is_a?(Metanorma::Document::Components::MultiParagraph::AdmonitionBlock) ||
-          obj.is_a?(Metanorma::Document::Components::Sections::HierarchicalSection) ||
-          obj.is_a?(Metanorma::Document::Components::Sections::BasicSection) ||
-          obj.is_a?(Metanorma::Document::Components::Sections::ContentSection)
+        BLOCK_TYPES.any? { |type| obj.is_a?(type) }
       end
 
       def safe_attr(obj, method_name)
-        obj.public_send(method_name)
-      rescue NoMethodError
-        nil
+        obj.public_send(method_name) if obj.respond_to?(method_name)
       end
 
       def collect_index_term(element)
@@ -1504,14 +1503,7 @@ module Metanorma
       end
 
       def escape_html(text)
-        return "" if text.nil?
-
-        text
-          .to_s
-          .gsub("&", "&")
-          .gsub("<", "&lt;")
-          .gsub(">", "&gt;")
-          .gsub('"', "&quot;")
+        CGI.escapeHTML(text.to_s)
       end
 
       def extract_text_value(val)

data/lib/metanorma/html/bipm_renderer.rb

@@ -5,7 +5,6 @@ module Metanorma
     # Renders BipmDocument components to HTML.
     # Extends IsoRenderer with BIPM-specific branding (institutional navy, scientific precision).
     class BipmRenderer < IsoRenderer
-      registers_doc_type Metanorma::BipmDocument::Root
 
       def flavor_publishers(_doc_id)
         ["BIPM"]

data/lib/metanorma/html/cc_renderer.rb

@@ -5,7 +5,6 @@ module Metanorma
     # Renders CcDocument (CalConnect) components to HTML.
     # Extends IsoRenderer with CalConnect branding.
     class CcRenderer < IsoRenderer
-      registers_doc_type Metanorma::CcDocument::Root
 
       def flavor_publishers(_doc_id)
         ["CalConnect"]

data/lib/metanorma/html/iec_renderer.rb

@@ -4,7 +4,6 @@ module Metanorma
   module Html
     # IEC brand: #0061a9 blue from logo
     class IecRenderer < IsoRenderer
-      registers_doc_type Metanorma::IecDocument::Root
 
       def flavor_publishers(_doc_id)
         ["IEC"]

data/lib/metanorma/html/ieee_renderer.rb

@@ -5,7 +5,6 @@ module Metanorma
     # Renders IeeeDocument components to HTML.
     # Extends IsoRenderer with IEEE branding.
     class IeeeRenderer < IsoRenderer
-      registers_doc_type Metanorma::IeeeDocument::Root
 
       def flavor_publishers(_doc_id)
         ["IEEE"]

data/lib/metanorma/html/ietf_renderer.rb

@@ -5,7 +5,6 @@ module Metanorma
     # Renders IetfDocument components to HTML.
     # Extends IsoRenderer with IETF/RFC branding.
     class IetfRenderer < IsoRenderer
-      registers_doc_type Metanorma::IetfDocument::Root
 
       def flavor_publishers(_doc_id)
         ["IETF"]

data/lib/metanorma/html/iho_renderer.rb

@@ -4,7 +4,6 @@ module Metanorma
   module Html
     # IHO brand: #00AAA9 teal + #05164D navy + #FEDC5B gold from logo
     class IhoRenderer < IsoRenderer
-      registers_doc_type Metanorma::IhoDocument::Root
 
       def flavor_publishers(_doc_id)
         ["IHO"]

data/lib/metanorma/html/iso_renderer.rb

@@ -8,22 +8,6 @@ module Metanorma
     # Extends StandardRenderer with ISO-specific cover page, boilerplate,
     # foreword, introduction, annex formatting, and ISO term entries.
     class IsoRenderer < StandardRenderer
-      class << self
-        def doc_types
-          @doc_types ||= []
-          if superclass <= IsoRenderer && superclass != IsoRenderer
-            superclass.doc_types + @doc_types
-          else
-            @doc_types.dup
-          end
-        end
-
-        def registers_doc_type(klass)
-          @doc_types ||= []
-          @doc_types << klass
-        end
-      end
-
       # --- Public hooks for flavor customization ---
 
       def flavor_publishers(_doc_id)
@@ -585,32 +569,6 @@ module Metanorma
         end
       end
 
-      def render_term_note(note)
-        attrs = element_attrs(id: safe_attr(note, :id), class: "note-block")
-        tag("div", attrs) do
-          label = extract_termnote_label(note)
-          @output << "<p><span class=\"term-note-label\">#{escape_html(label)}: </span>"
-          note.p&.each { |para| render_mixed_inline(para) }
-          @output << "</p>"
-          note.ul&.each { |ul| render_unordered_list(ul) }
-          note.ol&.each { |ol| render_ordered_list(ol) }
-          note.dl&.then { |dl| render_definition_list(dl) }
-        end
-      end
-
-      def render_term_example(example)
-        attrs = element_attrs(id: safe_attr(example, :id), class: "example")
-        tag("div", attrs) do
-          label = extract_block_label(example, "EXAMPLE")
-          @output << "<p><span class=\"example-label\">#{escape_html(label)}</span>&nbsp;"
-          example.p&.each { |para| render_mixed_inline(para) }
-          @output << "</p>"
-          example.ul&.each { |ul| render_unordered_list(ul) }
-          example.ol&.each { |ol| render_ordered_list(ol) }
-          example.dl&.then { |dl| render_definition_list(dl) }
-        end
-      end
-
       # --- Boilerplate rendering ---
 
       def render_boilerplate(boilerplate, **_opts)
@@ -685,45 +643,6 @@ module Metanorma
         @output << "</#{h}>"
       end
 
-      # Collect all renderable children from a section, sorted by displayorder.
-      # Uses element_order directly because each_mixed_content returns early
-      # when the model class doesn't declare mixed_content (mixed? is false).
-      def collect_ordered_children(section)
-        children = gather_element_order_children(section)
-
-        # Also gather typed attributes that may not appear in element_order
-        %i[terms definitions].each do |attr|
-          val = safe_attr(section, attr)
-          next if val.nil?
-
-          Array(val).each do |v|
-            children << v unless children.include?(v)
-          end
-        end
-
-        # Sort by displayorder (non-nil first, then nil at end)
-        children.compact!
-        children.sort_by do |node|
-          order = begin
-            node.displayorder
-          rescue StandardError
-            nil
-          end
-          order &&= order.to_i
-          order || Float::INFINITY
-        end
-      end
-
-      def render_ordered_content(section, level = 1)
-        children = collect_ordered_children(section)
-        children.each do |node|
-          next if node.is_a?(String)
-          next if is_title_element?(node, section)
-
-          render(node, level: level + 1)
-        end
-      end
-
       # Collect all document-level children (sections, normative refs, annexes,
       # bibliography) sorted by displayorder for correct document order.
       # Top-level paragraphs in sections (title paragraphs) are excluded —
@@ -731,87 +650,19 @@ module Metanorma
       def collect_document_children(doc)
         items = []
 
-        # Main sections children (clauses, terms, etc.)
         if doc.sections
-          section_children = gather_element_order_children(doc.sections)
-          # Title paragraphs are ParagraphBlock objects at the top level of
-          # sections. They are rendered by render_doc_title, so skip them here.
+          section_children = collect_ordered_children(doc.sections)
           section_children.reject! do |node|
             node.is_a?(Metanorma::Document::Components::Paragraphs::ParagraphBlock)
           end
           items.concat(section_children)
-          # Also add typed attributes that may not be in element_order
-          %i[terms definitions].each do |attr|
-            val = safe_attr(doc.sections, attr)
-            next if val.nil?
-
-            Array(val).each { |v| items << v unless items.include?(v) }
-          end
         end
 
-        # Normative references from bibliography (may have displayorder)
         doc.bibliography&.references&.each { |r| items << r }
-
-        # Annexes
         doc.annex&.each { |a| items << a }
 
-        # Non-normative bibliography (no displayorder = goes at end)
-        if doc.bibliography&.references
-          # Already included above; filter normative vs non-normative below
-        end
-
         items.compact!
-        items.sort_by do |node|
-          order = begin
-            node.displayorder
-          rescue StandardError
-            nil
-          end
-          order &&= order.to_i
-          order || Float::INFINITY
-        end
-      end
-
-      # Iterate element_order directly, bypassing each_mixed_content which
-      # requires mixed?/ordered? to be true (many section models aren't).
-      def gather_element_order_children(node)
-        children = []
-        return children unless node.is_a?(Lutaml::Model::Serializable)
-        return children unless node.element_order && !node.element_order.empty?
-
-        xml_mapping = node.class.mappings_for(:xml, node.lutaml_register)
-        return children unless xml_mapping
-
-        element_to_attr = {}
-        xml_mapping.mapping_elements_hash.each_value do |rule_or_array|
-          Array(rule_or_array).each do |rule|
-            element_to_attr[rule.name] = rule.to
-            element_to_attr[rule.name.to_s] = rule.to if rule.name.is_a?(Symbol)
-          end
-        end
-
-        indices = Hash.new(0)
-
-        node.element_order.each do |el|
-          if el.text?
-            children << el.text_content if el.text_content
-          elsif el.element?
-            attr_name = element_to_attr[el.name]
-            next unless attr_name
-
-            coll = node.send(attr_name)
-            obj = if coll.is_a?(Array)
-                    idx = indices[attr_name]
-                    indices[attr_name] += 1
-                    coll[idx]
-                  else
-                    coll
-                  end
-            children << obj if obj
-          end
-        end
-
-        children
+        sort_by_displayorder(items)
       end
 
       def publisher_logos_html(_doc)

data/lib/metanorma/html/itu_renderer.rb

@@ -4,7 +4,6 @@ module Metanorma
   module Html
     # ITU brand: #0e99d5 blue from logo
     class ItuRenderer < IsoRenderer
-      registers_doc_type Metanorma::ItuDocument::Root
 
       def flavor_publishers(_doc_id)
         ["ITU"]

data/lib/metanorma/html/ogc_renderer.rb

@@ -5,7 +5,6 @@ module Metanorma
     # Renders OgcDocument components to HTML.
     # Extends IsoRenderer with OGC-specific branding (geospatial, OGC cyan-blue #00b1ff).
     class OgcRenderer < IsoRenderer
-      registers_doc_type Metanorma::OgcDocument::Root
 
       def flavor_publishers(_doc_id)
         ["OGC"]

data/lib/metanorma/html/oiml_renderer.rb

@@ -5,7 +5,6 @@ module Metanorma
     # Renders OimlDocument (OIML) components to HTML.
     # Extends IsoRenderer with OIML branding.
     class OimlRenderer < IsoRenderer
-      registers_doc_type Metanorma::OimlDocument::Root
 
       def flavor_publishers(_doc_id)
         ["OIML"]

data/lib/metanorma/html/pdfa_renderer.rb

@@ -5,7 +5,6 @@ module Metanorma
     # Renders PDF Association (PDFA) taste documents to HTML.
     # PDFA brand: #cf9c1d gold + #d03544 red + #4992b2 steel blue from logo
     class PdfaRenderer < IsoRenderer
-      registers_doc_type Metanorma::RiboseDocument::Root
 
       def flavor_publishers(_doc_id)
         ["PDF Association"]

data/lib/metanorma/html/ribose_renderer.rb

@@ -5,7 +5,6 @@ module Metanorma
     # Renders RiboseDocument components to HTML.
     # Extends IsoRenderer with Ribose branding.
     class RiboseRenderer < IsoRenderer
-      registers_doc_type Metanorma::RiboseDocument::Root
 
       def flavor_publishers(_doc_id)
         ["Ribose"]

data/lib/metanorma/html/standard_renderer.rb

@@ -138,63 +138,46 @@ module Metanorma
 
       # --- Section rendering ---
 
-      def render_clause_section(clause, level: 1, **_opts)
-        attrs = element_attrs(id: safe_attr(clause, :id))
+      def render_section(section, level: 1, title_class: nil, with_subsections: false, with_terms: false)
+        attrs = element_attrs(id: safe_attr(section, :id))
         tag("div", attrs) do
-          render_standard_title(clause, level)
-          render_standard_section_blocks(clause, level)
-          render_subsections(clause, level)
+          if title_class
+            render_standard_title(section, level, default_class: title_class)
+          else
+            render_standard_title(section, level)
+          end
+          render_standard_section_blocks(section, level)
+          render_subsections(section, level) if with_subsections
+          section.terms&.each { |term| render_term(term) } if with_terms
         end
       end
 
-      def render_annex_section(annex, level: 1, **_opts)
-        attrs = element_attrs(id: safe_attr(annex, :id))
-        tag("div", attrs) do
-          render_standard_title(annex, level)
-          render_standard_section_blocks(annex, level)
-          render_subsections(annex, level)
-        end
+      def render_clause_section(section, level: 1, **)
+        render_section(section, level: level, with_subsections: true)
       end
 
-      def render_standard_section(section, level: 1, **_opts)
-        attrs = element_attrs(id: safe_attr(section, :id))
-        tag("div", attrs) do
-          render_standard_title(section, level)
-          render_standard_section_blocks(section, level)
-        end
+      def render_annex_section(section, level: 1, **)
+        render_section(section, level: level, with_subsections: true)
       end
 
-      def render_terms_section(terms, level: 1, **_opts)
-        attrs = element_attrs(id: safe_attr(terms, :id))
-        tag("div", attrs) do
-          render_standard_title(terms, level)
-          render_standard_section_blocks(terms, level)
-          terms.terms&.each { |term| render_term(term) }
-        end
+      def render_standard_section(section, level: 1, **)
+        render_section(section, level: level)
       end
 
-      def render_abstract_section(section, level: 1, **_opts)
-        attrs = element_attrs(id: safe_attr(section, :id))
-        tag("div", attrs) do
-          render_standard_title(section, level, default_class: "intro-title")
-          render_standard_section_blocks(section, level)
-        end
+      def render_terms_section(section, level: 1, **)
+        render_section(section, level: level, with_terms: true)
       end
 
-      def render_foreword_section(section, level: 1, **_opts)
-        attrs = element_attrs(id: safe_attr(section, :id))
-        tag("div", attrs) do
-          render_standard_title(section, level, default_class: "foreword-title")
-          render_standard_section_blocks(section, level)
-        end
+      def render_abstract_section(section, level: 1, **)
+        render_section(section, level: level, title_class: "intro-title")
       end
 
-      def render_introduction_section(section, level: 1, **_opts)
-        attrs = element_attrs(id: safe_attr(section, :id))
-        tag("div", attrs) do
-          render_standard_title(section, level, default_class: "intro-title")
-          render_standard_section_blocks(section, level)
-        end
+      def render_foreword_section(section, level: 1, **)
+        render_section(section, level: level, title_class: "foreword-title")
+      end
+
+      def render_introduction_section(section, level: 1, **)
+        render_section(section, level: level, title_class: "intro-title")
       end
 
       def render_floating_title(title_node, **_opts)
@@ -285,11 +268,7 @@ module Metanorma
         tag("div", attrs) do
           label = extract_termnote_label(note)
           @output << "<p><span class=\"term-note-label\">#{escape_html(label)}: </span>"
-          if note.p && !note.p.empty?
-            note.p.each do |para|
-              render_mixed_inline(para)
-            end
-          end
+          note.p&.each { |para| render_mixed_inline(para) }
           @output << "</p>"
           note.ul&.each { |ul| render_unordered_list(ul) }
           note.ol&.each { |ol| render_ordered_list(ol) }
@@ -302,11 +281,7 @@ module Metanorma
         tag("div", attrs) do
           label = extract_block_label(example, "EXAMPLE")
           @output << "<p><span class=\"example-label\">#{escape_html(label)}</span>&nbsp;"
-          if example.p && !example.p.empty?
-            example.p.each do |para|
-              render_mixed_inline(para)
-            end
-          end
+          example.p&.each { |para| render_mixed_inline(para) }
           @output << "</p>"
           example.ul&.each { |ul| render_unordered_list(ul) }
           example.ol&.each { |ol| render_ordered_list(ol) }
@@ -433,7 +408,7 @@ module Metanorma
           end
           if primary
             id_val = extract_text_value(primary)
-            @output << "<span class=\"std-doc-number\">#{escape_html(id_val)}</span>" unless id_val.to_s.empty?
+            @output << "<span class=\"ref-doc-number\">#{escape_html(id_val)}</span>" unless id_val.to_s.empty?
           end
         end
 
@@ -442,7 +417,7 @@ module Metanorma
             date_on = date.is_a?(Metanorma::Document::Relaton::BibliographicDate) ? date.on : nil
             date_val = extract_text_value(date_on || safe_attr(date, :text))
             if date_val && !date_val.to_s.empty?
-              @output << ":<span class=\"std-year\">#{escape_html(date_val.to_s)}</span>"
+              @output << ":<span class=\"ref-year\">#{escape_html(date_val.to_s)}</span>"
             end
           end
         end

data/lib/metanorma/html.rb

@@ -8,7 +8,6 @@ module Metanorma
     autoload :Generator, "metanorma/html/generator"
     autoload :Theme, "metanorma/html/theme"
     autoload :AssetPipeline, "metanorma/html/asset_pipeline"
-    autoload :ComponentRegistry, "metanorma/html/component_registry"
     autoload :Component, "metanorma/html/component"
     autoload :Drops, "metanorma/html/drops"
     autoload :StandardRenderer, "metanorma/html/standard_renderer"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-document
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-05 00:00:00.000000000 Z
+date: 2026-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -481,7 +481,6 @@ files:
 - lib/metanorma/html/component/footnote_collector.rb
 - lib/metanorma/html/component/index_section.rb
 - lib/metanorma/html/component/index_term_collector.rb
-- lib/metanorma/html/component_registry.rb
 - lib/metanorma/html/drops.rb
 - lib/metanorma/html/drops/admonition_drop.rb
 - lib/metanorma/html/drops/block_element_drop.rb

data/lib/metanorma/html/component_registry.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module Metanorma
-  module Html
-    class ComponentRegistry
-      def initialize
-        @map = {}
-      end
-
-      def register(model_class, component_class)
-        @map[model_class] = component_class
-      end
-
-      def lookup(model_class)
-        @map[model_class] ||
-          model_class.ancestors
-            .drop(1)
-            .filter_map { |a| @map[a] }
-            .first ||
-          nil
-      end
-
-      def component_for(renderer, model_class)
-        component_class = lookup(model_class)
-        component_class&.new(renderer)
-      end
-
-      def register_all(component_module)
-        component_module.constants.each do |const|
-          klass = component_module.const_get(const)
-          next unless klass.is_a?(Class) && klass < Component::Base
-          klass.register_in(self)
-        end
-      end
-    end
-  end
-end