metanorma-document 0.2.8 → 0.2.12

data/lib/metanorma/ietf_document/metadata/pi_settings.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module IetfDocument
+    module Metadata
+      class PiSettings < Lutaml::Model::Serializable
+        attribute :toc, :string
+        attribute :tocdepth, :string
+        attribute :symrefs, :string
+        attribute :sortrefs, :string
+        attribute :compact, :string
+        attribute :subcompact, :string
+        attribute :strict, :string
+        attribute :comments, :string
+        attribute :notedraftinprogress, :string
+
+        xml do
+          element "pi"
+          map_element "toc", to: :toc
+          map_element "tocdepth", to: :tocdepth
+          map_element "symrefs", to: :symrefs
+          map_element "sortrefs", to: :sortrefs
+          map_element "compact", to: :compact
+          map_element "subcompact", to: :subcompact
+          map_element "strict", to: :strict
+          map_element "comments", to: :comments
+          map_element "notedraftinprogress", to: :notedraftinprogress
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/ietf_document/metadata.rb

@@ -9,6 +9,8 @@ module Metanorma
                "metanorma/ietf_document/metadata/ietf_bibliographic_item"
       autoload :IetfEditorialGroup,
                "metanorma/ietf_document/metadata/ietf_editorial_group"
+      autoload :PiSettings,
+               "metanorma/ietf_document/metadata/pi_settings"
     end
   end
 end

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/metadata/doctype_element.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module IsoDocument
+    module Metadata
+      class DoctypeElement < Lutaml::Model::Serializable
+        attribute :language, :string
+        attribute :abbreviation, :string
+        attribute :value, :string
+
+        xml do
+          element "doctype"
+          map_attribute "language", to: :language, render_empty: true
+          map_attribute "abbreviation", to: :abbreviation
+          map_content to: :value
+        end
+      end
+    end
+  end
+end

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

@@ -3,66 +3,18 @@
 module Metanorma
   module IsoDocument
     module Metadata
-      # Extension point for bibliographical definitions of ISO/IEC documents.
-      # Document type element with language attribute.
-      class DoctypeElement < Lutaml::Model::Serializable
-        attribute :language, :string
-        attribute :abbreviation, :string
-        attribute :value, :string
-
-        xml do
-          element "doctype"
-          map_attribute "language", to: :language, render_empty: true
-          map_attribute "abbreviation", to: :abbreviation
-          map_content to: :value
-        end
-      end
-
-      # Stage name element with abbreviation attribute.
-      class StagenameElement < Lutaml::Model::Serializable
-        attribute :abbreviation, :string
-        attribute :value, :string
-
-        xml do
-          element "stagename"
-          map_attribute "abbreviation", to: :abbreviation
-          map_content to: :value
-        end
-      end
-
       class IsoBibDataExtensionType < Lutaml::Model::Serializable
-        # The document is a horizontal standard.
         attribute :horizontal, :boolean
-
-        # Editorial groups associated with the production of the document.
         attribute :editorial_group, IsoProjectGroup
-
-        # Name of the publication stage of the document.
         attribute :stage_name, :string
-
-        # Category of IEC Standard applicable.
         attribute :category, :string
-
-        # Type of document being updated by this document, if it is an amendment or technical corrigendum.
         attribute :updates_document_type, :string
         attribute :semx_id, :string
-
-        # Document type (e.g. "international-standard").
         attribute :doctype, DoctypeElement, collection: true
-
-        # Document flavor (e.g. "iso").
         attribute :flavor, :string
-
-        # ICS classification codes.
         attribute :ics, Ics, collection: true
-
-        # Structured identifier (project number, part).
         attribute :structuredidentifier, StructuredIdentifier
-
-        # Name of the publication stage.
         attribute :stagename, StagenameElement
-
-        # Sub-document type.
         attribute :subdoctype, :string
 
         xml do

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

@@ -3,101 +3,34 @@
 module Metanorma
   module IsoDocument
     module Metadata
-      # The bibliographical description of an ISO/IEC document.
-      # Language element with current attribute.
-      class LanguageElement < Lutaml::Model::Serializable
-        attribute :current, :string
-        attribute :value, :string
-
-        xml do
-          element "language"
-          map_attribute "current", to: :current
-          map_content to: :value
-        end
-      end
-
-      # Script element with current attribute.
-      class ScriptElement < Lutaml::Model::Serializable
-        attribute :current, :string
-        attribute :value, :string
-
-        xml do
-          element "script"
-          map_attribute "current", to: :current
-          map_content to: :value
-        end
-      end
-
       class IsoBibliographicItem < Lutaml::Model::Serializable
-        # Identifier of the document.
         attribute :doc_identifier, DocIdentifier, collection: true
-
-        # Collection of all title elements, grouped by language via consolidation mapping.
-        # Access: titles.items (raw), titles.per_language (grouped), titles.for_language("en")
         attribute :titles, AbstractTitle, collection: TitleCollection
-
-        # Type of the document.
         attribute :type, :string
-
-        # Fetched date
         attribute :fetched, Metanorma::Document::Relaton::DateTime
-
-        # URIs associated with the document.
         attribute :uri, Metanorma::Document::Relaton::TypedUri, collection: true
-
-        # Link/source
         attribute :source, :string, collection: true
-
-        # Document number
         attribute :docnumber, :string
-
-        # Contributors
         attribute :contributor, Metanorma::Document::Relaton::ContributionInfo,
                   collection: true
-
-        # Edition
         attribute :edition, Metanorma::Document::Relaton::Edition,
                   collection: true
-
-        # Version
         attribute :version, Metanorma::Document::Relaton::VersionInfo
-
-        # Notes
         attribute :note, Metanorma::Document::Relaton::TypedNote,
                   collection: true
-
-        # Language codes
         attribute :language, LanguageElement, collection: true
-
-        # Script codes
         attribute :script, ScriptElement, collection: true
-
-        # Abstract of the document.
         attribute :abstract, Metanorma::Document::Components::DataTypes::FormattedString,
                   collection: true
-
-        # Publication status of the document.
         attribute :status, IsoDocumentStatus
-
-        # Copyright information
         attribute :copyright, Metanorma::Document::Relaton::CopyrightAssociation,
                   collection: true
-
-        # Relations to other documents
         attribute :relation, Metanorma::Document::Relaton::DocumentRelation,
                   collection: true
-
-        # Formatted reference
         attribute :formattedref, Metanorma::Document::Components::DataTypes::FormattedString
-
-        # Dates
         attribute :date, Metanorma::Document::Relaton::BibliographicDate,
                   collection: true
-
-        # Place of publication
         attribute :place, :string, collection: true
-
-        # Extension point of the bibliographical description.
         attribute :ext, IsoBibDataExtensionType
         attribute :keyword, Metanorma::Document::Relaton::KeywordType,
                   collection: true
@@ -105,8 +38,6 @@ module Metanorma
                   collection: true
         attribute :editorialgroup, Metanorma::StandardDocument::Metadata::EditorialGroupType
         attribute :semx_id, :string
-
-        # Schema version (used by collection/entry bibdata, e.g. "v1.2.9").
         attribute :schema_version, :string
 
         xml do
@@ -150,8 +81,6 @@ module Metanorma
           map "ext", to: :ext
         end
 
-        # Returns the title for a given language (defaults to English)
-        # Uses consolidation-mapped per_language grouping for efficiency
         def title_for(language = "en")
           return nil unless titles
 
@@ -165,7 +94,6 @@ module Metanorma
           end
         end
 
-        # Primary title (English by default)
         def title
           @title ||= title_for("en")
         end

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

@@ -3,41 +3,11 @@
 module Metanorma
   module IsoDocument
     module Metadata
-      # Publication status of an ISO/IEC document.
-      # Stage element in presentation XML: <stage abbreviation="..." language="..." type="...">value</stage>
-      class StageElement < Lutaml::Model::Serializable
-        attribute :abbreviation, :string
-        attribute :language, :string
-        attribute :type, :string
-        attribute :value, :string, collection: true
-        attribute :br, Metanorma::Document::Components::Inline::BrElement,
-                  collection: true
-
-        xml do
-          element "stage"
-          mixed_content
-          map_attribute "abbreviation", to: :abbreviation
-          map_attribute "language", to: :language, render_empty: true
-          map_attribute "type", to: :type
-          map_content to: :value
-          map_element "br", to: :br
-        end
-      end
-
       class IsoDocumentStatus < Lutaml::Model::Serializable
-        # Publication stage of the ISO/IEC document, expressed as an International Harmonized Stage Code.
         attribute :stage, StageElement, collection: true
-
-        # Standard abbreviation of the publication stage.
         attribute :stage_abbreviation, :string
-
-        # Substage code for the ISO/IEC document.
         attribute :substage, IsoDocumentSubstageCodes
-
-        # Standard abbreviation of the publication substage.
         attribute :substage_abbreviation, :string
-
-        # Number of the iteration of the publication stage that the document is in.
         attribute :iteration, :integer
         attribute :semx_id, :string
 

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

@@ -32,6 +32,9 @@ module Metanorma
         attribute :title_amendment_prefix, AbstractTitle
         attribute :semx_id, :string
 
+        # Fallback for plain titles without structured parts
+        attribute :content, :string
+
         # Compose all parts into a single title string
         def to_s
           parts = []
@@ -50,7 +53,7 @@ module Metanorma
           end
           return parts.join(" — ") unless parts.empty?
 
-          ""
+          content.to_s
         end
       end
     end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module IsoDocument
+    module Metadata
+      class LanguageElement < Lutaml::Model::Serializable
+        attribute :current, :string
+        attribute :value, :string
+
+        xml do
+          element "language"
+          map_attribute "current", to: :current
+          map_content to: :value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module IsoDocument
+    module Metadata
+      class ProjectNumber < Lutaml::Model::Serializable
+        attribute :part, :string
+        attribute :amendment, :string
+        attribute :origyr, :string
+        attribute :value, :string
+
+        xml do
+          element "project-number"
+          map_attribute "part", to: :part
+          map_attribute "amendment", to: :amendment
+          map_attribute "origyr", to: :origyr
+          map_content to: :value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module IsoDocument
+    module Metadata
+      class ScriptElement < Lutaml::Model::Serializable
+        attribute :current, :string
+        attribute :value, :string
+
+        xml do
+          element "script"
+          map_attribute "current", to: :current
+          map_content to: :value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module IsoDocument
+    module Metadata
+      class StageElement < Lutaml::Model::Serializable
+        attribute :abbreviation, :string
+        attribute :language, :string
+        attribute :type, :string
+        attribute :value, :string, collection: true
+        attribute :br, Metanorma::Document::Components::Inline::BrElement,
+                  collection: true
+
+        xml do
+          element "stage"
+          mixed_content
+          map_attribute "abbreviation", to: :abbreviation
+          map_attribute "language", to: :language, render_empty: true
+          map_attribute "type", to: :type
+          map_content to: :value
+          map_element "br", to: :br
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module IsoDocument
+    module Metadata
+      class StagenameElement < Lutaml::Model::Serializable
+        attribute :abbreviation, :string
+        attribute :value, :string
+
+        xml do
+          element "stagename"
+          map_attribute "abbreviation", to: :abbreviation
+          map_content to: :value
+        end
+      end
+    end
+  end
+end

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

@@ -3,23 +3,6 @@
 module Metanorma
   module IsoDocument
     module Metadata
-      # Project number with optional part attribute.
-      class ProjectNumber < Lutaml::Model::Serializable
-        attribute :part, :string
-        attribute :amendment, :string
-        attribute :origyr, :string
-        attribute :value, :string
-
-        xml do
-          element "project-number"
-          map_attribute "part", to: :part
-          map_attribute "amendment", to: :amendment
-          map_attribute "origyr", to: :origyr
-          map_content to: :value
-        end
-      end
-
-      # Structured identifier for an ISO document (project number, part, etc).
       class StructuredIdentifier < Lutaml::Model::Serializable
         attribute :project_number, ProjectNumber
 

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

@@ -31,6 +31,7 @@ module Metanorma
               route "title-amd" => :title_amd
               route "title-amendment-prefix" => :title_amendment_prefix
               route "title-abbrev" => :title_full
+              route nil => :title_full
             end
           end
           map_attribute "semx-id", to: :semx_id

data/lib/metanorma/iso_document/metadata.rb

@@ -5,6 +5,7 @@ module Metanorma
     module Metadata
       autoload :AbstractTitle, "#{__dir__}/metadata/abstract_title"
       autoload :DocIdentifier, "#{__dir__}/metadata/doc_identifier"
+      autoload :DoctypeElement, "#{__dir__}/metadata/doctype_element"
       autoload :IecDocumentCategory, "#{__dir__}/metadata/iec_document_category"
       autoload :IsoBibDataExtensionType,
                "#{__dir__}/metadata/iso_bib_data_extension_type"
@@ -21,6 +22,14 @@ module Metanorma
       autoload :TitleCollection, "#{__dir__}/metadata/title_collection"
       autoload :IsoProjectGroup, "#{__dir__}/metadata/iso_project_group"
       autoload :IsoSubGroup, "#{__dir__}/metadata/iso_sub_group"
+      autoload :LanguageElement, "#{__dir__}/metadata/language_element"
+      autoload :MetanormaExtension, "#{__dir__}/metadata/metanorma_extension"
+      autoload :ProjectNumber, "#{__dir__}/metadata/project_number"
+      autoload :ScriptElement, "#{__dir__}/metadata/script_element"
+      autoload :StagenameElement, "#{__dir__}/metadata/stagename_element"
+      autoload :StageElement, "#{__dir__}/metadata/stage_element"
+      autoload :StructuredIdentifier,
+               "#{__dir__}/metadata/structured_identifier"
       autoload :TitleFull, "#{__dir__}/metadata/title_full"
       autoload :TitleIntro, "#{__dir__}/metadata/title_intro"
       autoload :TitleMain, "#{__dir__}/metadata/title_main"
@@ -30,10 +39,6 @@ module Metanorma
       autoload :TitleAmendmentPrefix,
                "#{__dir__}/metadata/title_amendment_prefix"
       autoload :Ics, "#{__dir__}/metadata/ics"
-      autoload :StructuredIdentifier,
-               "#{__dir__}/metadata/structured_identifier"
-      autoload :ProjectNumber, "#{__dir__}/metadata/structured_identifier"
-      autoload :MetanormaExtension, "#{__dir__}/metadata/metanorma_extension"
     end
   end
 end

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

@@ -3,19 +3,6 @@
 module Metanorma
   module IsoDocument
     module Terms
-      # Domain element with id attribute.
-      class TermDomainElement < Lutaml::Model::Serializable
-        attribute :id, :string
-        attribute :text, :string
-
-        xml do
-          element "domain"
-          map_attribute "id", to: :id
-          map_content to: :text
-        end
-      end
-
-      # Term subclause specific to ISO/IEC documents.
       class IsoTerm < Lutaml::Model::Serializable
         attribute :id, :string
         attribute :anchor, :string

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module IsoDocument
+    module Terms
+      class TermDomainElement < Lutaml::Model::Serializable
+        attribute :id, :string
+        attribute :text, :string
+
+        xml do
+          element "domain"
+          map_attribute "id", to: :id
+          map_content to: :text
+        end
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ module Metanorma
                "#{__dir__}/terms/iso_term_collection"
       autoload :IsoTerm, "#{__dir__}/terms/iso_term"
       autoload :TermDesignation, "#{__dir__}/terms/term_designation"
+      autoload :TermDomainElement, "#{__dir__}/terms/term_domain_element"
       autoload :TermExpression, "#{__dir__}/terms/term_expression"
       autoload :TermDefinition, "#{__dir__}/terms/term_definition"
       autoload :VerbalDefinition, "#{__dir__}/terms/verbal_definition"

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"