metanorma-document 0.2.7 → 0.2.9

data/lib/metanorma/html/generator.rb

@@ -56,29 +56,22 @@ module Metanorma
           contributors = bibdata.contributor
           return false unless contributors
 
-          begin
-            contributors.any? do |c|
-              begin
-                next false unless c.role&.any? do |r|
-                  r&.type == "author"
-                end
-              rescue StandardError
-                false
-              end
-              org = c.organization
-              next false unless org
-
-              org_abbrev = org.abbreviation
-              if org_abbrev.is_a?(String)
-                org_abbrev == abbrev
-              elsif org_abbrev.is_a?(Lutaml::Model::Serializable)
-                safe_attr(org_abbrev, :content) == abbrev
-              else
-                org_abbrev.to_s == abbrev
-              end
+          contributors.any? do |c|
+            roles = c.role
+            next false unless roles.is_a?(Array)
+            next false unless roles.any? { |r| r&.type == "author" }
+
+            org = c.organization
+            next false unless org
+
+            org_abbrev = org.abbreviation
+            if org_abbrev.is_a?(String)
+              org_abbrev == abbrev
+            elsif org_abbrev.is_a?(Lutaml::Model::Serializable)
+              safe_attr(org_abbrev, :content) == abbrev
+            else
+              org_abbrev.to_s == abbrev
             end
-          rescue StandardError
-            false
           end
         end
 

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_foreword_section.rb

@@ -11,19 +11,8 @@ module Metanorma
           element "foreword"
           ordered
 
-          map_attribute "id",             to: :id
-          map_attribute "anchor",         to: :anchor
-          map_attribute "obligation",     to: :obligation
-          map_attribute "semx-id",        to: :semx_id
-          map_attribute "displayorder",   to: :displayorder
-
-          map_element "title",            to: :title
-          map_element "fmt-title",        to: :fmt_title
-
-          Metanorma::StandardDocument::BlockXmlMapping.apply_block_mappings(self)
-
-          map_element "fmt-annotation-start", to: :fmt_annotation_start
-          map_element "fmt-annotation-end",   to: :fmt_annotation_end
+          Metanorma::StandardDocument::SectionXmlMapping.apply_content_section_attributes(self)
+          Metanorma::StandardDocument::SectionXmlMapping.apply_content_section_elements(self)
         end
 
         json do

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

@@ -6,17 +6,19 @@ module Metanorma
       # Terms section specific to ISO/IEC documents.
       # Maps <terms> element with <title>, <p>, <ul>, <term> children.
       class IsoTermsSection < Lutaml::Model::Serializable
+        include Metanorma::StandardDocument::PresentationAttributes
+
         attribute :id, :string
-        attribute :anchor, :string
         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,
@@ -46,18 +48,6 @@ module Metanorma
 
         # Nested clause sections inside terms
         attribute :clause, IsoClauseSection, collection: true
-        attribute :semx_id, :string
-        attribute :autonum, :string
-        attribute :displayorder, :integer
-        attribute :fmt_title, Metanorma::Document::Components::Inline::FmtTitleElement
-        attribute :fmt_xref_label,
-                  Metanorma::Document::Components::Inline::FmtXrefLabelElement, collection: true
-        attribute :fmt_annotation_start,
-                  Metanorma::Document::Components::Inline::FmtAnnotationStartElement,
-                  collection: true
-        attribute :fmt_annotation_end,
-                  Metanorma::Document::Components::Inline::FmtAnnotationEndElement,
-                  collection: true
 
         xml do
           element "terms"
@@ -65,6 +55,7 @@ module Metanorma
           Metanorma::StandardDocument::SectionXmlMapping.apply_content_section_attributes(self)
 
           map_element "title", to: :title
+          map_element "variant-title", to: :variant_title
           map_element "fmt-title", to: :fmt_title
           map_element "fmt-xref-label", to: :fmt_xref_label
           map_element "p", to: :p

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/block_attributes.rb

@@ -51,6 +51,48 @@ module Metanorma
       end
     end
 
+    # Provides `blocks` method for ordered-content section types.
+    # Returns child nodes in document order via `each_mixed_content`.
+    module OrderedContent
+      def blocks
+        @blocks ||=
+          begin
+            result = []
+            each_mixed_content do |node|
+              result << node unless node.is_a?(String)
+            end
+            result
+          end
+      end
+    end
+
+    # Presentation/formatting attributes shared by all section types.
+    # Include in any section class that supports presentation metadata.
+    module PresentationAttributes
+      def self.included(base)
+        base.class_eval do
+          attribute :anchor, :string
+          attribute :semx_id, :string
+          attribute :autonum, :string
+          attribute :displayorder, :integer
+          attribute :fmt_title,
+                    Metanorma::Document::Components::Inline::FmtTitleElement
+          attribute :fmt_xref_label,
+                    Metanorma::Document::Components::Inline::FmtXrefLabelElement,
+                    collection: true
+          attribute :variant_title,
+                    Metanorma::Document::Components::Inline::VariantTitleElement,
+                    collection: true
+          attribute :fmt_annotation_start,
+                    Metanorma::Document::Components::Inline::FmtAnnotationStartElement,
+                    collection: true
+          attribute :fmt_annotation_end,
+                    Metanorma::Document::Components::Inline::FmtAnnotationEndElement,
+                    collection: true
+        end
+      end
+    end
+
     # Adds XML element mappings for block-level content to a mapping builder.
     # Call inside an `xml do` block:
     #

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

@@ -12,17 +12,23 @@ module Metanorma
       # Uses `ordered` to enable `each_mixed_content` for document-order iteration.
       class AnnexSection < Lutaml::Model::Serializable
         include Metanorma::StandardDocument::BlockAttributes
+        include Metanorma::StandardDocument::PresentationAttributes
+        include Metanorma::StandardDocument::OrderedContent
 
         # Section identity and classification
         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
 
+        # Language/script (unique to annex)
+        attribute :language, :string
+        attribute :script, :string
+
         # Sub-clauses within annex (recursive)
         attribute :clause, AnnexSection, collection: true
 
@@ -50,28 +56,6 @@ module Metanorma
                   Metanorma::Document::Components::EmptyElements::PageBreakElement,
                   collection: true
 
-        # Presentation-specific attributes
-        attribute :anchor, :string
-        attribute :semx_id, :string
-        attribute :autonum, :string
-        attribute :displayorder, :integer
-        attribute :language, :string
-        attribute :script, :string
-        attribute :fmt_title,
-                  Metanorma::Document::Components::Inline::FmtTitleElement
-        attribute :fmt_xref_label,
-                  Metanorma::Document::Components::Inline::FmtXrefLabelElement,
-                  collection: true
-        attribute :variant_title,
-                  Metanorma::Document::Components::Inline::VariantTitleElement,
-                  collection: true
-        attribute :fmt_annotation_start,
-                  Metanorma::Document::Components::Inline::FmtAnnotationStartElement,
-                  collection: true
-        attribute :fmt_annotation_end,
-                  Metanorma::Document::Components::Inline::FmtAnnotationEndElement,
-                  collection: true
-
         xml do
           element "annex"
           ordered
@@ -79,18 +63,6 @@ module Metanorma
           Metanorma::StandardDocument::SectionXmlMapping.apply_annex_attributes(self)
           Metanorma::StandardDocument::SectionXmlMapping.apply_annex_elements(self)
         end
-
-        # Blocks in document order, used by JSON serialization
-        def blocks
-          @blocks ||=
-            begin
-              result = []
-              each_mixed_content do |node|
-                result << node unless node.is_a?(String)
-              end
-              result
-            end
-        end
       end
     end
   end

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

@@ -12,14 +12,16 @@ module Metanorma
       # Uses `ordered` to enable `each_mixed_content` for document-order iteration.
       class ClauseSection < Lutaml::Model::Serializable
         include Metanorma::StandardDocument::BlockAttributes
+        include Metanorma::StandardDocument::PresentationAttributes
+        include Metanorma::StandardDocument::OrderedContent
 
         # Section identity and classification
         attribute :id, :string
         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,
@@ -76,26 +78,6 @@ module Metanorma
                   Metanorma::Document::Components::IdElements::Bookmark,
                   collection: true
 
-        # Presentation-specific attributes
-        attribute :anchor, :string
-        attribute :semx_id, :string
-        attribute :autonum, :string
-        attribute :displayorder, :integer
-        attribute :fmt_title,
-                  Metanorma::Document::Components::Inline::FmtTitleElement
-        attribute :fmt_xref_label,
-                  Metanorma::Document::Components::Inline::FmtXrefLabelElement,
-                  collection: true
-        attribute :variant_title,
-                  Metanorma::Document::Components::Inline::VariantTitleElement,
-                  collection: true
-        attribute :fmt_annotation_start,
-                  Metanorma::Document::Components::Inline::FmtAnnotationStartElement,
-                  collection: true
-        attribute :fmt_annotation_end,
-                  Metanorma::Document::Components::Inline::FmtAnnotationEndElement,
-                  collection: true
-
         xml do
           element "clause"
           ordered
@@ -103,18 +85,6 @@ module Metanorma
           Metanorma::StandardDocument::SectionXmlMapping.apply_clause_attributes(self)
           Metanorma::StandardDocument::SectionXmlMapping.apply_clause_elements(self)
         end
-
-        # Blocks in document order, used by JSON serialization
-        def blocks
-          @blocks ||=
-            begin
-              result = []
-              each_mixed_content do |node|
-                result << node unless node.is_a?(String)
-              end
-              result
-            end
-        end
       end
     end
   end

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

@@ -14,13 +14,14 @@ module Metanorma
       #     definitions*
       #   }
       class DefinitionSection < Lutaml::Model::Serializable
+        include Metanorma::StandardDocument::PresentationAttributes
+
         attribute :id, :string
-        attribute :anchor, :string
         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,
@@ -46,31 +47,24 @@ module Metanorma
         # Recursive definitions
         attribute :definitions, DefinitionSection, collection: true
 
-        # Presentation-specific attributes
-        attribute :semx_id, :string
-        attribute :autonum, :string
-        attribute :displayorder, :integer
-        attribute :fmt_title,
-                  Metanorma::Document::Components::Inline::FmtTitleElement
-        attribute :fmt_xref_label,
-                  Metanorma::Document::Components::Inline::FmtXrefLabelElement,
-                  collection: true
-
         xml do
           element "definitions"
           ordered
 
           Metanorma::StandardDocument::SectionXmlMapping.apply_content_section_attributes(self)
 
-          map_element "title",         to: :title
-          map_element "p",             to: :paragraphs
-          map_element "ul",            to: :unordered_lists
-          map_element "table",         to: :tables
-          map_element "dl",            to: :definition_lists
-          map_element "example",       to: :examples
-          map_element "definitions",   to: :definitions
-          map_element "fmt-title",     to: :fmt_title
+          map_element "title",          to: :title
+          map_element "variant-title",  to: :variant_title
+          map_element "p",              to: :paragraphs
+          map_element "ul",             to: :unordered_lists
+          map_element "table",          to: :tables
+          map_element "dl",             to: :definition_lists
+          map_element "example",        to: :examples
+          map_element "definitions",    to: :definitions
+          map_element "fmt-title",      to: :fmt_title
           map_element "fmt-xref-label", to: :fmt_xref_label
+          map_element "fmt-annotation-start", to: :fmt_annotation_start
+          map_element "fmt-annotation-end",   to: :fmt_annotation_end
         end
       end
     end