metanorma-document 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 327323438369aca0879bcfd2556b9de423e78121abb553eeb92bae8010871c4e
-  data.tar.gz: 61d1c5e8020b823c678f528189465d2df5fa234435b8f60a2ea61da0329c96c6
+  metadata.gz: 82bac7c730c60f7fa121afd4d4278380019eea11c7331254453c986cc988da95
+  data.tar.gz: 889dab00a67c3d56c2ce7e284da7a7b6bca13d952efc43b405bbb553837ef87b
 SHA512:
-  metadata.gz: bde230705b324432565d10b68a7e570252c787dbe4ea388bddc8a1d89b4dabb57aad2c79ecfe34a077311a5f90436b3c12140c828099447b2a844531192225cc
-  data.tar.gz: 758cb7e3ac461c0c778fcc721e90bea016400609004de98907a3076c1229723adf1e77b270e9a4ff83688fb4a9aa722d23496aade611d809f821a7b640579cbb
+  metadata.gz: 5d3fee68271cacc7e090d70b07b920202bec1d50129f5365d97140c4ba66efd6225628f8fc08ae2aa8c9b4b9925eaee5ad3450a1475560f7728c54df1de284db
+  data.tar.gz: 75b2af965e8ad9d792711d5393fd0c98fdcedcf3b73bb50cf4210faeb7a2f7b901caac32cfc4822738eb6e0c51cbca7b17a43d2ef6cc635bcde2dfdfa27ad84e

data/data/stylesheets/base/_dark.css

@@ -37,7 +37,7 @@
 [data-theme="dark"] .code-copy-btn { background: rgba(255,255,255,0.06); border-color: rgba(255,255,255,0.1); }
 [data-theme="dark"] .table-scroll-wrapper { box-shadow: 0 1px 3px rgba(0,0,0,0.3); }
 [data-theme="dark"] .caption-label, [data-theme="dark"] .fmt-caption-label { color: #a8b4e0; }
-[data-theme="dark"] .term-number { color: #a8b4e0; }
+[data-theme="dark"] .TermNum { color: #a8b4e0; }
 [data-theme="dark"] .term-name { color: var(--color-text); }
 [data-theme="dark"] div[id^="term-"] { border-top-color: #4a5a9a; }
 [data-theme="dark"] .term-source { border-top-color: var(--color-border); }
@@ -100,7 +100,7 @@
 [data-theme="sepia"] .cover-stage p { border-color: rgba(255,255,255,0.2); }
 [data-theme="sepia"] .code-copy-btn { background: rgba(0,0,0,0.15); border-color: rgba(255,255,255,0.1); }
 [data-theme="sepia"] .caption-label, [data-theme="sepia"] .fmt-caption-label { color: #6b4423; }
-[data-theme="sepia"] .term-number { color: #6b4423; }
+[data-theme="sepia"] .TermNum { color: #6b4423; }
 [data-theme="sepia"] .term-name { color: #6b4423; }
 [data-theme="sepia"] div[id^="term-"] { border-top-color: #a67c20; }
 [data-theme="sepia"] h1 { border-bottom-color: var(--color-border); }
@@ -159,7 +159,7 @@
 [data-theme="oled"] .cover-stage p { border-color: #222; }
 [data-theme="oled"] .code-copy-btn { background: rgba(255,255,255,0.04); border-color: #1a1a1a; }
 [data-theme="oled"] .caption-label, [data-theme="oled"] .fmt-caption-label { color: #c0c0c0; }
-[data-theme="oled"] .term-number { color: #c0c0c0; }
+[data-theme="oled"] .TermNum { color: #c0c0c0; }
 [data-theme="oled"] .term-name { color: #d0d0d0; }
 [data-theme="oled"] div[id^="term-"] { border-top-color: #222; }
 [data-theme="oled"] h1 { border-bottom-color: #1a1a1a; }

data/data/stylesheets/base/_print.css

@@ -26,7 +26,7 @@
   h1, h2, h3, h4, h5, h6 { page-break-after: avoid; break-after: avoid; }
   .note-block, .example, .admonition, .formula, figure, table { page-break-inside: avoid; break-inside: avoid; }
   .caption-label, .fmt-caption-label { color: #000; padding: 0; }
-  .term-number { color: #000; padding: 0; }
+  .TermNum { color: #000; padding: 0; }
   div[id^="term-"] { border-top: 2px solid #666; background: none; box-shadow: none; }
   .formula-number { background: none; border: none; color: #000; padding: 0; }
   .doc-title::after { display: none; }

data/data/stylesheets/components/term.css

@@ -9,13 +9,15 @@ div[id^="term-"] {
 }
 div[id^="term-"] + div[id^="term-"] { margin-top: 0; }
 
-.term-number {
+/* TermNum is a heading (h2/h3 by nesting depth, per isodoc term_header) */
+.TermNum {
   font-variant: small-caps;
   font-weight: 600;
   color: var(--mn-primary);
   background: none;
   padding: 0;
-  font-size: 0.88em;
+  margin: 0 0 0.4em;
+  font-size: 0.95em;
 }
 .term-name { font-size: 1.1em; color: var(--mn-primary); font-weight: 500; }
 .term-name dfn { font-style: normal; }

data/lib/metanorma/document/version.rb

@@ -2,7 +2,7 @@
 
 module Metanorma
   module Document
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
     Version = VERSION
   end
 end

data/lib/metanorma/html/base_renderer.rb

@@ -125,6 +125,7 @@ module Metanorma
         def render_note_children(...) = @renderer.render_note_children(...)
         def render_simple_children(...) = @renderer.render_simple_children(...)
         def render_full_block_children(...) = @renderer.render_full_block_children(...)
+        def render_label_paragraph(...) = @renderer.render_label_paragraph(...)
       end
 
       def renderer_context
@@ -668,13 +669,20 @@ module Metanorma
       end
 
       def render_block_children(model,
-children:)
-        @block_renderer.render_block_children(model, children: children)
+children:, **)
+        @block_renderer.render_block_children(model, children: children, **)
       end
 
       def render_note_children(model) = @block_renderer.render_note_children(model)
       def render_simple_children(model) = @block_renderer.render_simple_children(model)
-      def render_full_block_children(model) = @block_renderer.render_full_block_children(model)
+
+      def render_full_block_children(model, **)
+        @block_renderer.render_full_block_children(model, **)
+      end
+
+      def render_label_paragraph(content_html, **)
+        @block_renderer.render_label_paragraph(content_html, **)
+      end
 
       # Section rendering delegation
       def render_basic_section(section,

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

@@ -4,11 +4,18 @@ module Metanorma
   module Html
     module Drops
       class ExampleDrop < BlockElementDrop
+        LABEL_CLASS = "example-label"
+        private_constant :LABEL_CLASS
+
         def self.from_model(example, renderer:)
           id = renderer.safe_attr(example, :id)
           label = renderer.extract_block_label(example, "EXAMPLE")
 
-          content_html = renderer.render_full_block_children(example) || ""
+          content_html = renderer.render_full_block_children(
+            example,
+            first_paragraph_label: label,
+            first_paragraph_label_class: LABEL_CLASS,
+          ) || ""
 
           new(
             id: id,

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

@@ -4,26 +4,53 @@ module Metanorma
   module Html
     module Drops
       class NoteDrop < BlockElementDrop
+        LABEL_CLASS = "note-label"
+        private_constant :LABEL_CLASS
+
         def self.from_model(note, renderer:)
           id = renderer.safe_attr(note, :id)
           label = renderer.extract_block_label(note, "NOTE")
 
           content_parts = []
+          label_rendered = label.nil?
+
           if note.content && !note.content.empty?
             note.content.each do |para|
-              content_parts << (renderer.render_paragraph(para) || "")
+              if label_rendered
+                content_parts << (renderer.render_paragraph(para) || "")
+              else
+                content_parts << (renderer.render_paragraph(para,
+                                                            label: label,
+                                                            label_class: LABEL_CLASS) || "")
+                label_rendered = true
+              end
             end
           else
             inline = renderer.render_mixed_inline(note)
-            content_parts << inline if inline
+            if inline
+              if label_rendered
+                content_parts << inline
+              else
+                content_parts << renderer.render_label_paragraph(inline,
+                                                                 label: label,
+                                                                 label_class: LABEL_CLASS)
+                label_rendered = true
+              end
+            end
           end
+
           content_parts << (renderer.render_note_children(note) || "")
-          content_html = content_parts.join
+
+          if !label_rendered
+            content_parts.unshift(renderer.render_label_paragraph("",
+                                                                  label: label,
+                                                                  label_class: LABEL_CLASS))
+          end
 
           new(
             id: id,
             label_html: renderer.escape_html(label),
-            content_html: content_html,
+            content_html: content_parts.join,
             css_class: "note-block",
           )
         end

data/lib/metanorma/html/renderers/block_renderer.rb

@@ -34,7 +34,7 @@ module Metanorma
           @coordinator = coordinator
         end
 
-        def render_paragraph(p, **_opts)
+        def render_paragraph(p, label: nil, label_class: nil, **_opts)
           attrs = element_attrs(id: safe_attr(p, :id),
                                 style: coordinator.alignment_style(safe_attr(p,
                                                                              :alignment)))
@@ -42,6 +42,21 @@ module Metanorma
           render_liquid("_paragraph.html.liquid", {
                           "attrs" => attrs,
                           "content" => content,
+                          "label" => label,
+                          "label_class" => label_class,
+                        })
+        end
+
+        # Wraps an already-rendered HTML fragment in a `<p>` opened by the
+        # given label span. Used by NoteDrop / ExampleDrop when a note has
+        # no paragraph child to host the label (e.g. inline-only content or
+        # an empty note). All markup is emitted by `_paragraph.html.liquid`.
+        def render_label_paragraph(content_html, label:, label_class:)
+          render_liquid("_paragraph.html.liquid", {
+                          "attrs" => "",
+                          "content" => content_html,
+                          "label" => label,
+                          "label_class" => label_class,
                         })
         end
 
@@ -354,16 +369,33 @@ module Metanorma
                         })
         end
 
-        def render_block_children(model, children:)
+        def render_block_children(model, children:, first_paragraph_label: nil,
+                                 first_paragraph_label_class: nil)
           parts = []
+          label_applied = first_paragraph_label.nil?
+
           children.each do |attr, render_method|
             values = safe_attr(model, attr)
             next if values.nil?
 
             Array(values).each do |v|
-              parts << (public_send(render_method, v) || "")
+              if !label_applied && render_method == :render_paragraph
+                parts << (render_paragraph(v,
+                                           label: first_paragraph_label,
+                                           label_class: first_paragraph_label_class) || "")
+                label_applied = true
+              else
+                parts << (public_send(render_method, v) || "")
+              end
             end
           end
+
+          unless label_applied
+            parts.unshift(render_label_paragraph("",
+                                                 label: first_paragraph_label,
+                                                 label_class: first_paragraph_label_class))
+          end
+
           parts.join
         end
 
@@ -375,8 +407,11 @@ module Metanorma
           render_block_children(model, children: SIMPLE_CHILDREN)
         end
 
-        def render_full_block_children(model)
-          render_block_children(model, children: BLOCK_CHILDREN)
+        def render_full_block_children(model, first_paragraph_label: nil,
+                                       first_paragraph_label_class: nil)
+          render_block_children(model, children: BLOCK_CHILDREN,
+                                       first_paragraph_label: first_paragraph_label,
+                                       first_paragraph_label_class: first_paragraph_label_class)
         end
 
         private

data/lib/metanorma/html/standard_renderer.rb

@@ -100,7 +100,7 @@ module Metanorma
         parts << (render_standard_section_blocks(section, level) || "")
         parts << (render_subsections(section, level) || "") if with_subsections
         if with_terms
-          section.terms&.each { |term| parts << (render_term(term) || "") }
+          section.terms&.each { |term| parts << (render_term(term, level: level + 1) || "") }
         end
         render_liquid("_element.html.liquid", {
                         "tag" => "div",
@@ -164,13 +164,14 @@ module Metanorma
       # (StandardDocument::Terms::Term) and presentation-aware models with
       # fmt-* attributes (IsoDocument::Terms::IsoTerm): safe_attr returns nil
       # for attributes a model does not declare, so the fmt-* branches are
-      # skipped automatically on semantic-only models.
-      def render_term(term, **_opts)
+      # skipped automatically on semantic-only models. +level+ is the term's
+      # TermNum heading level (section level + 1, per isodoc's term_header).
+      def render_term(term, level: 2, **_opts)
         attrs = element_attrs(id: safe_attr(term, :id), **term_data_attrs(term))
         fmt_definition = safe_attr(term, :fmt_definition)
 
         parts = []
-        parts << (render_term_number(term) || "")
+        parts << (render_term_number(term, level: level) || "")
         parts << render_term_designations(term, :fmt_preferred, :preferred,
                                           "preferred")
         parts << render_term_designations(term, :fmt_admitted, :admitted,
@@ -185,7 +186,7 @@ module Metanorma
         safe_attr(term, :admonition)&.each do |admonition|
           parts << (render_admonition(admonition) || "")
         end
-        safe_attr(term, :term)&.each { |sub| parts << (render_term(sub) || "") }
+        safe_attr(term, :term)&.each { |sub| parts << (render_term(sub, level: level + 1) || "") }
         render_liquid("_element.html.liquid", {
                         "tag" => "div",
                         "extra_attrs" => attrs,
@@ -206,11 +207,15 @@ module Metanorma
         data_attrs
       end
 
-      def render_term_number(term)
+      # The term number renders as a TermNum HEADING one level below the
+      # enclosing section heading (isodoc term_header postprocess: p.TermNum
+      # becomes h(parent+1), so top-level terms get h2, nested terms h3+).
+      def render_term_number(term, level: 2)
         fmt_name = safe_attr(term, :fmt_name)
         term_number = safe_attr(term, :term_number)
         if fmt_name
           render_liquid("_term_number.html.liquid", {
+                          "level" => [level, 6].min,
                           "content" => render_inline_element(fmt_name),
                         })
         elsif term_number
@@ -220,6 +225,7 @@ module Metanorma
                           extract_text_value(term_number)
                         end
           render_liquid("_term_number.html.liquid", {
+                          "level" => [level, 6].min,
                           "content" => escape_html(number_text),
                         })
         end

data/lib/metanorma/html/templates/_example.html.liquid

@@ -1,3 +1,3 @@
 <div{% if block.id %} id="{{ block.id }}"{% endif %} class="{{ block.css_class }}">
-<span class="example-label">{{ block.label_html }}</span>&nbsp;{{ block.content_html }}
+{{ block.content_html }}
 </div>

data/lib/metanorma/html/templates/_note.html.liquid

@@ -1,3 +1,3 @@
 <div{% if block.id %} id="{{ block.id }}"{% endif %} class="{{ block.css_class }}">
-<span class="note-label">{{ block.label_html }}</span>&nbsp;{{ block.content_html }}
+{{ block.content_html }}
 </div>

data/lib/metanorma/html/templates/_paragraph.html.liquid

@@ -1 +1 @@
-<p{{ attrs }}>{{ content }}</p>
+<p{{ attrs }}>{% if label %}<span class="{{ label_class }}">{{ label }}</span>&nbsp;{% endif %}{{ content }}</p>

data/lib/metanorma/html/templates/_term_number.html.liquid

@@ -1 +1 @@
-<p class="term-number">{{ content }}</p>
+<h{{ level }} class="TermNum">{{ content }}</h{{ level }}>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-document
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-21 00:00:00.000000000 Z
+date: 2026-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model