sts 0.5.2 → 0.5.4

data/lib/sts/iso_sts/edition.rb

@@ -3,9 +3,11 @@
 module Sts
   module IsoSts
     class Edition < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       xml do
         element "edition"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/iso_sts/ext_link.rb

@@ -11,7 +11,7 @@ module Sts
       attribute :content, :string
       attribute :bold, ::Sts::IsoSts::Bold
       attribute :italic, ::Sts::IsoSts::Italic
-      attribute :named_content, ::Sts::NisoSts::NamedContent
+      attribute :named_content, ::Sts::IsoSts::NamedContent
 
       xml do
         element "ext-link"

data/lib/sts/iso_sts/fig.rb

@@ -28,6 +28,7 @@ module Sts
 
       xml do
         element "fig"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "position", to: :position

data/lib/sts/iso_sts/fn.rb

@@ -15,6 +15,7 @@ module Sts
 
       xml do
         element "fn"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "fn-type", to: :fn_type

data/lib/sts/iso_sts/fn_group.rb

@@ -14,6 +14,7 @@ module Sts
 
       xml do
         element "fn-group"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type

data/lib/sts/iso_sts/front.rb

@@ -3,6 +3,8 @@
 module Sts
   module IsoSts
     class Front < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :std_meta, ::Sts::NisoSts::MetadataStd
       attribute :iso_meta, ::Sts::IsoSts::IsoMeta
       attribute :reg_meta, ::Sts::IsoSts::RegMeta, collection: true
       attribute :nat_meta, ::Sts::IsoSts::NatMeta, collection: true
@@ -10,7 +12,10 @@ module Sts
 
       xml do
         element "front"
+        map_attribute "id", to: :id
+        ordered
 
+        map_element "std-meta", to: :std_meta
         map_element "iso-meta", to: :iso_meta
         map_element "reg-meta", to: :reg_meta
         map_element "nat-meta", to: :nat_meta

data/lib/sts/iso_sts/graphic.rb

@@ -12,6 +12,8 @@ module Sts
       attribute :mimetype, :string
       attribute :mime_subtype, :string
       attribute :xlink_href, :string
+      attribute :xlink_type, :string
+      attribute :graphic_type, :string
       attribute :label, ::Sts::IsoSts::Label
       attribute :caption, ::Sts::IsoSts::Caption
       attribute :alt_text, ::Sts::NisoSts::AltText
@@ -19,6 +21,7 @@ module Sts
 
       xml do
         element "graphic"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "position", to: :position
@@ -29,6 +32,8 @@ module Sts
         map_attribute "mimetype", to: :mimetype
         map_attribute "mime-subtype", to: :mime_subtype
         map_attribute "xlink:href", to: :xlink_href
+        map_attribute "xlink:type", to: :xlink_type
+        map_attribute "type", to: :graphic_type
 
         map_element "label", to: :label
         map_element "caption", to: :caption

data/lib/sts/iso_sts/inline_formula.rb

@@ -7,7 +7,7 @@ module Sts
       attribute :content_type, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
-      attribute :math, ::Sts::IsoSts::Mathml2::Math
+      attribute :math, Mml::V3::Math
       attribute :bold, ::Sts::IsoSts::Bold
       attribute :italic, ::Sts::IsoSts::Italic
       attribute :inline_formula, ::Sts::IsoSts::InlineFormula

data/lib/sts/iso_sts/iso_meta.rb

@@ -7,11 +7,11 @@ module Sts
       attribute :title_wrap, ::Sts::IsoSts::TitleWrap, collection: true
       attribute :doc_ident, ::Sts::IsoSts::DocumentIdentification
       attribute :std_ident, ::Sts::IsoSts::StandardIdentification
-      attribute :content_language, ::Sts::NisoSts::ContentLanguage,
+      attribute :content_language, ::Sts::IsoSts::ContentLanguage,
                 collection: true
       attribute :std_ref, ::Sts::IsoSts::StdRef, collection: true
       attribute :doc_ref, ::Sts::IsoSts::DocRef
-      attribute :release_date, ::Sts::IsoSts::ReleaseDate
+      attribute :release_date, ::Sts::IsoSts::ReleaseDate, collection: true
       attribute :comm_ref, ::Sts::IsoSts::CommRef
       attribute :secretariat, ::Sts::IsoSts::Secretariat, collection: true
       attribute :ics, ::Sts::NisoSts::Ics, collection: true
@@ -21,12 +21,13 @@ module Sts
                 collection: true
       attribute :custom_meta_group, ::Sts::NisoSts::CustomMetaGroup,
                 collection: true
-      attribute :meta_date, ::Sts::NisoSts::MetaDate, collection: true
+      attribute :meta_date, ::Sts::IsoSts::MetaDate, collection: true
       attribute :pub_date, ::Sts::NisoSts::PubDate
       attribute :is_proof, ::Sts::NisoSts::IsProof
 
       xml do
         element "iso-meta"
+        ordered
 
         map_attribute "id", to: :id
 

data/lib/sts/iso_sts/italic.rb

@@ -6,17 +6,23 @@ module Sts
       attribute :id, :string
       attribute :specific_use, :string
       attribute :content, :string, collection: true
-      attribute :bold, ::Sts::IsoSts::Bold
-      attribute :italic, ::Sts::IsoSts::Italic
-      attribute :sub, ::Sts::NisoSts::Sub
-      attribute :sup, ::Sts::NisoSts::Sup
-      attribute :xref, ::Sts::TbxIsoTml::Xref
-      attribute :ext_link, ::Sts::NisoSts::ExtLink
-      attribute :uri, ::Sts::NisoSts::Uri
-      attribute :inline_formula, ::Sts::IsoSts::InlineFormula
-      attribute :named_content, ::Sts::NisoSts::NamedContent
-      attribute :styled_content, ::Sts::IsoSts::StyledContent
-      attribute :break, ::Sts::IsoSts::Break
+      attribute :bold, ::Sts::IsoSts::Bold, collection: true
+      attribute :italic, ::Sts::IsoSts::Italic, collection: true
+      attribute :sub, ::Sts::IsoSts::Sub, collection: true
+      attribute :sup, ::Sts::IsoSts::Sup, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :ext_link, ::Sts::IsoSts::ExtLink, collection: true
+      attribute :uri, ::Sts::IsoSts::Uri, collection: true
+      attribute :inline_formula, ::Sts::IsoSts::InlineFormula, collection: true
+      attribute :named_content, ::Sts::IsoSts::NamedContent, collection: true
+      attribute :styled_content, ::Sts::IsoSts::StyledContent, collection: true
+      attribute :break, ::Sts::IsoSts::Break, collection: true
+      attribute :std_ref, ::Sts::IsoSts::StdRef, collection: true
+      attribute :monospace, ::Sts::IsoSts::Monospace, collection: true
+      attribute :sc, ::Sts::IsoSts::Sc, collection: true
+      attribute :strike, ::Sts::IsoSts::Strike, collection: true
+      attribute :underline, ::Sts::IsoSts::Underline, collection: true
+      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
 
       xml do
         element "italic"
@@ -38,6 +44,12 @@ module Sts
         map_element "named-content", to: :named_content
         map_element "styled-content", to: :styled_content
         map_element "break", to: :break
+        map_element "std-ref", to: :std_ref
+        map_element "monospace", to: :monospace
+        map_element "sc", to: :sc
+        map_element "strike", to: :strike
+        map_element "underline", to: :underline
+        map_element "fn", to: :fn
       end
     end
   end

data/lib/sts/iso_sts/label.rb

@@ -3,20 +3,22 @@
 module Sts
   module IsoSts
     class Label < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::IsoSts::Bold
       attribute :italic, ::Sts::IsoSts::Italic
-      attribute :sub, ::Sts::NisoSts::Sub
-      attribute :sup, ::Sts::NisoSts::Sup
+      attribute :sub, ::Sts::IsoSts::Sub
+      attribute :sup, ::Sts::IsoSts::Sup
       attribute :inline_formula, ::Sts::IsoSts::InlineFormula
       attribute :break, ::Sts::IsoSts::Break
       attribute :styled_content, ::Sts::IsoSts::StyledContent
-      attribute :ext_link, ::Sts::NisoSts::ExtLink
-      attribute :uri, ::Sts::NisoSts::Uri
-      attribute :named_content, ::Sts::NisoSts::NamedContent
+      attribute :ext_link, ::Sts::IsoSts::ExtLink
+      attribute :uri, ::Sts::IsoSts::Uri
+      attribute :named_content, ::Sts::IsoSts::NamedContent
 
       xml do
         element "label"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/iso_sts/language.rb

@@ -3,12 +3,14 @@
 module Sts
   module IsoSts
     class Language < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :lang, :string
       attribute :specific_use, :string
 
       xml do
         element "language"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/iso_sts/list.rb

@@ -17,6 +17,7 @@ module Sts
 
       xml do
         element "list"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "list-type", to: :list_type

data/lib/sts/iso_sts/list_item.rb

@@ -8,13 +8,16 @@ module Sts
       attribute :xml_lang, :string
       attribute :label, ::Sts::IsoSts::Label
       attribute :paragraph, ::Sts::IsoSts::Paragraph, collection: true
-      attribute :non_normative_note, ::Sts::IsoSts::NonNormativeNote
-      attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample
-      attribute :def_list, ::Sts::IsoSts::DefList
-      attribute :list, ::Sts::IsoSts::List
+      attribute :non_normative_note, ::Sts::IsoSts::NonNormativeNote,
+                collection: true
+      attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample,
+                collection: true
+      attribute :def_list, ::Sts::IsoSts::DefList, collection: true
+      attribute :list, ::Sts::IsoSts::List, collection: true
 
       xml do
         element "list-item"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "specific-use", to: :specific_use

data/lib/sts/iso_sts/mathml2/math.rb

@@ -18,22 +18,16 @@ module Sts
           map_content to: :content
         end
 
+        MATH_NS = "http://www.w3.org/1998/Math/MathML"
+
         def to_xml(*)
-          if content
-            Nokogiri::XML(content, &:strict).root.to_xml
-          elsif @original_xml
-            @original_xml
-          else
-            %{<math xmlns="#{::Sts::Namespaces::MathmlNamespace.uri}"/>}
-          end
+          @original_xml || %{<math xmlns="#{MATH_NS}"/>}
         end
 
-        MATH_XPATH = ".//*[local-name()='math']"
-        MATH_NS_XPATH = ".//math[@xmlns='http://www.w3.org/1998/Math/MathML']"
-        MATH_ML_XPATH = ".//mml:math"
-
         def self.from_xml(input)
-          doc = Nokogiri::XML(input, &:strict)
+          input_str = input.respond_to?(:read) ? input.read : input.to_s
+
+          doc = parse_with_namespace(input_str)
           math_element = find_math_element(doc)
           return new if math_element.nil?
 
@@ -45,13 +39,21 @@ module Sts
           math
         end
 
+        def self.parse_with_namespace(xml_str)
+          # Detect namespace-prefixed math elements and wrap to resolve prefixes
+          if xml_str.include?("<mml:") || xml_str.match?(/<\w+:math[\s>]/)
+            wrapped = "<wrapper xmlns:mml=\"#{MATH_NS}\">#{xml_str}</wrapper>"
+            Nokogiri::XML(wrapped)
+          else
+            Nokogiri::XML(xml_str)
+          end
+        end
+        private_class_method :parse_with_namespace
+
         def self.find_math_element(doc)
-          doc.at_xpath(MATH_NS_XPATH) ||
-            doc.at_xpath(
-              MATH_ML_XPATH,
-              "mml" => "http://www.w3.org/1998/Math/MathML",
-            ) ||
-            doc.at_xpath(MATH_XPATH)
+          doc.at_xpath("//math[@xmlns='#{MATH_NS}']") ||
+            doc.at_xpath(".//mml:math", "mml" => MATH_NS) ||
+            doc.at_xpath(".//*[local-name()='math']")
         end
         private_class_method :find_math_element
 

data/lib/sts/iso_sts/meta_date.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class MetaDate < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content, :string
+      attribute :type, :string
+
+      xml do
+        element "meta-date"
+
+        map_content to: :content
+
+        map_attribute "id", to: :id
+        map_attribute :type, to: :type
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/mixed_citation.rb

@@ -10,18 +10,30 @@ module Sts
       attribute :specific_use, :string
       attribute :xml_lang, :string
       attribute :content, :string, collection: true
-      attribute :bold, ::Sts::IsoSts::Bold
-      attribute :italic, ::Sts::IsoSts::Italic
-      attribute :sub, ::Sts::NisoSts::Sub
-      attribute :sup, ::Sts::NisoSts::Sup
-      attribute :std, ::Sts::IsoSts::Std
-      attribute :ext_link, ::Sts::NisoSts::ExtLink
-      attribute :uri, ::Sts::NisoSts::Uri, collection: true
-      attribute :named_content, ::Sts::NisoSts::NamedContent
-      attribute :styled_content, ::Sts::IsoSts::StyledContent
-      attribute :fn, ::Sts::TbxIsoTml::Fn
-      attribute :xref, ::Sts::TbxIsoTml::Xref
+      attribute :bold, ::Sts::IsoSts::Bold, collection: true
+      attribute :italic, ::Sts::IsoSts::Italic, collection: true
+      attribute :sub, ::Sts::IsoSts::Sub, collection: true
+      attribute :sup, ::Sts::IsoSts::Sup, collection: true
+      attribute :std, ::Sts::IsoSts::Std, collection: true
+      attribute :ext_link, ::Sts::IsoSts::ExtLink, collection: true
+      attribute :uri, ::Sts::IsoSts::Uri, collection: true
+      attribute :named_content, ::Sts::IsoSts::NamedContent, collection: true
+      attribute :styled_content, ::Sts::IsoSts::StyledContent, collection: true
+      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
       attribute :break, ::Sts::IsoSts::Break, collection: true
+      attribute :person_group, ::Sts::NisoSts::PersonGroup, collection: true
+      attribute :collab, ::Sts::NisoSts::Collab, collection: true
+      attribute :year, ::Sts::NisoSts::Year, collection: true
+      attribute :source, ::Sts::NisoSts::Source
+      attribute :article_title, ::Sts::NisoSts::ArticleTitle
+      attribute :volume, ::Sts::NisoSts::Volume
+      attribute :issue, ::Sts::NisoSts::Issue
+      attribute :fpage, ::Sts::NisoSts::Fpage
+      attribute :lpage, ::Sts::NisoSts::Lpage
+      attribute :page_range, ::Sts::NisoSts::PageRange
+      attribute :publisher, ::Sts::NisoSts::Publisher
+      attribute :pub_id, ::Sts::NisoSts::PubId, collection: true
 
       xml do
         element "mixed-citation"
@@ -48,6 +60,18 @@ module Sts
         map_element "fn", to: :fn
         map_element "xref", to: :xref
         map_element "break", to: :break
+        map_element "person-group", to: :person_group
+        map_element "collab", to: :collab
+        map_element "year", to: :year
+        map_element "source", to: :source
+        map_element "article-title", to: :article_title
+        map_element "volume", to: :volume
+        map_element "issue", to: :issue
+        map_element "fpage", to: :fpage
+        map_element "lpage", to: :lpage
+        map_element "page-range", to: :page_range
+        map_element "publisher", to: :publisher
+        map_element "pub-id", to: :pub_id
       end
     end
   end

data/lib/sts/iso_sts/monospace.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Monospace < Lutaml::Model::Serializable
+      attribute :specific_use, :string
+      attribute :content, :string, collection: true
+      attribute :bold, ::Sts::IsoSts::Bold, collection: true
+      attribute :italic, ::Sts::IsoSts::Italic, collection: true
+      attribute :sub, ::Sts::IsoSts::Sub, collection: true
+      attribute :sup, ::Sts::IsoSts::Sup, collection: true
+
+      xml do
+        element "monospace"
+        mixed_content
+
+        map_attribute "specific-use", to: :specific_use
+        map_content to: :content
+        map_element "bold", to: :bold
+        map_element "italic", to: :italic
+        map_element "sub", to: :sub
+        map_element "sup", to: :sup
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/named_content.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class NamedContent < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :alt, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :xlink_href, :string
+      attribute :xlink_role, :string
+      attribute :xlink_title, :string
+      attribute :xlink_show, :string
+      attribute :xlink_actuate, :string
+      attribute :content, :string, collection: true
+      attribute :bold, ::Sts::IsoSts::Bold, collection: true
+      attribute :italic, ::Sts::IsoSts::Italic, collection: true
+      attribute :sub, ::Sts::IsoSts::Sub, collection: true
+      attribute :sup, ::Sts::IsoSts::Sup, collection: true
+
+      xml do
+        element "named-content"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_attribute "alt", to: :alt
+        map_attribute "content-type", to: :content_type
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
+        map_attribute "xlink:href", to: :xlink_href
+        map_attribute "xlink:role", to: :xlink_role
+        map_attribute "xlink:title", to: :xlink_title
+        map_attribute "xlink:show", to: :xlink_show
+        map_attribute "xlink:actuate", to: :xlink_actuate
+        map_content to: :content
+        map_element "bold", to: :bold
+        map_element "italic", to: :italic
+        map_element "sub", to: :sub
+        map_element "sup", to: :sup
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/nat_meta.rb

@@ -8,11 +8,11 @@ module Sts
       attribute :title_wrap, ::Sts::IsoSts::TitleWrap, collection: true
       attribute :doc_ident, ::Sts::IsoSts::DocumentIdentification
       attribute :std_ident, ::Sts::IsoSts::StandardIdentification
-      attribute :content_language, ::Sts::NisoSts::ContentLanguage,
+      attribute :content_language, ::Sts::IsoSts::ContentLanguage,
                 collection: true
-      attribute :std_ref, ::Sts::NisoSts::StandardRef, collection: true
+      attribute :std_ref, ::Sts::IsoSts::StandardRef, collection: true
       attribute :doc_ref, :string
-      attribute :release_date, ::Sts::NisoSts::ReleaseDate
+      attribute :release_date, ::Sts::IsoSts::ReleaseDate
       attribute :comm_ref, :string
       attribute :secretariat, ::Sts::NisoSts::Secretariat, collection: true
       attribute :ics, ::Sts::NisoSts::Ics, collection: true
@@ -22,11 +22,12 @@ module Sts
                 collection: true
       attribute :custom_meta_group, ::Sts::NisoSts::CustomMetaGroup,
                 collection: true
-      attribute :meta_date, ::Sts::NisoSts::MetaDate, collection: true
+      attribute :meta_date, ::Sts::IsoSts::MetaDate, collection: true
       attribute :pub_date, ::Sts::NisoSts::PubDate
 
       xml do
         element "nat-meta"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "originator", to: :originator

data/lib/sts/iso_sts/non_normative_example.rb

@@ -9,9 +9,12 @@ module Sts
       attribute :paragraph, ::Sts::IsoSts::Paragraph, collection: true
       attribute :list, ::Sts::IsoSts::List, collection: true
       attribute :def_list, ::Sts::IsoSts::DefList, collection: true
+      attribute :preformat, ::Sts::IsoSts::Preformat, collection: true
+      attribute :styled_content, ::Sts::IsoSts::StyledContent, collection: true
 
       xml do
         element "non-normative-example"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "originator", to: :originator
@@ -20,6 +23,8 @@ module Sts
         map_element "p", to: :paragraph
         map_element "list", to: :list
         map_element "def-list", to: :def_list
+        map_element "preformat", to: :preformat
+        map_element "styled-content", to: :styled_content
       end
     end
   end

data/lib/sts/iso_sts/non_normative_note.rb

@@ -13,6 +13,7 @@ module Sts
 
       xml do
         element "non-normative-note"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type

data/lib/sts/iso_sts/page_count.rb

@@ -3,11 +3,13 @@
 module Sts
   module IsoSts
     class PageCount < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :count, :string
 
       xml do
         element "page-count"
 
+        map_attribute "id", to: :id
         map_attribute "count", to: :count
       end
     end

data/lib/sts/iso_sts/paragraph.rb

@@ -10,29 +10,36 @@ module Sts
       attribute :originator, :string
       attribute :style_type, :string
       attribute :content, :string, collection: true
-      attribute :bold, ::Sts::IsoSts::Bold
-      attribute :italic, ::Sts::IsoSts::Italic
-      attribute :xref, ::Sts::TbxIsoTml::Xref
-      attribute :ext_link, ::Sts::NisoSts::ExtLink
-      attribute :uri, ::Sts::NisoSts::Uri
-      attribute :inline_formula, ::Sts::IsoSts::InlineFormula
-      attribute :disp_formula, ::Sts::IsoSts::DispFormula
-      attribute :std, ::Sts::IsoSts::Std
-      attribute :list, ::Sts::IsoSts::List
-      attribute :def_list, ::Sts::IsoSts::DefList
-      attribute :non_normative_note, ::Sts::IsoSts::NonNormativeNote
-      attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample
-      attribute :fn, ::Sts::TbxIsoTml::Fn
+      attribute :bold, ::Sts::IsoSts::Bold, collection: true
+      attribute :italic, ::Sts::IsoSts::Italic, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :ext_link, ::Sts::IsoSts::ExtLink, collection: true
+      attribute :uri, ::Sts::IsoSts::Uri, collection: true
+      attribute :inline_formula, ::Sts::IsoSts::InlineFormula, collection: true
+      attribute :disp_formula, ::Sts::IsoSts::DispFormula, collection: true
+      attribute :std, ::Sts::IsoSts::Std, collection: true
+      attribute :list, ::Sts::IsoSts::List, collection: true
+      attribute :def_list, ::Sts::IsoSts::DefList, collection: true
+      attribute :non_normative_note, ::Sts::IsoSts::NonNormativeNote,
+                collection: true
+      attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample,
+                collection: true
+      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
       attribute :styled_content, ::Sts::IsoSts::StyledContent, collection: true
-      attribute :graphic, ::Sts::IsoSts::Graphic
-      attribute :math, ::Sts::IsoSts::Mathml2::Math
-      attribute :break, ::Sts::IsoSts::Break
-      attribute :sub, ::Sts::NisoSts::Sub, collection: true
-      attribute :sup, ::Sts::NisoSts::Sup, collection: true
-      attribute :monospace, ::Sts::NisoSts::Monospace
-      attribute :sc, ::Sts::NisoSts::Sc
-      attribute :strike, ::Sts::NisoSts::Strike
-      attribute :underline, ::Sts::NisoSts::Underline
+      attribute :graphic, ::Sts::IsoSts::Graphic, collection: true
+      attribute :math, Mml::V3::Math, collection: true
+      attribute :break, ::Sts::IsoSts::Break, collection: true
+      attribute :sub, ::Sts::IsoSts::Sub, collection: true
+      attribute :sup, ::Sts::IsoSts::Sup, collection: true
+      attribute :monospace, ::Sts::IsoSts::Monospace, collection: true
+      attribute :sc, ::Sts::IsoSts::Sc, collection: true
+      attribute :strike, ::Sts::IsoSts::Strike, collection: true
+      attribute :underline, ::Sts::IsoSts::Underline, collection: true
+      attribute :array, ::Sts::IsoSts::Array, collection: true
+      attribute :fig, ::Sts::IsoSts::Fig, collection: true
+      attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
+      attribute :preformat, ::Sts::IsoSts::Preformat, collection: true
+      attribute :term, ::Sts::TbxIsoTml::Term, collection: true
 
       xml do # rubocop:disable Metrics/BlockLength
         element "p"
@@ -70,6 +77,11 @@ module Sts
         map_element "sc", to: :sc
         map_element "strike", to: :strike
         map_element "underline", to: :underline
+        map_element "array", to: :array
+        map_element "fig", to: :fig
+        map_element "table-wrap", to: :table_wrap
+        map_element "preformat", to: :preformat
+        map_element "term", to: :term
       end
     end
   end

data/lib/sts/iso_sts/permissions.rb

@@ -3,6 +3,7 @@
 module Sts
   module IsoSts
     class Permissions < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :copyright_statement, ::Sts::IsoSts::CopyrightStatement,
                 collection: true
       attribute :copyright_year, ::Sts::IsoSts::CopyrightYear, collection: true
@@ -12,6 +13,8 @@ module Sts
 
       xml do
         element "permissions"
+        map_attribute "id", to: :id
+        ordered
 
         map_element "copyright-statement", to: :copyright_statement
         map_element "copyright-year", to: :copyright_year