sts 0.5.2 → 0.5.4

data/lib/sts/iso_sts/title_intro.rb

@@ -3,6 +3,7 @@
 module Sts
   module IsoSts
     class TitleIntro < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::IsoSts::Bold
       attribute :italic, ::Sts::IsoSts::Italic
@@ -10,6 +11,7 @@ module Sts
 
       xml do
         element "intro"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/iso_sts/title_main.rb

@@ -3,6 +3,7 @@
 module Sts
   module IsoSts
     class TitleMain < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::IsoSts::Bold
       attribute :italic, ::Sts::IsoSts::Italic
@@ -10,6 +11,7 @@ module Sts
 
       xml do
         element "main"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/iso_sts/title_wrap.rb

@@ -12,6 +12,7 @@ module Sts
 
       xml do
         element "title-wrap"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "xml:lang", to: :xml_lang

data/lib/sts/iso_sts/tr.rb

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

data/lib/sts/iso_sts/underline.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Underline < 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 "underline"
+        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/uri.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Uri < Lutaml::Model::Serializable
+      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
+
+      xml do
+        element "uri"
+        mixed_content
+
+        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
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/xref.rb

@@ -12,10 +12,10 @@ 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
       attribute :styled_content, ::Sts::IsoSts::StyledContent
-      attribute :sub, ::Sts::NisoSts::Sub
-      attribute :sup, ::Sts::NisoSts::Sup
+      attribute :sub, ::Sts::IsoSts::Sub
+      attribute :sup, ::Sts::IsoSts::Sup
 
       xml do
         element "xref"

data/lib/sts/iso_sts.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "mml"
+
 module Sts
   module IsoSts
     autoload :Standard, "#{__dir__}/iso_sts/standard"
@@ -33,6 +35,9 @@ module Sts
     autoload :ReleaseDate, "#{__dir__}/iso_sts/release_date"
     autoload :CommRef, "#{__dir__}/iso_sts/comm_ref"
     autoload :Secretariat, "#{__dir__}/iso_sts/secretariat"
+    autoload :MetaDate, "#{__dir__}/iso_sts/meta_date"
+    autoload :ContentLanguage, "#{__dir__}/iso_sts/content_language"
+    autoload :StandardRef, "#{__dir__}/iso_sts/standard_ref"
 
     # Section elements
     autoload :Sec, "#{__dir__}/iso_sts/sec"
@@ -57,6 +62,12 @@ module Sts
     autoload :Title, "#{__dir__}/iso_sts/title"
     autoload :Bold, "#{__dir__}/iso_sts/bold"
     autoload :Italic, "#{__dir__}/iso_sts/italic"
+    autoload :Monospace, "#{__dir__}/iso_sts/monospace"
+    autoload :NamedContent, "#{__dir__}/iso_sts/named_content"
+    autoload :Sc, "#{__dir__}/iso_sts/sc"
+    autoload :Strike, "#{__dir__}/iso_sts/strike"
+    autoload :Underline, "#{__dir__}/iso_sts/underline"
+    autoload :Uri, "#{__dir__}/iso_sts/uri"
 
     # List elements
     autoload :List, "#{__dir__}/iso_sts/list"

data/lib/sts/mathml.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "mml"
+
+module Sts
+  module Mathml
+    # Wrapper around Mml::V3::Math for use within Sts document models.
+    #
+    # Mml::V3::Math is the actual serializable model. This class provides
+    # a typed namespace at Sts::Mathml and forwards the small subset of
+    # Mml::V3::Math interface used by Sts elements.
+    #
+    # All Mml element types (mi, mo, mn, mrow, etc.) are used directly
+    # from Mml::V3 — only the root <math> wrapper lives here.
+    class Math
+      # Type alias for callers that prefer the Sts namespace path.
+      # Maps directly to Mml::V3::Math with identical serialization.
+      Root = Mml::V3::Math
+    end
+  end
+end

data/lib/sts/namespaces.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sts
   module Namespaces
     class MathmlNamespace < Lutaml::Xml::Namespace
@@ -7,6 +9,7 @@ module Sts
 
     class TbxNamespace < Lutaml::Xml::Namespace
       uri "urn:iso:std:iso:30042:ed-1"
+      uri_aliases "urn:iso:std:iso:30042:ed-2"
       prefix_default "tbx"
     end
   end

data/lib/sts/niso_sts/abstract.rb

@@ -4,6 +4,7 @@ module Sts
   module NisoSts
     class Abstract < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :originator, :string
       attribute :abstract_type, :string
       attribute :lang, Lutaml::Xml::W3c::XmlLangType
       attribute :title, :string
@@ -11,8 +12,10 @@ module Sts
 
       xml do
         element "abstract"
+        ordered
 
         map_attribute "id", to: :id
+        map_attribute "originator", to: :originator
         map_attribute "abstract-type", to: :abstract_type
         map_attribute "xml:lang", to: :lang
         map_element "title", to: :title

data/lib/sts/niso_sts/access_date.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class AccessDate < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
       attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
 
       xml do
         element "access-date"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/accrediting_organization.rb

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

data/lib/sts/niso_sts/ack.rb

@@ -12,7 +12,7 @@ module Sts
 
       xml do
         element "ack"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "xml:lang", to: :xml_lang

data/lib/sts/niso_sts/addr_line.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class AddrLine < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
       attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
 
       xml do
         element "addr-line"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/address.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class Address < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :addr_line, ::Sts::NisoSts::AddrLine, collection: true
       attribute :city, ::Sts::NisoSts::City
       attribute :state, ::Sts::NisoSts::State
@@ -14,6 +15,8 @@ module Sts
 
       xml do
         element "address"
+        map_attribute "id", to: :id
+        ordered
 
         map_element "addr-line", to: :addr_line
         map_element "city", to: :city

data/lib/sts/niso_sts/adoption.rb

@@ -12,7 +12,7 @@ module Sts
 
       xml do
         element "adoption"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "lang", to: :lang

data/lib/sts/niso_sts/adoption_front.rb

@@ -5,6 +5,7 @@ module Sts
     class AdoptionFront < Front
       xml do
         element "adoption-front"
+        ordered
         map_element "iso-meta", to: :iso_meta
         map_element "std-meta", to: :std_meta
         map_element "sec", to: :sec

data/lib/sts/niso_sts/aff_alternatives.rb

@@ -3,11 +3,14 @@
 module Sts
   module NisoSts
     class AffAlternatives < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :aff, ::Sts::NisoSts::Aff, collection: true
 
       xml do
         element "aff-alternatives"
 
+        map_attribute "id", to: :id
+
         map_element "aff", to: :aff
       end
     end

data/lib/sts/niso_sts/alt_text.rb

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

data/lib/sts/niso_sts/alt_title.rb

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

data/lib/sts/niso_sts/alternatives.rb

@@ -3,12 +3,11 @@
 module Sts
   module NisoSts
     class Alternatives < Lutaml::Model::Serializable
-      attribute :content, :string, collection: true
+      attribute :id, :string
       xml do
         element "alternatives"
-        mixed_content
-
-        map_content to: :content
+        map_attribute "id", to: :id
+        ordered
       end
     end
   end

data/lib/sts/niso_sts/annotation.rb

@@ -8,17 +8,15 @@ module Sts
       attribute :xml_lang, :string
       attribute :specific_use, :string
       attribute :symbol, :string
-      attribute :content, :string, collection: true
       xml do
         element "annotation"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type
         map_attribute "xml:lang", to: :xml_lang
         map_attribute "specific-use", to: :specific_use
         map_attribute "symbol", to: :symbol
-        map_content to: :content
       end
     end
   end

data/lib/sts/niso_sts/anonymous.rb

@@ -3,8 +3,11 @@
 module Sts
   module NisoSts
     class Anonymous < Lutaml::Model::Serializable
+      attribute :id, :string
       xml do
         element "anonymous"
+
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/niso_sts/app.rb

@@ -5,6 +5,7 @@ module Sts
     class App < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :content_type, :string
+      attribute :originator, :string
       attribute :label, ::Sts::NisoSts::Label
       attribute :annex_type, :string
       attribute :title, ::Sts::NisoSts::Title
@@ -14,14 +15,22 @@ module Sts
       attribute :ref_list, ::Sts::NisoSts::ReferenceList, collection: true
       attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote,
                 collection: true
+      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample,
+                collection: true
       attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :array, ::Sts::NisoSts::SectionArray, collection: true
+      attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
+      attribute :boxed_text, ::Sts::NisoSts::BoxedText, collection: true
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
 
       xml do
         element "app"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type
+        map_attribute "originator", to: :originator
 
         map_element "label", to: :label
         map_element "annex-type", to: :annex_type
@@ -31,7 +40,13 @@ module Sts
         map_element "p", to: :paragraph
         map_element "ref-list", to: :ref_list
         map_element "non-normative-note", to: :non_normative_note
+        map_element "non-normative-example", to: :non_normative_example
         map_element "table-wrap", to: :table_wrap
+        map_element "list", to: :list
+        map_element "array", to: :array
+        map_element "preformat", to: :preformat
+        map_element "boxed-text", to: :boxed_text
+        map_element "graphic", to: :graphic
       end
     end
   end

data/lib/sts/niso_sts/app_group.rb

@@ -3,11 +3,16 @@
 module Sts
   module NisoSts
     class AppGroup < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
       attribute :app, Sts::NisoSts::App, collection: true
 
       xml do
         element "app-group"
+        ordered
 
+        map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
         map_element "app", to: :app
       end
     end

data/lib/sts/niso_sts/article_title.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class ArticleTitle < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
       attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
 
       xml do
         element "article-title"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/attrib.rb

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

data/lib/sts/niso_sts/author_comment.rb

@@ -7,16 +7,14 @@ module Sts
       attribute :content_type, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
-      attribute :content, :string, collection: true
       xml do
         element "author-comment"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
-        map_content to: :content
       end
     end
   end

data/lib/sts/niso_sts/author_notes.rb

@@ -14,7 +14,7 @@ module Sts
 
       xml do
         element "author-notes"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "xml:lang", to: :xml_lang

data/lib/sts/niso_sts/authorization.rb

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

data/lib/sts/niso_sts/award_group.rb

@@ -3,18 +3,37 @@
 module Sts
   module NisoSts
     class AwardGroup < Lutaml::Model::Serializable
-      attribute :id, :string
       attribute :award_type, :string
+      attribute :id, :string
+      attribute :rid, :string
+      attribute :specific_use, :string
+      attribute :xlink_href, :string
+      attribute :xlink_role, :string
+      attribute :xlink_title, :string
+      attribute :xlink_show, :string
+      attribute :xlink_actuate, :string
+      attribute :xml_lang, :string
       attribute :funding_source, ::Sts::NisoSts::FundingSource, collection: true
       attribute :award_id, ::Sts::NisoSts::AwardId, collection: true
-      attribute :principal_award_recipient, ::Sts::NisoSts::PrincipalAwardRecipient
-      attribute :principal_investigator, ::Sts::NisoSts::PrincipalInvestigator
+      attribute :principal_award_recipient,
+                ::Sts::NisoSts::PrincipalAwardRecipient, collection: true
+      attribute :principal_investigator, ::Sts::NisoSts::PrincipalInvestigator,
+                collection: true
 
       xml do
         element "award-group"
+        ordered
 
-        map_attribute "id", to: :id
         map_attribute "award-type", to: :award_type
+        map_attribute "id", to: :id
+        map_attribute "rid", to: :rid
+        map_attribute "specific-use", to: :specific_use
+        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_attribute "xml:lang", to: :xml_lang
 
         map_element "funding-source", to: :funding_source
         map_element "award-id", to: :award_id

data/lib/sts/niso_sts/award_id.rb

@@ -4,14 +4,20 @@ module Sts
   module NisoSts
     class AwardId < Lutaml::Model::Serializable
       attribute :award_id_type, :string
+      attribute :id, :string
       attribute :rid, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
       attribute :content, :string, collection: true
       xml do
         element "award-id"
         mixed_content
 
         map_attribute "award-id-type", to: :award_id_type
+        map_attribute "id", to: :id
         map_attribute "rid", to: :rid
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
         map_content to: :content
       end
     end

data/lib/sts/niso_sts/back.rb

@@ -3,18 +3,37 @@
 module Sts
   module NisoSts
     class Back < Lutaml::Model::Serializable
-      attribute :ref_list, ::Sts::NisoSts::ReferenceList
-      attribute :app_group, ::Sts::NisoSts::AppGroup
-      attribute :sec, ::Sts::NisoSts::Section
-      attribute :fn_group, ::Sts::NisoSts::FnGroup
+      attribute :id, :string
+      attribute :label, ::Sts::NisoSts::Label
+      attribute :title, ::Sts::NisoSts::Title
+      attribute :ack, ::Sts::NisoSts::Ack, collection: true
+      attribute :app_group, ::Sts::NisoSts::AppGroup, collection: true
+      attribute :bio, ::Sts::NisoSts::Bio, collection: true
+      attribute :fn_group, ::Sts::NisoSts::FnGroup, collection: true
+      attribute :glossary, ::Sts::NisoSts::Glossary, collection: true
+      attribute :index, ::Sts::NisoSts::Index, collection: true
+      attribute :notes, ::Sts::NisoSts::Notes, collection: true
+      attribute :ref_list, ::Sts::NisoSts::ReferenceList, collection: true
+      attribute :sec, ::Sts::NisoSts::Section, collection: true
+      attribute :toc, ::Sts::NisoSts::Toc, collection: true
 
       xml do
         element "back"
+        ordered
 
-        map_element "ref-list", to: :ref_list
+        map_attribute "id", to: :id
+        map_element "label", to: :label
+        map_element "title", to: :title
+        map_element "ack", to: :ack
         map_element "app-group", to: :app_group
-        map_element "sec", to: :sec
+        map_element "bio", to: :bio
         map_element "fn-group", to: :fn_group
+        map_element "glossary", to: :glossary
+        map_element "index", to: :index
+        map_element "notes", to: :notes
+        map_element "ref-list", to: :ref_list
+        map_element "sec", to: :sec
+        map_element "toc", to: :toc
       end
     end
   end

data/lib/sts/niso_sts/bio.rb

@@ -4,17 +4,15 @@ module Sts
   module NisoSts
     class Bio < Lutaml::Model::Serializable
       attribute :id, :string
-      attribute :content, :string, collection: true
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
       attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
       attribute :paragraph, ::Sts::NisoSts::Paragraph, collection: true
 
       xml do
         element "bio"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
-        map_content to: :content
         map_element "bold", to: :bold
         map_element "italic", to: :italic
         map_element "p", to: :paragraph