metanorma-document 0.2.12 → 0.3.0

data/lib/metanorma/mirror/output/html_renderers/mark_renderers.rb

@@ -6,30 +6,18 @@ module Metanorma
       module HtmlRenderers
         module MarkRenderers
           def self.register(registry)
-            registry.register_mark_handler("emphasis", ->(inner, _mark) {
-              HtmlRenderers.wrap(:em, inner)
-            })
-            registry.register_mark_handler("strong", ->(inner, _mark) {
-              HtmlRenderers.wrap(:strong, inner)
-            })
-            registry.register_mark_handler("subscript", ->(inner, _mark) {
-              HtmlRenderers.wrap(:sub, inner)
-            })
-            registry.register_mark_handler("superscript", ->(inner, _mark) {
-              HtmlRenderers.wrap(:sup, inner)
-            })
-            registry.register_mark_handler("code", ->(inner, _mark) {
-              HtmlRenderers.wrap(:code, inner)
-            })
-            registry.register_mark_handler("underline", ->(inner, _mark) {
-              HtmlRenderers.wrap(:u, inner)
-            })
-            registry.register_mark_handler("strike", ->(inner, _mark) {
-              HtmlRenderers.wrap(:s, inner)
-            })
-            registry.register_mark_handler("smallcap", ->(inner, _mark) {
-              HtmlRenderers.wrap(:span, inner, style: "font-variant: small-caps")
-            })
+            # Simple-wrap marks: tag and attrs come from the shared Catalog
+            # so the Model-side renderer and the XML-side RichHtmlRenderer
+            # agree on HTML output.
+            Handlers::Inline::Catalog::SIMPLE_WRAPS.each do |mark_type, spec|
+              tag = spec[:tag]
+              attrs = spec.except(:tag)
+              registry.register_mark_handler(mark_type, ->(inner, _mark) {
+                HtmlRenderers.wrap(tag, inner, **attrs)
+              })
+            end
+
+            # Dynamic marks: attrs come from mark.attrs per instance.
             registry.register_mark_handler("link", ->(inner, mark) {
               HtmlRenderers.wrap(:a, inner, href: mark.attrs["href"] || "#")
             })
@@ -37,19 +25,8 @@ module Metanorma
               HtmlRenderers.wrap(:a, inner, href: "##{mark.attrs['target'] || ''}")
             })
             registry.register_mark_handler("eref", ->(inner, mark) {
-              HtmlRenderers.wrap(:a, inner, class: "eref", cite: mark.attrs["citeas"] || "")
-            })
-            registry.register_mark_handler("footnote", ->(inner, _mark) {
-              HtmlRenderers.wrap(:sup, inner, class: "footnote-inline")
-            })
-            registry.register_mark_handler("stem", ->(inner, _mark) {
-              HtmlRenderers.wrap(:span, inner, class: "stem")
-            })
-            registry.register_mark_handler("concept", ->(inner, _mark) {
-              HtmlRenderers.wrap(:span, inner, class: "concept")
-            })
-            registry.register_mark_handler("bcp14", ->(inner, _mark) {
-              HtmlRenderers.wrap(:span, inner, class: "bcp14")
+              HtmlRenderers.wrap(:a, inner, class: "eref",
+                                            cite: mark.attrs["citeas"] || "")
             })
             registry.register_mark_handler("span", ->(inner, mark) {
               cls = mark.attrs["class_attr"]

data/lib/metanorma/mirror/transformer.rb

@@ -3,20 +3,108 @@
 module Metanorma
   module Mirror
     class Transformer
-      def initialize(registry: Mirror.default_registry, id_strategy: Mirror::DEFAULT_ID_STRATEGY)
+      attr_reader :registry, :id_strategy
+
+      def initialize(registry: Mirror.default_registry,
+                     id_strategy: Mirror::DEFAULT_ID_STRATEGY)
         @registry = registry
         @id_strategy = id_strategy
       end
 
+      def call(root)
+        attrs = {}
+        attrs[:flavor] = root.flavor if root.flavor
+        attrs[:type] = root.type if root.type
+        attrs[:schema_version] = root.schema_version if root.schema_version
+
+        title = extract_root_title(root)
+        attrs[:title] = title if title
+
+        content = []
+
+        preface = root.preface
+        if preface
+          result = @registry.handle(preface, context: self)
+          result.append_to(content)
+        end
+
+        sections = root.sections
+        if sections
+          result = @registry.handle(sections, context: self)
+          result.append_to(content)
+        end
+
+        annex = root.annex
+        annex&.each do |a|
+          result = @registry.handle(a, context: self)
+          result.append_to(content)
+        end
+
+        bibliography = root.bibliography
+        if bibliography
+          result = @registry.handle(bibliography, context: self)
+          result.append_to(content)
+        end
+
+        Handlers.build_node("doc", attrs: attrs, content: content)
+      end
+
       def from_metanorma(root)
-        document = MetanormaToMirror.new(registry: @registry,
-                                         id_strategy: @id_strategy).call(root)
+        document = call(root)
         @id_strategy.finalize!(document)
       end
 
       def rewrite(mirror_node)
         Rewriter.new.call(mirror_node)
       end
+
+      def extract_blocks(element)
+        content = []
+
+        element.each_mixed_content do |node|
+          next if node.is_a?(String)
+
+          result = @registry.handle(node, context: self)
+          result.append_to(content)
+        end
+        content
+      end
+
+      def extract_section_children(element)
+        content = []
+        %i[clause terms definitions references floating_title].each do |attr|
+          collection = SafeAttr.read(element, attr)
+          next unless collection
+
+          collection.each do |child|
+            result = @registry.handle(child, context: self)
+            result.append_to(content)
+          end
+        end
+        content
+      end
+
+      def extract_named_collections(element, collection_attrs)
+        content = []
+        collection_attrs.each do |attr|
+          collection = SafeAttr.read(element, attr)
+          next unless collection
+
+          collection.each do |child|
+            result = @registry.handle(child, context: self)
+            result.append_to(content)
+          end
+        end
+        content
+      end
+
+      def text_node(text, marks: [])
+        Handlers.build_text(text, marks: marks)
+      end
+
+      def extract_root_title(root)
+        Metadata.title_from_bibdata(SafeAttr.read(root, :bibdata))
+      end
     end
   end
 end

data/lib/metanorma/mirror.rb

@@ -10,7 +10,6 @@ module Metanorma
     autoload :Model, "#{__dir__}/mirror/model"
     autoload :HandlerResult, "#{__dir__}/mirror/handler_result"
     autoload :Transformer, "#{__dir__}/mirror/transformer"
-    autoload :MetanormaToMirror, "#{__dir__}/mirror/metanorma_to_mirror"
     autoload :Rewriter, "#{__dir__}/mirror/rewriter"
     autoload :HandlerRegistry, "#{__dir__}/mirror/handler_registry"
     autoload :Handlers, "#{__dir__}/mirror/handlers"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-document
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-17 00:00:00.000000000 Z
+date: 2026-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -42,16 +42,22 @@ dependencies:
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0.pre.alpha.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0.pre.alpha.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.3.0
 description: A Ruby library for representing and processing Metanorma document XML,
   providing a comprehensive model for standards documents with support for various
   metadata, content blocks, and structured markup.
@@ -650,6 +656,8 @@ files:
 - lib/metanorma/html/drops/note_drop.rb
 - lib/metanorma/html/drops/sourcecode_drop.rb
 - lib/metanorma/html/drops/toc_entry_drop.rb
+- lib/metanorma/html/flavor.rb
+- lib/metanorma/html/flavor_registry.rb
 - lib/metanorma/html/generator.rb
 - lib/metanorma/html/icc_renderer.rb
 - lib/metanorma/html/iec_renderer.rb
@@ -661,8 +669,10 @@ files:
 - lib/metanorma/html/ogc_renderer.rb
 - lib/metanorma/html/oiml_renderer.rb
 - lib/metanorma/html/pdfa_renderer.rb
+- lib/metanorma/html/renderer_delegation.rb
 - lib/metanorma/html/renderers.rb
 - lib/metanorma/html/renderers/block_renderer.rb
+- lib/metanorma/html/renderers/element_order_traversal.rb
 - lib/metanorma/html/renderers/inline_renderer.rb
 - lib/metanorma/html/renderers/pubid_renderer.rb
 - lib/metanorma/html/renderers/section_renderer.rb
@@ -842,6 +852,7 @@ files:
 - lib/metanorma/mirror/handlers/figure.rb
 - lib/metanorma/mirror/handlers/formula.rb
 - lib/metanorma/mirror/handlers/inline.rb
+- lib/metanorma/mirror/handlers/inline/catalog.rb
 - lib/metanorma/mirror/handlers/inline/rich_html_renderer.rb
 - lib/metanorma/mirror/handlers/inline/text_extractor.rb
 - lib/metanorma/mirror/handlers/list.rb
@@ -859,7 +870,6 @@ files:
 - lib/metanorma/mirror/id_strategy/preserve.rb
 - lib/metanorma/mirror/math_util.rb
 - lib/metanorma/mirror/metadata.rb
-- lib/metanorma/mirror/metanorma_to_mirror.rb
 - lib/metanorma/mirror/model.rb
 - lib/metanorma/mirror/model/container.rb
 - lib/metanorma/mirror/model/factory.rb

data/lib/metanorma/mirror/metanorma_to_mirror.rb

@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-module Metanorma
-  module Mirror
-    class MetanormaToMirror
-      attr_reader :registry, :id_strategy
-
-      def initialize(registry: Mirror.default_registry,
-id_strategy: Mirror.DEFAULT_ID_STRATEGY)
-        @registry = registry
-        @id_strategy = id_strategy
-      end
-
-      def call(root)
-        attrs = {}
-        attrs[:flavor] = root.flavor if root.flavor
-        attrs[:type] = root.type if root.type
-        attrs[:schema_version] = root.schema_version if root.schema_version
-
-        title = extract_root_title(root)
-        attrs[:title] = title if title
-
-        content = []
-
-        preface = root.preface
-        if preface
-          result = @registry.handle(preface, context: self)
-          result.append_to(content)
-        end
-
-        sections = root.sections
-        if sections
-          result = @registry.handle(sections, context: self)
-          result.append_to(content)
-        end
-
-        annex = root.annex
-        annex&.each do |a|
-          result = @registry.handle(a, context: self)
-          result.append_to(content)
-        end
-
-        bibliography = root.bibliography
-        if bibliography
-          result = @registry.handle(bibliography, context: self)
-          result.append_to(content)
-        end
-
-        Handlers.build_node("doc", attrs: attrs, content: content)
-      end
-
-      def extract_blocks(element)
-        content = []
-
-        element.each_mixed_content do |node|
-          next if node.is_a?(String)
-
-          result = @registry.handle(node, context: self)
-          result.append_to(content)
-        end
-        content
-      end
-
-      def extract_section_children(element)
-        content = []
-        %i[clause terms definitions references floating_title].each do |attr|
-          collection = SafeAttr.read(element, attr)
-          next unless collection
-
-          collection.each do |child|
-            result = @registry.handle(child, context: self)
-            result.append_to(content)
-          end
-        end
-        content
-      end
-
-      def extract_named_collections(element, collection_attrs)
-        content = []
-        collection_attrs.each do |attr|
-          collection = SafeAttr.read(element, attr)
-          next unless collection
-
-          collection.each do |child|
-            result = @registry.handle(child, context: self)
-            result.append_to(content)
-          end
-        end
-        content
-      end
-
-      def text_node(text, marks: [])
-        Handlers.build_text(text, marks: marks)
-      end
-
-      def extract_root_title(root)
-        Metadata.title_from_bibdata(SafeAttr.read(root, :bibdata))
-      end
-    end
-  end
-end