metanorma-document 0.2.5 → 0.2.7

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

@@ -1,165 +1,20 @@
 # frozen_string_literal: true
 
-module Metanorma
-  module StandardDocument
-    module Blocks
-      # Value element inside classification — mixed content with link.
-      class ClassificationValue < Lutaml::Model::Serializable
-        attribute :text, :string, collection: true
-        attribute :link, Metanorma::Document::Components::Inline::LinkElement,
-                  collection: true
-
-        xml do
-          mixed_content
-          map_content to: :text
-          map_element "link", to: :link
-        end
-      end
-
-      # Classification element inside requirement with tag/value children.
-      class RequirementClassification < Lutaml::Model::Serializable
-        attribute :tag, :string
-        attribute :value, ClassificationValue
-
-        xml do
-          element "classification"
-          map_element "tag", to: :tag
-          map_element "value", to: :value
-        end
-      end
-
-      # Description wrapper inside requirements containing paragraphs and other blocks.
-      class RequirementDescription < Lutaml::Model::Serializable
-        attribute :p, Metanorma::Document::Components::Paragraphs::ParagraphBlock,
-                  collection: true
-        attribute :ul, Metanorma::Document::Components::Lists::UnorderedList,
-                  collection: true
-        attribute :ol, Metanorma::Document::Components::Lists::OrderedList,
-                  collection: true
-        attribute :sourcecode,
-                  Metanorma::Document::Components::AncillaryBlocks::SourcecodeBlock,
-                  collection: true
-        attribute :table, Metanorma::Document::Components::Tables::TableBlock,
-                  collection: true
-        attribute :example,
-                  Metanorma::Document::Components::AncillaryBlocks::ExampleBlock,
-                  collection: true
-        attribute :note, Metanorma::Document::Components::Blocks::NoteBlock,
-                  collection: true
-        attribute :figure,
-                  Metanorma::Document::Components::AncillaryBlocks::FigureBlock,
-                  collection: true
-
-        xml do
-          element "description"
-          map_element "p", to: :p
-          map_element "ul", to: :ul
-          map_element "ol", to: :ol
-          map_element "sourcecode", to: :sourcecode
-          map_element "table", to: :table
-          map_element "example", to: :example
-          map_element "note", to: :note
-          map_element "figure", to: :figure
-        end
-      end
-
-      # Inherit element — mixed content, can contain text, eref, or xref.
-      class RequirementInherit < Lutaml::Model::Serializable
-        attribute :text, :string, collection: true
-        attribute :eref, Metanorma::Document::Components::Inline::ErefElement,
-                  collection: true
-        attribute :xref, Metanorma::Document::Components::Inline::XrefElement,
-                  collection: true
-
-        xml do
-          mixed_content
-          map_content to: :text
-          map_element "eref", to: :eref
-          map_element "xref", to: :xref
-        end
-      end
-
-      # Base class for requirement/recommendation/permission with shared structure.
-      class RequirementBase < Lutaml::Model::Serializable
-        attribute :id, :string
-        attribute :model, :string
-        attribute :obligation, :string
-        attribute :type, :string
-        attribute :anchor, :string
-        attribute :subject, :string
-        attribute :classification, RequirementClassification, collection: true
-        attribute :description, RequirementDescription, collection: true
-        attribute :inherit, RequirementInherit, collection: true
-        attribute :requirement, "Metanorma::StandardDocument::Blocks::RequirementModel",
-                  collection: true
-        attribute :recommendation, "Metanorma::StandardDocument::Blocks::RecommendationModel",
-                  collection: true
-        attribute :permission, "Metanorma::StandardDocument::Blocks::PermissionModel",
-                  collection: true
-        attribute :example,
-                  Metanorma::Document::Components::AncillaryBlocks::ExampleBlock,
-                  collection: true
-      end
-
-      # Requirement element — prescriptive statement using "shall".
-      class RequirementModel < RequirementBase
-        xml do
-          element "requirement"
-          map_attribute "id", to: :id
-          map_attribute "model", to: :model
-          map_attribute "obligation", to: :obligation
-          map_attribute "type", to: :type
-          map_attribute "anchor", to: :anchor
-          map_element "subject", to: :subject
-          map_element "classification", to: :classification
-          map_element "description", to: :description
-          map_element "inherit", to: :inherit
-          map_element "requirement", to: :requirement
-          map_element "recommendation", to: :recommendation
-          map_element "permission", to: :permission
-          map_element "example", to: :example
-        end
-      end
-
-      # Recommendation element — prescriptive statement using "should".
-      class RecommendationModel < RequirementBase
-        xml do
-          element "recommendation"
-          map_attribute "id", to: :id
-          map_attribute "model", to: :model
-          map_attribute "obligation", to: :obligation
-          map_attribute "type", to: :type
-          map_attribute "anchor", to: :anchor
-          map_element "subject", to: :subject
-          map_element "classification", to: :classification
-          map_element "description", to: :description
-          map_element "inherit", to: :inherit
-          map_element "requirement", to: :requirement
-          map_element "recommendation", to: :recommendation
-          map_element "permission", to: :permission
-          map_element "example", to: :example
-        end
-      end
-
-      # Permission element — prescriptive statement using "may".
-      class PermissionModel < RequirementBase
-        xml do
-          element "permission"
-          map_attribute "id", to: :id
-          map_attribute "model", to: :model
-          map_attribute "obligation", to: :obligation
-          map_attribute "type", to: :type
-          map_attribute "anchor", to: :anchor
-          map_element "subject", to: :subject
-          map_element "classification", to: :classification
-          map_element "description", to: :description
-          map_element "inherit", to: :inherit
-          map_element "requirement", to: :requirement
-          map_element "recommendation", to: :recommendation
-          map_element "permission", to: :permission
-          map_element "example", to: :example
-        end
-      end
-    end
-  end
-end
+DOC = Metanorma::Document::Components::Blocks
+
+Metanorma::StandardDocument::Blocks::ClassificationValue =
+  DOC::ClassificationValue
+Metanorma::StandardDocument::Blocks::RequirementClassification =
+  DOC::RequirementClassification
+Metanorma::StandardDocument::Blocks::RequirementDescription =
+  DOC::RequirementDescription
+Metanorma::StandardDocument::Blocks::RequirementInherit =
+  DOC::RequirementInherit
+Metanorma::StandardDocument::Blocks::RequirementBase =
+  DOC::RequirementBase
+Metanorma::StandardDocument::Blocks::RequirementModel =
+  DOC::RequirementModel
+Metanorma::StandardDocument::Blocks::RecommendationModel =
+  DOC::RecommendationModel
+Metanorma::StandardDocument::Blocks::PermissionModel =
+  DOC::PermissionModel

data/lib/metanorma/standard_document/boilerplate.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module StandardDocument
+    class Boilerplate < Lutaml::Model::Serializable
+      attribute :content, :string
+
+      xml do
+        element "boilerplate"
+        map_all_content to: :content
+      end
+    end
+  end
+end

data/lib/metanorma/standard_document/elements/add.rb

@@ -1,19 +1,3 @@
 # frozen_string_literal: true
 
-module Metanorma
-  module StandardDocument
-    module Elements
-      # Indication of text added through editorial intervention.
-      class Add < Metanorma::Document::Components::TextElements::TextElement
-        attribute :semx_id, :string
-        attribute :original_id, :string
-        xml do
-          element "add"
-
-          map_attribute "semx-id", to: :semx_id
-          map_attribute "original-id", to: :original_id
-        end
-      end
-    end
-  end
-end
+Metanorma::StandardDocument::Elements::Add = Metanorma::Document::Elements::Add

data/lib/metanorma/standard_document/elements/del.rb

@@ -1,19 +1,3 @@
 # frozen_string_literal: true
 
-module Metanorma
-  module StandardDocument
-    module Elements
-      # Indication of text deleted through editorial intervention.
-      class Del < Metanorma::Document::Components::TextElements::TextElement
-        attribute :semx_id, :string
-        attribute :original_id, :string
-        xml do
-          element "del"
-
-          map_attribute "semx-id", to: :semx_id
-          map_attribute "original-id", to: :original_id
-        end
-      end
-    end
-  end
-end
+Metanorma::StandardDocument::Elements::Del = Metanorma::Document::Elements::Del

data/lib/metanorma/standard_document/metadata/metanorma_extension.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module StandardDocument
+    module Metadata
+      class MetanormaExtension < Lutaml::Model::Serializable
+        attribute :content, :string
+
+        xml do
+          element "metanorma-extension"
+          map_all_content to: :content
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/standard_document/metadata.rb

@@ -5,6 +5,8 @@ module Metanorma
     module Metadata
       autoload :EditorialGroupType, "#{__dir__}/metadata/editorial_group_type"
       autoload :IcsType, "#{__dir__}/metadata/ics_type"
+      autoload :MetanormaExtension,
+               "#{__dir__}/metadata/metanorma_extension"
       autoload :StandardBibData, "#{__dir__}/metadata/standard_bib_data"
       autoload :StandardBibDataExtensionType,
                "#{__dir__}/metadata/standard_bib_data_extension_type"

data/lib/metanorma/standard_document/refs/reference_to_term.rb

@@ -5,7 +5,8 @@ module Metanorma
     module Refs
       # Cross-reference to a term.
       class ReferenceToTerm < Metanorma::Document::Components::ReferenceElements::ReferenceElement
-        attribute :source, BasicObject
+        attribute :source,
+                  Metanorma::Document::Components::ReferenceElements::SourceElement
         attribute :term, :string, collection: true
 
         attribute :semx_id, :string

data/lib/metanorma/standard_document/root_attributes.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module StandardDocument
+    # Mixin that declares the common attributes for every <metanorma> Root class.
+    #
+    # Every flavor Root class includes this module and adds its own
+    # flavor-specific attributes (e.g. bibdata type, preface/sections types).
+    module RootAttributes
+      def self.included(base)
+        base.class_eval do
+          attribute :version,             :string
+          attribute :type,                :string
+          attribute :schema_version,      :string
+          attribute :flavor,              :string
+
+          attribute :bibliography,
+                    Metanorma::StandardDocument::Sections::BibliographySection
+          attribute :boilerplate,
+                    Metanorma::StandardDocument::Boilerplate
+          attribute :metanorma_extension,
+                    Metanorma::StandardDocument::Metadata::MetanormaExtension
+          attribute :annotation_container,
+                    Metanorma::StandardDocument::AnnotationContainer
+          attribute :localized_strings,
+                    Metanorma::Document::Components::Inline::LocalizedStringsElement
+          attribute :fmt_footnote_container,
+                    Metanorma::Document::Components::Inline::FmtFootnoteContainerElement
+          attribute :colophon,
+                    Metanorma::StandardDocument::Sections::Colophon
+
+          attribute :term_sources,
+                    Metanorma::Document::Components::ReferenceElements::Citation,
+                    collection: true
+          attribute :indexsect,
+                    Metanorma::Document::Components::Sections::BasicSection
+
+          attribute :autonum,             :string
+          attribute :fmt_xref_label,      :string
+        end
+      end
+    end
+
+    # Adds common XML root element mappings for all flavor Root classes.
+    # Call inside an `xml do` block:
+    #
+    #   xml do
+    #     element "metanorma"
+    #     namespace StandardDocument::Namespace
+    #     RootXmlMapping.apply(self)
+    #     # ... flavor-specific mappings (bibdata, preface, sections, annex)
+    #   end
+    module RootXmlMapping
+      def self.apply(mapping)
+        mapping.map_attribute "type",               to: :type
+        mapping.map_attribute "version",            to: :version
+        mapping.map_attribute "schema-version",     to: :schema_version
+        mapping.map_attribute "flavor",             to: :flavor
+        mapping.map_attribute "autonum",            to: :autonum
+        mapping.map_attribute "fmt-xref-label",     to: :fmt_xref_label
+        mapping.map_element   "bibdata",            to: :bibdata
+        mapping.map_element   "preface",            to: :preface
+        mapping.map_element   "sections",           to: :sections
+        mapping.map_element   "annex",              to: :annex
+        mapping.map_element   "bibliography",       to: :bibliography
+        mapping.map_element   "boilerplate",        to: :boilerplate
+        mapping.map_element   "metanorma-extension", to: :metanorma_extension
+        mapping.map_element   "annotation-container", to: :annotation_container
+        mapping.map_element   "localized-strings", to: :localized_strings
+        mapping.map_element   "fmt-footnote-container",
+                              to: :fmt_footnote_container
+        mapping.map_element   "colophon",           to: :colophon
+        mapping.map_element   "termdocsource",      to: :term_sources
+        mapping.map_element   "indexsect",          to: :indexsect
+      end
+    end
+  end
+end

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

@@ -4,10 +4,8 @@ module Metanorma
   module StandardDocument
     module Sections
       # Abstract of the document.
-      class Abstract < Metanorma::StandardDocument::Sections::StandardContentSection
-        attribute :semx_id, :string
+      class Abstract < Metanorma::StandardDocument::Sections::ContentSection
         attribute :original_id, :string
-        attribute :displayorder, :integer
         xml do
           element "abstract"
 

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

@@ -4,10 +4,8 @@ module Metanorma
   module StandardDocument
     module Sections
       # Acknowledgements for the document.
-      class Acknowledgements < Metanorma::StandardDocument::Sections::StandardContentSection
-        attribute :semx_id, :string
+      class Acknowledgements < Metanorma::StandardDocument::Sections::ContentSection
         attribute :original_id, :string
-        attribute :displayorder, :integer
         xml do
           element "acknowledgements"
 

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

@@ -3,28 +3,93 @@
 module Metanorma
   module StandardDocument
     module Sections
-      # Section of document constituting an annex or appendix.
-      class AnnexSection < Metanorma::StandardDocument::Sections::StandardSection
-        attribute :subsections,
-                  Metanorma::StandardDocument::Sections::ClauseSection, collection: true
+      # An annex section in the document.
+      # Corresponds to isodoc.rnc `Annex-Section-Body`:
+      #   Annex-Section-Attributes, title?,
+      #   ( BasicBlock*,
+      #     (annex-subsection | terms | definitions | references | floating-title)* )
+      #
+      # Uses `ordered` to enable `each_mixed_content` for document-order iteration.
+      class AnnexSection < Lutaml::Model::Serializable
+        include Metanorma::StandardDocument::BlockAttributes
 
+        # Section identity and classification
+        attribute :id, :string
+        attribute :number, :string
+        attribute :obligation, :string
+        attribute :unnumbered, :string
+        attribute :toc, :string
+        attribute :inline_header, :string
+        attribute :title,
+                  Metanorma::Document::Components::Inline::TitleWithAnnotationElement
+
+        # Sub-clauses within annex (recursive)
+        attribute :clause, AnnexSection, collection: true
+
+        # Appendix (sub-sections unique to annex)
+        attribute :appendix, ClauseSection, collection: true
+
+        # Terms, definitions, references within annex
+        attribute :terms,
+                  Metanorma::StandardDocument::Sections::TermsSection,
+                  collection: true
+        attribute :definitions,
+                  Metanorma::StandardDocument::Sections::DefinitionSection,
+                  collection: true
+        attribute :references,
+                  Metanorma::StandardDocument::Sections::StandardReferencesSection,
+                  collection: true
+
+        # Floating titles
+        attribute :floating_title,
+                  Metanorma::StandardDocument::Sections::FloatingTitle,
+                  collection: true
+
+        # Page breaks
+        attribute :pagebreak,
+                  Metanorma::Document::Components::EmptyElements::PageBreakElement,
+                  collection: true
+
+        # Presentation-specific attributes
+        attribute :anchor, :string
         attribute :semx_id, :string
-        attribute :original_id, :string
         attribute :autonum, :string
         attribute :displayorder, :integer
-        attribute :inline_header, :string
-        attribute :type, :string
+        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-section"
-          map_element "subsections", to: :subsections
-
-          map_attribute "semx-id", to: :semx_id
-          map_attribute "original-id", to: :original_id
-          map_attribute "autonum", to: :autonum
-          map_attribute "displayorder", to: :displayorder
-          map_attribute "inline-header", to: :inline_header
-          map_attribute "type", to: :type
+          element "annex"
+          ordered
+
+          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

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

@@ -7,8 +7,7 @@ module Metanorma
       # one or more <references> sections (normative and/or informative).
       class BibliographySection < Lutaml::Model::Serializable
         attribute :references, StandardReferencesSection, collection: true
-        attribute :clause, Metanorma::IsoDocument::Sections::IsoClauseSection,
-                  collection: true
+        attribute :clause, ClauseSection, collection: true
 
         xml do
           element "bibliography"

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

@@ -3,25 +3,117 @@
 module Metanorma
   module StandardDocument
     module Sections
-      # A numbered clause constituting part of the main body of a _StandardDocument_.
-      class ClauseSection < Metanorma::StandardDocument::Sections::StandardSection
+      # A numbered clause in the document body.
+      # Corresponds to isodoc.rnc `Clause-Section`:
+      #   Section-Attributes, type?, title?,
+      #   ( (BasicBlock+ | amend) |
+      #     (clause-subsection | terms | definitions | floating-title)+ )
+      #
+      # Uses `ordered` to enable `each_mixed_content` for document-order iteration.
+      class ClauseSection < Lutaml::Model::Serializable
+        include Metanorma::StandardDocument::BlockAttributes
+
+        # Section identity and classification
+        attribute :id, :string
         attribute :type, :string
+        attribute :number, :string
+        attribute :obligation, :string
+        attribute :inline_header, :string
+        attribute :unnumbered, :string
+        attribute :toc, :string
+        attribute :class_attr, :string
+        attribute :title,
+                  Metanorma::Document::Components::Inline::TitleWithAnnotationElement
+
+        # Sub-clauses (recursive)
+        attribute :clause, ClauseSection, collection: true
+
+        # Amend blocks (for amendment documents)
+        attribute :amend,
+                  Metanorma::StandardDocument::Blocks::AmendBlock
+
+        # Terms sections nested inside clauses
+        attribute :terms,
+                  Metanorma::StandardDocument::Sections::TermsSection,
+                  collection: true
+
+        # Definitions sections nested inside clauses
+        attribute :definitions,
+                  Metanorma::StandardDocument::Sections::DefinitionSection,
+                  collection: true
+
+        # References sections nested inside clauses
+        attribute :references,
+                  Metanorma::StandardDocument::Sections::StandardReferencesSection,
+                  collection: true
 
+        # Floating titles
+        attribute :floating_title,
+                  Metanorma::StandardDocument::Sections::FloatingTitle,
+                  collection: true
+
+        # Forms
+        attribute :form,
+                  Metanorma::StandardDocument::Blocks::Form,
+                  collection: true
+
+        # Requirements / recommendations / permissions
+        attribute :requirement,
+                  Metanorma::StandardDocument::Blocks::RequirementModel,
+                  collection: true
+        attribute :recommendation,
+                  Metanorma::StandardDocument::Blocks::RecommendationModel,
+                  collection: true
+        attribute :permission,
+                  Metanorma::StandardDocument::Blocks::PermissionModel,
+                  collection: true
+
+        # Page breaks and bookmarks
+        attribute :pagebreak,
+                  Metanorma::Document::Components::EmptyElements::PageBreakElement,
+                  collection: true
+        attribute :bookmark,
+                  Metanorma::Document::Components::IdElements::Bookmark,
+                  collection: true
+
+        # Presentation-specific attributes
+        attribute :anchor, :string
         attribute :semx_id, :string
-        attribute :original_id, :string
         attribute :autonum, :string
         attribute :displayorder, :integer
-        attribute :inline_header, :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 "clause"
-          map_attribute "type", to: :type
+          ordered
+
+          Metanorma::StandardDocument::SectionXmlMapping.apply_clause_attributes(self)
+          Metanorma::StandardDocument::SectionXmlMapping.apply_clause_elements(self)
+        end
 
-          map_attribute "semx-id", to: :semx_id
-          map_attribute "original-id", to: :original_id
-          map_attribute "autonum", to: :autonum
-          map_attribute "displayorder", to: :displayorder
-          map_attribute "inline-header", to: :inline_header
+        # 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

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module StandardDocument
+    module Sections
+      class Colophon < Lutaml::Model::Serializable
+        attribute :clause, ClauseSection, collection: true
+
+        xml do
+          element "colophon"
+          map_element "clause", to: :clause
+        end
+      end
+    end
+  end
+end