metanorma-document 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c66a8c91095adeaaa7d4cde6aacda4cbeae30670484c0dbb28a85d663d4d5dd
-  data.tar.gz: 6287b7a61c71833682c54f94e35e4d8dd423db10a5fc6c2086f00c50d865a185
+  metadata.gz: da12347749776b99b68dcc3816de625289ce2e56f51a9716c05d38088a4913b7
+  data.tar.gz: 2bf0989d205c0ab6a0c282fd5c4cab7d0c7deaccf012baafc64fa97c9160029f
 SHA512:
-  metadata.gz: ed0522009ebcffc3b73c0717ff518d7fc3d422cc8e7be88ade3aa6c893b6569a07db035cd40ba6738cc1602261e588307b5264c0139a122d35d65ae86e2c7a81
-  data.tar.gz: 6456bc28350855d30cbeed7e6b807220b390560d030e5ae1f85733d4672df15e834badc1e07cdeee5af59a804a0ac96fc12830e1bee2a3e74836a9f8b0cce349
+  metadata.gz: 1af9848d0640195e2176378b067214afe02f1da504893ed09686625e0a79f637bfad69fa5575d0959b59d31e78eff2b986dcdb42d63169db853ab808fb52bf22
+  data.tar.gz: 8dd05a2a8ed9344e5d70a35ab3c4653ec9b4c69dc001ef3cd400c6822b4874b8582304df5eee0798f37f8da43388e90fc71dbd88402d41fc1e401cd95fcd396a

data/lib/metanorma/document/components/blocks/note_block.rb

@@ -45,7 +45,7 @@ module Metanorma
 
           attribute :anchor, :string
 
-          attribute :remove_in_rfc, :string
+          attribute :remove_in_rfc, :boolean
 
           attribute :name, Metanorma::Document::Components::Inline::NameWithIdElement,
                     collection: true

data/lib/metanorma/document/components/inline/eref_element.rb

@@ -7,7 +7,7 @@ module Metanorma
           attribute :type, :string
           attribute :bibitemid, :string
           attribute :citeas, :string
-          attribute :normative, :string
+          attribute :normative, :boolean
           attribute :alt, :string
           attribute :display_format, :string
           attribute :relative, :string

data/lib/metanorma/document/components/inline/fn_element.rb

@@ -5,7 +5,7 @@ module Metanorma
         class FnElement < Lutaml::Model::Serializable
           attribute :id, :string
           attribute :reference, :string
-          attribute :hiddenref, :string
+          attribute :hiddenref, :boolean
           attribute :target, :string
           attribute :semx_id, :string
           attribute :original_reference, :string

data/lib/metanorma/document/components/lists/unordered_list.rb

@@ -9,10 +9,10 @@ module Metanorma
           attribute :id, :string
           attribute :semx_id, :string
           attribute :original_id, :string
-          attribute :nobullet, :string
+          attribute :nobullet, :boolean
           attribute :spacing, :string
           attribute :indent, :string
-          attribute :bare, :string
+          attribute :bare, :boolean
           attribute :json_type, :string
 
           def json_type

data/lib/metanorma/document/components/multi_paragraph/admonition_block.rb

@@ -10,7 +10,10 @@ module Metanorma
           # Subclass of admonition determining how it is to be rendered; e.g.
           # Warning, Note, Tip.
           # Distinct admonition types are often associated with distinct icons or rendering.
-          attribute :type, :string
+          attribute :type, :string,
+                    values: %w[danger caution warning important
+                               safety\ precautions editorial tip note
+                               commentary]
 
           # Caption of admonition.
           attribute :name, Metanorma::Document::Components::TextElements::TextElement,
@@ -28,7 +31,7 @@ module Metanorma
           attribute :target, :string
 
           # Whether the admonition is excluded from automatic numbering (UN).
-          attribute :unnumbered, :string
+          attribute :unnumbered, :boolean
 
           # Paragraphs within the admonition.
           attribute :paragraphs,

data/lib/metanorma/document/components/paragraphs/paragraph_block.rb

@@ -11,8 +11,8 @@ module Metanorma
           attribute :alignment, :string
           attribute :semx_id, :string
           attribute :original_id, :string
-          attribute :keep_with_next, :string
-          attribute :keep_with_previous, :string
+          attribute :keep_with_next, :boolean
+          attribute :keep_with_previous, :boolean
           attribute :indent, :string
           attribute :class_attr, :string
           attribute :type_attr, :string

data/lib/metanorma/document/version.rb

@@ -2,7 +2,7 @@
 
 module Metanorma
   module Document
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
     Version = VERSION
   end
 end

data/lib/metanorma/html/base_renderer.rb

@@ -1143,7 +1143,7 @@ module Metanorma
       end
 
       def render_mixed_inline(node)
-        # Models using map_all_content (e.g. RawParagraph): raw XML in content
+        # Models using map_all_content: raw XML in content
         if raw_content_node?(node)
           raw = node.content
           if raw.is_a?(String) && !raw.strip.empty?
@@ -1385,7 +1385,7 @@ module Metanorma
         end
       end
 
-      # Process raw XML content from map_all_content models (e.g. RawParagraph).
+      # Process raw XML content from map_all_content models.
       # Strips source elements (xref, eref, stem) that have a following <semx>
       # wrapper, keeping only the semx display content.
       def render_raw_content(raw_xml)

data/lib/metanorma/html/iso_renderer.rb

@@ -589,7 +589,7 @@ module Metanorma
       def render_boilerplate(boilerplate, **_opts)
         return unless boilerplate
 
-        content = boilerplate.content
+        content = boilerplate_to_xml(boilerplate)
         return unless content
 
         @output << "<div class=\"boilerplate-copyright\">"
@@ -616,6 +616,29 @@ module Metanorma
         @output << "</div>"
       end
 
+      def boilerplate_to_xml(boilerplate)
+        parts = []
+        %i[copyright_statement license_statement legal_statement
+           feedback_statement clause].each do |attr|
+          items = boilerplate.public_send(attr)
+          next unless items
+
+          tag = attr.to_s.gsub("_", "-")
+          items.each do |item|
+            inner = item.to_xml
+            next if !inner || inner.strip.empty?
+
+            # Strip the outer <clause> wrapper — the inner content is what matters
+            stripped = inner.strip
+            stripped = stripped.sub(%r{^<clause[^>]*>\n?}, "").sub(%r{\n?</clause>$}, "")
+            parts << "<#{tag}>#{stripped}</#{tag}>"
+          end
+        end
+        return nil if parts.empty?
+
+        parts.join("\n")
+      end
+
       def convert_boilerplate_links(raw)
         doc = Nokogiri::XML.fragment(raw)
         doc.css("link").each do |link|

data/lib/metanorma/ietf_document/sections/ietf_annex_section.rb

@@ -6,7 +6,7 @@ module Metanorma
       class IetfAnnexSection < Metanorma::StandardDocument::Sections::AnnexSection
         # IETF-specific attributes
         attribute :numbered, :string
-        attribute :remove_in_rfc, :string
+        attribute :remove_in_rfc, :boolean
 
         # Sub-clauses within IETF annex use IetfClauseSection
         attribute :clause, IetfClauseSection, collection: true

data/lib/metanorma/ietf_document/sections/ietf_clause_section.rb

@@ -6,7 +6,7 @@ module Metanorma
       class IetfClauseSection < Metanorma::StandardDocument::Sections::ClauseSection
         # IETF-specific attributes
         attribute :numbered, :string
-        attribute :remove_in_rfc, :string
+        attribute :remove_in_rfc, :boolean
 
         # Recursive IETF sub-clauses
         attribute :clause, IetfClauseSection, collection: true

data/lib/metanorma/ietf_document/sections/ietf_content_section.rb

@@ -5,7 +5,7 @@ module Metanorma
     module Sections
       class IetfContentSection < Metanorma::StandardDocument::Sections::ContentSection
         attribute :numbered, :string
-        attribute :remove_in_rfc, :string
+        attribute :remove_in_rfc, :boolean
 
         # Recursive IETF sub-clauses
         attribute :subsection, IetfContentSection, collection: true

data/lib/metanorma/iso_document/metadata/doc_identifier.rb

@@ -7,7 +7,7 @@ module Metanorma
       # Used for the multiple <docidentifier> elements in bibdata/bibitem.
       class DocIdentifier < Lutaml::Model::Serializable
         attribute :type, :string
-        attribute :primary, :string
+        attribute :primary, :boolean
         attribute :scope, :string
         attribute :language, :string
         attribute :value, :string

data/lib/metanorma/iso_document/sections/iso_terms_section.rb

@@ -12,12 +12,13 @@ module Metanorma
         attribute :type, :string
         attribute :number, :string
         attribute :obligation, :string
-        attribute :inline_header, :string
-        attribute :unnumbered, :string
+        attribute :inline_header, :boolean
+        attribute :unnumbered, :boolean
         attribute :toc, :string
         attribute :class_attr, :string
         attribute :title, Metanorma::Document::Components::Inline::TitleWithAnnotationElement
-        attribute :p, RawParagraph, collection: true
+        attribute :p, Metanorma::Document::Components::Paragraphs::ParagraphBlock,
+                  collection: true
         attribute :ul, Metanorma::Document::Components::Lists::UnorderedList,
                   collection: true
         attribute :term, Metanorma::IsoDocument::Terms::IsoTerm,

data/lib/metanorma/iso_document/terms/term_example.rb

@@ -8,7 +8,8 @@ module Metanorma
         attribute :id, :string
         attribute :semx_id, :string
         attribute :autonum, :string
-        attribute :p, RawParagraph, collection: true
+        attribute :p, Metanorma::Document::Components::Paragraphs::ParagraphBlock,
+                  collection: true
         attribute :ol, Metanorma::Document::Components::Lists::OrderedList,
                   collection: true
         attribute :ul, Metanorma::Document::Components::Lists::UnorderedList,

data/lib/metanorma/iso_document/terms/term_note.rb

@@ -9,7 +9,8 @@ module Metanorma
         attribute :anchor, :string
         attribute :semx_id, :string
         attribute :autonum, :string
-        attribute :p, RawParagraph, collection: true
+        attribute :p, Metanorma::Document::Components::Paragraphs::ParagraphBlock,
+                  collection: true
         attribute :ol, Metanorma::Document::Components::Lists::OrderedList,
                   collection: true
         attribute :ul, Metanorma::Document::Components::Lists::UnorderedList,

data/lib/metanorma/iso_document/terms/verbal_definition.rb

@@ -7,7 +7,8 @@ module Metanorma
       class VerbalDefinition < Lutaml::Model::Serializable
         attribute :id, :string
         attribute :semx_id, :string
-        attribute :p, RawParagraph, collection: true
+        attribute :p, Metanorma::Document::Components::Paragraphs::ParagraphBlock,
+                  collection: true
         attribute :ol, Metanorma::Document::Components::Lists::OrderedList,
                   collection: true
         attribute :ul, Metanorma::Document::Components::Lists::UnorderedList,

data/lib/metanorma/iso_document.rb

@@ -6,7 +6,6 @@ module Metanorma
     autoload :Blocks, "metanorma/iso_document/blocks"
     autoload :Boilerplate, "metanorma/iso_document/boilerplate"
     autoload :Metadata, "metanorma/iso_document/metadata"
-    autoload :RawParagraph, "metanorma/iso_document/raw_paragraph"
     autoload :Root, "metanorma/iso_document/root"
     autoload :Sections, "metanorma/iso_document/sections"
     autoload :Terms, "metanorma/iso_document/terms"

data/lib/metanorma/jis_document/sections/jis_annex_section.rb

@@ -4,7 +4,7 @@ module Metanorma
   module JisDocument
     module Sections
       class JisAnnexSection < Metanorma::IsoDocument::Sections::IsoAnnexSection
-        attribute :commentary, :string
+        attribute :commentary, :boolean
 
         xml do
           element "annex"

data/lib/metanorma/standard_document/annotation_container.rb

@@ -3,11 +3,34 @@
 module Metanorma
   module StandardDocument
     class AnnotationContainer < Lutaml::Model::Serializable
-      attribute :content, :string
+      class Annotation < Lutaml::Model::Serializable
+        attribute :id, :string
+        attribute :reviewer, :string
+        attribute :from, :string
+        attribute :to, :string
+        attribute :type, :string
+        attribute :date, :string
+        attribute :paragraphs,
+                  Metanorma::Document::Components::Paragraphs::ParagraphBlock,
+                  collection: true
+
+        xml do
+          element "annotation"
+          map_attribute "id", to: :id
+          map_attribute "reviewer", to: :reviewer
+          map_attribute "from", to: :from
+          map_attribute "to", to: :to
+          map_attribute "type", to: :type
+          map_attribute "date", to: :date
+          map_element "p", to: :paragraphs
+        end
+      end
+
+      attribute :annotations, Annotation, collection: true
 
       xml do
         element "annotation-container"
-        map_all_content to: :content
+        map_element "annotation", to: :annotations
       end
     end
   end

data/lib/metanorma/standard_document/blocks/amend_content_block.rb

@@ -4,12 +4,30 @@ module Metanorma
   module StandardDocument
     module Blocks
       # Content block for amend description and new-content elements.
-      # Uses map_all_content to preserve all children (p, ol, ul, table, etc.)
+      # Contains block-level content: paragraphs, notes, lists, tables, etc.
       class AmendContentBlock < Lutaml::Model::Serializable
-        attribute :content, :string
+        attribute :paragraphs,
+                  Metanorma::Document::Components::Paragraphs::ParagraphBlock,
+                  collection: true
+        attribute :note,
+                  Metanorma::Document::Components::Blocks::NoteBlock,
+                  collection: true
+        attribute :ol,
+                  Metanorma::Document::Components::Lists::OrderedList,
+                  collection: true
+        attribute :ul,
+                  Metanorma::Document::Components::Lists::UnorderedList,
+                  collection: true
+        attribute :dl,
+                  Metanorma::Document::Components::Lists::DefinitionList,
+                  collection: true
 
         xml do
-          map_all_content to: :content
+          map_element "p", to: :paragraphs
+          map_element "note", to: :note
+          map_element "ol", to: :ol
+          map_element "ul", to: :ul
+          map_element "dl", to: :dl
         end
       end
     end

data/lib/metanorma/standard_document/blocks/standard_block_no_notes.rb

@@ -4,8 +4,8 @@ module Metanorma
   module StandardDocument
     module Blocks
       class StandardBlockNoNotes < Metanorma::Document::Components::Blocks::BasicBlockNoNotes
-        attribute :keep_with_next, :string
-        attribute :keep_lines_together, :string
+        attribute :keep_with_next, :boolean
+        attribute :keep_lines_together, :boolean
         attribute :tag, :string
         attribute :multilingual_rendering, :string
         attribute :columns, :string

data/lib/metanorma/standard_document/boilerplate.rb

@@ -3,11 +3,29 @@
 module Metanorma
   module StandardDocument
     class Boilerplate < Lutaml::Model::Serializable
-      attribute :content, :string
+      attribute :copyright_statement,
+                Metanorma::StandardDocument::Sections::ContentSection,
+                collection: true
+      attribute :license_statement,
+                Metanorma::StandardDocument::Sections::ContentSection,
+                collection: true
+      attribute :legal_statement,
+                Metanorma::StandardDocument::Sections::ContentSection,
+                collection: true
+      attribute :feedback_statement,
+                Metanorma::StandardDocument::Sections::ContentSection,
+                collection: true
+      attribute :clause,
+                Metanorma::StandardDocument::Sections::ContentSection,
+                collection: true
 
       xml do
         element "boilerplate"
-        map_all_content to: :content
+        map_element "copyright-statement", to: :copyright_statement
+        map_element "license-statement", to: :license_statement
+        map_element "legal-statement", to: :legal_statement
+        map_element "feedback-statement", to: :feedback_statement
+        map_element "clause", to: :clause
       end
     end
   end

data/lib/metanorma/standard_document/sections/annex_section.rb

@@ -19,9 +19,9 @@ module Metanorma
         attribute :id, :string
         attribute :number, :string
         attribute :obligation, :string
-        attribute :unnumbered, :string
+        attribute :unnumbered, :boolean
         attribute :toc, :string
-        attribute :inline_header, :string
+        attribute :inline_header, :boolean
         attribute :title,
                   Metanorma::Document::Components::Inline::TitleWithAnnotationElement
 

data/lib/metanorma/standard_document/sections/clause_hierarchical_section.rb

@@ -14,7 +14,7 @@ module Metanorma
         attribute :original_id, :string
         attribute :autonum, :string
         attribute :displayorder, :integer
-        attribute :inline_header, :string
+        attribute :inline_header, :boolean
 
         xml do
           element "clause-hierarchical-section"

data/lib/metanorma/standard_document/sections/clause_section.rb

@@ -20,8 +20,8 @@ module Metanorma
         attribute :type, :string
         attribute :number, :string
         attribute :obligation, :string
-        attribute :inline_header, :string
-        attribute :unnumbered, :string
+        attribute :inline_header, :boolean
+        attribute :unnumbered, :boolean
         attribute :toc, :string
         attribute :class_attr, :string
         attribute :title,

data/lib/metanorma/standard_document/sections/definition_section.rb

@@ -20,8 +20,8 @@ module Metanorma
         attribute :type, :string
         attribute :number, :string
         attribute :obligation, :string
-        attribute :inline_header, :string
-        attribute :unnumbered, :string
+        attribute :inline_header, :boolean
+        attribute :unnumbered, :boolean
         attribute :toc, :string
         attribute :class_attr, :string
         attribute :title,

data/lib/metanorma/standard_document/sections/standard_content_section.rb

@@ -18,8 +18,8 @@ module Metanorma
         attribute :type, :string
         attribute :number, :string
         attribute :obligation, :string
-        attribute :inline_header, :string
-        attribute :unnumbered, :string
+        attribute :inline_header, :boolean
+        attribute :unnumbered, :boolean
         attribute :toc, :string
         attribute :class_attr, :string
         attribute :title,

data/lib/metanorma/standard_document/sections/standard_hierarchical_section.rb

@@ -12,7 +12,7 @@ module Metanorma
         attribute :original_id, :string
         attribute :autonum, :string
         attribute :displayorder, :integer
-        attribute :inline_header, :string
+        attribute :inline_header, :boolean
 
         xml do
           element "standard-hierarchical-section"

data/lib/metanorma/standard_document/sections/standard_references_section.rb

@@ -17,9 +17,9 @@ module Metanorma
       # bibliographical references (as modelled in Relaton), along with
       # any prefatory text.
       class StandardReferencesSection < Metanorma::StandardDocument::Sections::StandardSection
-        attribute :normative, :string
+        attribute :normative, :boolean
         attribute :obligation, :string
-        attribute :hidden, :string
+        attribute :hidden, :boolean
         attribute :references, Metanorma::Document::Components::BibData::BibliographicItem,
                   collection: true
         attribute :passthrough, Metanorma::StandardDocument::Blocks::Passthrough,

data/lib/metanorma/standard_document/sections/standard_section.rb

@@ -10,7 +10,7 @@ module Metanorma
         attribute :amend, Metanorma::StandardDocument::Blocks::AmendBlock
         attribute :number, :string
         attribute :branch_number, :string
-        attribute :unnumbered, :string
+        attribute :unnumbered, :boolean
         attribute :obligation, :string
 
         attribute :semx_id, :string

data/lib/metanorma/standard_document/sections/terms_section.rb

@@ -19,8 +19,8 @@ module Metanorma
         attribute :type, :string
         attribute :number, :string
         attribute :obligation, :string
-        attribute :inline_header, :string
-        attribute :unnumbered, :string
+        attribute :inline_header, :boolean
+        attribute :unnumbered, :boolean
         attribute :toc, :string
         attribute :class_attr, :string
         attribute :title,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-document
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-21 00:00:00.000000000 Z
+date: 2026-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -604,7 +604,6 @@ files:
 - lib/metanorma/iso_document/metadata/title_main.rb
 - lib/metanorma/iso_document/metadata/title_part.rb
 - lib/metanorma/iso_document/metadata/title_part_prefix.rb
-- lib/metanorma/iso_document/raw_paragraph.rb
 - lib/metanorma/iso_document/root.rb
 - lib/metanorma/iso_document/sections.rb
 - lib/metanorma/iso_document/sections/colophon.rb

data/lib/metanorma/iso_document/raw_paragraph.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Metanorma
-  module IsoDocument
-    # Paragraph with mixed inline content preserved as raw XML.
-    # Used for contexts where <p> contains inline elements like
-    # <concept>, <xref>, <em>, <strong>, <stem>, <fn>, <link>.
-    class RawParagraph < Lutaml::Model::Serializable
-      attribute :id, :string
-      attribute :semx_id, :string
-      attribute :original_id, :string
-      attribute :content, :string
-
-      xml do
-        element "p"
-        map_attribute "id", to: :id
-        map_attribute "semx-id", to: :semx_id
-        map_attribute "original-id", to: :original_id
-        map_all_content to: :content
-      end
-    end
-  end
-end