metanorma-document 0.2.7 → 0.2.9

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

@@ -11,14 +11,15 @@ module Metanorma
       #   ( BasicBlock*, content-subsection* )
       class ContentSection < Lutaml::Model::Serializable
         include Metanorma::StandardDocument::BlockAttributes
+        include Metanorma::StandardDocument::PresentationAttributes
 
         # Section identity
         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,
@@ -27,26 +28,6 @@ module Metanorma
         # Nested content subsections (recursive)
         attribute :subsection, ContentSection, 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

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

@@ -13,13 +13,14 @@ module Metanorma
       #     term+
       #   }
       class TermsSection < 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,
@@ -38,19 +39,6 @@ module Metanorma
                   Metanorma::StandardDocument::Terms::Term,
                   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
-        attribute :variant_title,
-                  Metanorma::Document::Components::Inline::VariantTitleElement,
-                  collection: true
-
         xml do
           element "terms"
           ordered
@@ -64,6 +52,8 @@ module Metanorma
           map_element "p",                to: :paragraphs
           map_element "ul",               to: :unordered_lists
           map_element "term",             to: :terms
+          map_element "fmt-annotation-start", to: :fmt_annotation_start
+          map_element "fmt-annotation-end",   to: :fmt_annotation_end
         end
       end
     end

data/lib/metanorma/standard_document.rb

@@ -7,6 +7,9 @@ module Metanorma
     autoload :BlockAttributes, "metanorma/standard_document/block_attributes"
     autoload :BlockXmlMapping, "metanorma/standard_document/block_attributes"
     autoload :SectionXmlMapping, "metanorma/standard_document/block_attributes"
+    autoload :PresentationAttributes,
+             "metanorma/standard_document/block_attributes"
+    autoload :OrderedContent, "metanorma/standard_document/block_attributes"
     autoload :Blocks, "metanorma/standard_document/blocks"
     autoload :Boilerplate, "metanorma/standard_document/boilerplate"
     autoload :Elements, "metanorma/standard_document/elements"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-document
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  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