sts 0.5.2 → 0.5.4

data/lib/sts/niso_sts/std_doc_meta.rb

@@ -4,40 +4,79 @@ module Sts
   module NisoSts
     class StdDocMeta < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :std_meta_type, :string
+      attribute :std_org_type, :string
+      attribute :xml_base, :string
+      attribute :xml_lang, :string
       attribute :title_wrap, ::Sts::NisoSts::TitleWrap, collection: true
+      attribute :release_version, ::Sts::NisoSts::ReleaseVersion
       attribute :std_ident, ::Sts::NisoSts::StandardIdentification
-      attribute :doc_ident, ::Sts::NisoSts::DocumentIdentification
+      attribute :std_org, ::Sts::NisoSts::StdOrg, collection: true
+      attribute :std_org_group, ::Sts::NisoSts::StdOrgGroup, collection: true
+      attribute :content_language, ::Sts::NisoSts::ContentLanguage,
+                collection: true
       attribute :std_ref, ::Sts::NisoSts::StandardRef, collection: true
       attribute :doc_ref, :string
-      attribute :pub_date, :string
-      attribute :release_date, :string
-      attribute :release_version, :string
-      attribute :comm_ref, :string
-      attribute :secretariat, :string
-      attribute :ics, :string
-      attribute :std_xref, ::Sts::NisoSts::StdCrossReference
-      attribute :permissions, ::Sts::NisoSts::Permissions
+      attribute :pub_date, ::Sts::NisoSts::PubDate
+      attribute :release_date, ::Sts::NisoSts::ReleaseDate, collection: true
+      attribute :meta_date, ::Sts::NisoSts::MetaDate, collection: true
+      attribute :comm_ref, :string, collection: true
+      attribute :comm_ref_group, ::Sts::NisoSts::CommRefGroup
+      attribute :accrediting_organization, ::Sts::NisoSts::AccreditingOrganization
+      attribute :authorization, ::Sts::NisoSts::Authorization
+      attribute :secretariat, ::Sts::NisoSts::Secretariat, collection: true
+      attribute :ics, ::Sts::NisoSts::Ics, collection: true
+      attribute :subj_group, ::Sts::NisoSts::SubjGroup, collection: true
+      attribute :page_count, ::Sts::NisoSts::PageCount
+      attribute :counts, ::Sts::NisoSts::Counts
+      attribute :is_proof, ::Sts::NisoSts::IsProof
+      attribute :std_xref, ::Sts::NisoSts::StdCrossReference, collection: true
+      attribute :permissions, ::Sts::NisoSts::Permissions, collection: true
+      attribute :self_uri, ::Sts::NisoSts::SelfUri, collection: true
+      attribute :abstract, ::Sts::NisoSts::Abstract, collection: true
+      attribute :kwd_group, ::Sts::NisoSts::KwdGroup, collection: true
       attribute :meta_note, ::Sts::NisoSts::MetaNote, collection: true
+      attribute :custom_meta_group, ::Sts::NisoSts::CustomMetaGroup,
+                collection: true
 
       xml do
         element "std-doc-meta"
+        ordered
 
         map_attribute "id", to: :id
+        map_attribute "std-meta-type", to: :std_meta_type
+        map_attribute "std-org-type", to: :std_org_type
+        map_attribute "xml:base", to: :xml_base
+        map_attribute "xml:lang", to: :xml_lang
 
         map_element "title-wrap", to: :title_wrap
+        map_element "release-version", to: :release_version
         map_element "std-ident", to: :std_ident
-        map_element "doc-ident", to: :doc_ident
+        map_element "std-org", to: :std_org
+        map_element "std-org-group", to: :std_org_group
+        map_element "content-language", to: :content_language
         map_element "std-ref", to: :std_ref
         map_element "doc-ref", to: :doc_ref
         map_element "pub-date", to: :pub_date
         map_element "release-date", to: :release_date
-        map_element "release-version", to: :release_version
+        map_element "meta-date", to: :meta_date
         map_element "comm-ref", to: :comm_ref
+        map_element "comm-ref-group", to: :comm_ref_group
+        map_element "accrediting-organization", to: :accrediting_organization
+        map_element "authorization", to: :authorization
         map_element "secretariat", to: :secretariat
         map_element "ics", to: :ics
+        map_element "subj-group", to: :subj_group
+        map_element "page-count", to: :page_count
+        map_element "counts", to: :counts
+        map_element "is-proof", to: :is_proof
         map_element "std-xref", to: :std_xref
         map_element "permissions", to: :permissions
+        map_element "self-uri", to: :self_uri
+        map_element "abstract", to: :abstract
+        map_element "kwd-group", to: :kwd_group
         map_element "meta-note", to: :meta_note
+        map_element "custom-meta-group", to: :custom_meta_group
       end
     end
   end

data/lib/sts/niso_sts/std_id.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class StdId < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :std_id_link_type, :string
       attribute :std_id_type, :string
       attribute :specific_use, :string
@@ -11,6 +12,7 @@ module Sts
       xml do
         element "std-id"
 
+        map_attribute "id", to: :id
         map_attribute "std-id-link-type", to: :std_id_link_type
         map_attribute "std-id-type", to: :std_id_type
         map_attribute "specific-use", to: :specific_use

data/lib/sts/niso_sts/std_id_group.rb

@@ -3,11 +3,14 @@
 module Sts
   module NisoSts
     class StdIdGroup < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :std_id, ::Sts::NisoSts::StdId, collection: true
 
       xml do
         element "std-id-group"
 
+        map_attribute "id", to: :id
+
         map_element "std-id", to: :std_id
       end
     end

data/lib/sts/niso_sts/std_org.rb

@@ -12,6 +12,7 @@ module Sts
 
       xml do
         element "std-org"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "std-org-type", to: :std_org_type

data/lib/sts/niso_sts/std_org_abbrev.rb

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

data/lib/sts/niso_sts/std_org_group.rb

@@ -3,11 +3,14 @@
 module Sts
   module NisoSts
     class StdOrgGroup < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :std_org, ::Sts::NisoSts::StdOrg, collection: true
 
       xml do
         element "std-org-group"
 
+        map_attribute "id", to: :id
+
         map_element "std-org", to: :std_org
       end
     end

data/lib/sts/niso_sts/std_org_name.rb

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

data/lib/sts/niso_sts/std_organization.rb

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

data/lib/sts/niso_sts/string_conf.rb

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

data/lib/sts/niso_sts/string_date.rb

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

data/lib/sts/niso_sts/string_name.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class StringName < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :name_style, :string
       attribute :content_type, :string
       attribute :content, :string, collection: true
@@ -11,6 +12,7 @@ module Sts
 
       xml do
         element "string-name"
+        map_attribute "id", to: :id
         mixed_content
 
         map_attribute "name-style", to: :name_style

data/lib/sts/niso_sts/styled_content.rb

@@ -3,14 +3,35 @@
 module Sts
   module NisoSts
     class StyledContent < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :style, :string
       attribute :style_type, :string
       attribute :toggle, :string
       attribute :specific_use, :string
       attribute :lang, :string
       attribute :content, :string, collection: true
+      attribute :uri, ::Sts::NisoSts::Uri, collection: true
+      attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
+      attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
+      attribute :sub, ::Sts::NisoSts::Sub, collection: true
+      attribute :sup, ::Sts::NisoSts::Sup, collection: true
+      attribute :sc, ::Sts::NisoSts::Sc, collection: true
+      attribute :monospace, ::Sts::NisoSts::Monospace, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :ext_link, ::Sts::NisoSts::ExtLink, collection: true
+      attribute :inline_formula, ::Sts::NisoSts::InlineFormula, collection: true
+      attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
+      attribute :break, ::Sts::NisoSts::Break, collection: true
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
+      attribute :named_content, ::Sts::NisoSts::NamedContent, collection: true
+      attribute :target, ::Sts::NisoSts::Target, collection: true
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
+      attribute :styled_content, ::Sts::NisoSts::StyledContent, collection: true
+      attribute :underline, ::Sts::NisoSts::Underline, collection: true
+
       xml do
         element "styled-content"
+        map_attribute "id", to: :id
         mixed_content
 
         map_attribute "style", to: :style
@@ -19,6 +40,24 @@ module Sts
         map_attribute "specific-use", to: :specific_use
         map_attribute "lang", to: :lang
         map_content to: :content
+        map_element "uri", to: :uri
+        map_element "bold", to: :bold
+        map_element "italic", to: :italic
+        map_element "sub", to: :sub
+        map_element "sup", to: :sup
+        map_element "sc", to: :sc
+        map_element "monospace", to: :monospace
+        map_element "xref", to: :xref
+        map_element "ext-link", to: :ext_link
+        map_element "inline-formula", to: :inline_formula
+        map_element "std", to: :std
+        map_element "break", to: :break
+        map_element "fn", to: :fn
+        map_element "named-content", to: :named_content
+        map_element "target", to: :target
+        map_element "graphic", to: :graphic
+        map_element "styled-content", to: :styled_content
+        map_element "underline", to: :underline
       end
     end
   end

data/lib/sts/niso_sts/sub.rb

@@ -6,6 +6,12 @@ module Sts
       attribute :id, :string
       attribute :specific_use, :string
       attribute :content, :string, collection: true
+      attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
+      attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
+      attribute :underline, ::Sts::NisoSts::Underline, collection: true
+      attribute :monospace, ::Sts::NisoSts::Monospace, collection: true
+      attribute :styled_content, ::Sts::NisoSts::StyledContent, collection: true
+
       xml do
         element "sub"
         mixed_content
@@ -13,6 +19,11 @@ module Sts
         map_attribute "id", to: :id
         map_attribute "specific-use", to: :specific_use
         map_content to: :content
+        map_element "bold", to: :bold
+        map_element "italic", to: :italic
+        map_element "underline", to: :underline
+        map_element "monospace", to: :monospace
+        map_element "styled-content", to: :styled_content
       end
     end
   end

data/lib/sts/niso_sts/subj_group.rb

@@ -3,21 +3,32 @@
 module Sts
   module NisoSts
     class SubjGroup < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :subj_group_type, :string
       attribute :xml_lang, :string
       attribute :specific_use, :string
+      attribute :vocab, :string
+      attribute :vocab_identifier, :string
       attribute :label, ::Sts::NisoSts::Label
       attribute :subject, ::Sts::NisoSts::Subject, collection: true
+      attribute :compound_subject, ::Sts::NisoSts::CompoundSubject,
+                collection: true
+      attribute :subj_group, ::Sts::NisoSts::SubjGroup, collection: true
 
       xml do
         element "subj-group"
 
+        map_attribute "id", to: :id
         map_attribute "subj-group-type", to: :subj_group_type
         map_attribute "xml:lang", to: :xml_lang
         map_attribute "specific-use", to: :specific_use
+        map_attribute "vocab", to: :vocab
+        map_attribute "vocab-identifier", to: :vocab_identifier
 
         map_element "label", to: :label
         map_element "subject", to: :subject
+        map_element "compound-subject", to: :compound_subject
+        map_element "subj-group", to: :subj_group
       end
     end
   end

data/lib/sts/niso_sts/subtitle.rb

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

data/lib/sts/niso_sts/suffix.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class Suffix < 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 "suffix"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/sup.rb

@@ -6,6 +6,13 @@ module Sts
       attribute :id, :string
       attribute :specific_use, :string
       attribute :content, :string, collection: true
+      attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
+      attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
+      attribute :underline, ::Sts::NisoSts::Underline, collection: true
+      attribute :monospace, ::Sts::NisoSts::Monospace, collection: true
+      attribute :styled_content, ::Sts::NisoSts::StyledContent, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+
       xml do
         element "sup"
         mixed_content
@@ -13,6 +20,12 @@ module Sts
         map_attribute "id", to: :id
         map_attribute "specific-use", to: :specific_use
         map_content to: :content
+        map_element "bold", to: :bold
+        map_element "italic", to: :italic
+        map_element "underline", to: :underline
+        map_element "monospace", to: :monospace
+        map_element "styled-content", to: :styled_content
+        map_element "xref", to: :xref
       end
     end
   end

data/lib/sts/niso_sts/suppl_number.rb

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

data/lib/sts/niso_sts/suppl_type.rb

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

data/lib/sts/niso_sts/suppl_version.rb

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

data/lib/sts/niso_sts/supplementary_material.rb

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

data/lib/sts/niso_sts/surname.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class Surname < 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 "surname"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/table_count.rb

@@ -3,10 +3,12 @@
 module Sts
   module NisoSts
     class TableCount < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :count, :integer
 
       xml do
         element "table-count"
+        map_attribute "id", to: :id
         map_attribute "count", to: :count
       end
     end

data/lib/sts/niso_sts/table_wrap_group.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class TableWrapGroup < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :position, :string
+      attribute :orientation, :string
+      attribute :label, ::Sts::NisoSts::Label
+      attribute :caption, ::Sts::NisoSts::Caption
+      attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
+
+      xml do
+        element "table-wrap-group"
+        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_attribute "position", to: :position
+        map_attribute "orientation", to: :orientation
+        map_element "label", to: :label
+        map_element "caption", to: :caption
+        map_element "table-wrap", to: :table_wrap
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/term_display.rb

@@ -3,15 +3,37 @@
 module Sts
   module NisoSts
     class TermDisplay < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :term, ::Sts::NisoSts::Term, collection: true
+      attribute :definition, ::Sts::NisoSts::Def
+      attribute :term_display_string, :string, collection: true
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :def_list, ::Sts::NisoSts::DefList, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :label, ::Sts::NisoSts::Label
       attribute :p, ::Sts::NisoSts::Paragraph, collection: true
       attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote,
                 collection: true
+      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample,
+                collection: true
+      attribute :related_term, ::Sts::NisoSts::RelatedTerm, collection: true
 
       xml do
         element "term-display"
+        map_attribute "id", to: :id
+        mixed_content
 
+        map_element "term", to: :term
+        map_element "def", to: :definition
+        map_element "term-display-string", to: :term_display_string
+        map_element "list", to: :list
+        map_element "def-list", to: :def_list
+        map_element "xref", to: :xref
+        map_element "label", to: :label
         map_element "p", to: :p
         map_element "non-normative-note", to: :non_normative_note
+        map_element "non-normative-example", to: :non_normative_example
+        map_element "related-term", to: :related_term
       end
     end
   end

data/lib/sts/niso_sts/term_display_string.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class TermDisplayString < 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 "term-display-string"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_content to: :content
+        map_element "bold", to: :bold
+        map_element "italic", to: :italic
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/term_head.rb

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

data/lib/sts/niso_sts/term_section.rb

@@ -6,12 +6,12 @@ module Sts
       attribute :id, :string
       attribute :sec_type, :string
       attribute :label, ::Sts::NisoSts::Label
-      attribute :term_entry, ::Sts::TbxIsoTml::TermEntry # , collection: true
-      attribute :term_display, ::Sts::NisoSts::TermDisplay # , collection: true
+      attribute :term_entry, ::Sts::TbxIsoTml::TermEntry, collection: true
+      attribute :term_display, ::Sts::NisoSts::TermDisplay, collection: true
 
       xml do
         element "term-sec"
-        mixed_content
+        ordered
         map_attribute "id", to: :id
         map_attribute "sec-type", to: :sec_type
 

data/lib/sts/niso_sts/term_source.rb

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

data/lib/sts/niso_sts/tex_math.rb

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

data/lib/sts/niso_sts/textual_form.rb

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

data/lib/sts/niso_sts/time_stamp.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class TimeStamp < 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 "time-stamp"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content