sts 0.5.2 → 0.5.4

data/lib/sts/niso_sts/reference.rb

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

data/lib/sts/niso_sts/reference_list.rb

@@ -6,12 +6,15 @@ module Sts
       attribute :content_type, :string
       attribute :id, :string
       attribute :specific_use, :string
-      attribute :title, :string
+      attribute :title, ::Sts::NisoSts::Title
       attribute :label, ::Sts::NisoSts::Label
       attribute :ref, ::Sts::NisoSts::Reference, collection: true
+      attribute :ref_list, ::Sts::NisoSts::ReferenceList, collection: true
+      attribute :paragraph, ::Sts::NisoSts::Paragraph, collection: true
 
       xml do
         element "ref-list"
+        ordered
 
         map_attribute "content-type", to: :content_type
         map_attribute "id", to: :id
@@ -19,6 +22,8 @@ module Sts
         map_element "title", to: :title
         map_element "label", to: :label
         map_element "ref", to: :ref
+        map_element "ref-list", to: :ref_list
+        map_element "p", to: :paragraph
       end
     end
   end

data/lib/sts/niso_sts/reference_standard.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class ReferenceStandard < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :type, :string
       attribute :std_id, :string
       attribute :content, :string, collection: true
@@ -13,11 +12,13 @@ module Sts
       attribute :fn, ::Sts::NisoSts::Fn, collection: true
       attribute :std_id_group, ::Sts::NisoSts::StdIdGroup, collection: true
       attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
 
       xml do
         element "std"
         mixed_content
 
+        map_attribute "id", to: :id
         map_attribute "type", to: :type
         map_attribute "std-id", to: :std_id
 
@@ -26,6 +27,7 @@ module Sts
         map_element "title", to: :title
         map_element "std-id-group", to: :std_id_group
         map_element "xref", to: :xref
+        map_element "bold", to: :bold
 
         map_content to: :content
       end

data/lib/sts/niso_sts/reg_meta.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class RegMeta < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :title_wrap, ::Sts::NisoSts::TitleWrap, collection: true
       attribute :std_ident, ::Sts::NisoSts::StandardIdentification
       attribute :doc_ident, ::Sts::NisoSts::DocumentIdentification
@@ -22,6 +23,8 @@ module Sts
 
       xml do
         element "reg-meta"
+        map_attribute "id", to: :id
+        ordered
 
         map_element "title-wrap", to: :title_wrap
         map_element "std-ident", to: :std_ident

data/lib/sts/niso_sts/related_term.rb

@@ -3,10 +3,12 @@
 module Sts
   module NisoSts
     class RelatedTerm < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :related_term_type, :string
       attribute :content, :string, collection: true
       xml do
         element "related-term"
+        map_attribute "id", to: :id
         mixed_content
 
         map_attribute "related-term-type", to: :related_term_type

data/lib/sts/niso_sts/release_date.rb

@@ -3,16 +3,21 @@
 module Sts
   module NisoSts
     class ReleaseDate < Lutaml::Model::Serializable
-      attribute :day, :string
-      attribute :month, :string
-      attribute :year, :string
+      attribute :id, :string
+      attribute :content, :string, collection: true
+      attribute :date_type, :string
+      attribute :iso_8601_date, :string
+      attribute :std_type, :string
 
       xml do
         element "release-date"
+        map_attribute "id", to: :id
+        mixed_content
 
-        map_element "day", to: :day
-        map_element "month", to: :month
-        map_element "year", to: :year
+        map_content to: :content
+        map_attribute "date-type", to: :date_type
+        map_attribute "iso-8601-date", to: :iso_8601_date
+        map_attribute "std-type", to: :std_type
       end
     end
   end

data/lib/sts/niso_sts/release_version.rb

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

data/lib/sts/niso_sts/release_version_id.rb

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

data/lib/sts/niso_sts/role.rb

@@ -4,18 +4,53 @@ module Sts
   module NisoSts
     class Role < Lutaml::Model::Serializable
       attribute :content_type, :string
+      attribute :id, :string
+      attribute :specific_use, :string
+      attribute :vocab, :string
+      attribute :vocab_identifier, :string
+      attribute :vocab_term, :string
+      attribute :vocab_term_identifier, :string
+      attribute :xml_lang, :string
       attribute :content, :string, 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 :ext_link, ::Sts::NisoSts::ExtLink, collection: true
+      attribute :inline_graphic, ::Sts::NisoSts::InlineGraphic, collection: true
+      attribute :private_char, ::Sts::NisoSts::PrivateChar, collection: true
+      attribute :named_content, ::Sts::NisoSts::NamedContent, collection: true
+      attribute :styled_content, ::Sts::NisoSts::StyledContent, collection: true
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
+      attribute :target, ::Sts::NisoSts::Target, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
 
       xml do
         element "role"
         mixed_content
 
         map_attribute "content-type", to: :content_type
+        map_attribute "id", to: :id
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "vocab", to: :vocab
+        map_attribute "vocab-identifier", to: :vocab_identifier
+        map_attribute "vocab-term", to: :vocab_term
+        map_attribute "vocab-term-identifier", to: :vocab_term_identifier
+        map_attribute "xml:lang", to: :xml_lang
+
         map_content to: :content
         map_element "bold", to: :bold
         map_element "italic", to: :italic
+        map_element "sub", to: :sub
+        map_element "sup", to: :sup
+        map_element "ext-link", to: :ext_link
+        map_element "inline-graphic", to: :inline_graphic
+        map_element "private-char", to: :private_char
+        map_element "named-content", to: :named_content
+        map_element "styled-content", to: :styled_content
+        map_element "fn", to: :fn
+        map_element "target", to: :target
+        map_element "xref", to: :xref
       end
     end
   end

data/lib/sts/niso_sts/ruby.rb

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

data/lib/sts/niso_sts/sdo.rb

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

data/lib/sts/niso_sts/season.rb

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

data/lib/sts/niso_sts/sec_meta.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class SecMeta < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :xml_base, :string
+      attribute :contrib_group, ::Sts::NisoSts::ContribGroup, collection: true
+      attribute :abstract, ::Sts::NisoSts::Abstract, collection: true
+      attribute :kwd_group, ::Sts::NisoSts::KwdGroup, collection: true
+      attribute :permissions, ::Sts::NisoSts::Permissions
+
+      xml do
+        element "sec-meta"
+
+        map_attribute "id", to: :id
+        map_attribute "xml:base", to: :xml_base
+
+        map_element "contrib-group", to: :contrib_group
+        map_element "abstract", to: :abstract
+        map_element "kwd-group", to: :kwd_group
+        map_element "permissions", to: :permissions
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/secretariat.rb

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

data/lib/sts/niso_sts/section.rb

@@ -4,11 +4,14 @@ module Sts
   module NisoSts
     class Section < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :originator, :string
       attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :sec_meta, ::Sts::NisoSts::SecMeta
       attribute :label, ::Sts::NisoSts::Label
       attribute :title, ::Sts::NisoSts::Title
       attribute :type, :string
-      attribute :array, ::Sts::NisoSts::SectionArray
+      attribute :array, ::Sts::NisoSts::SectionArray, collection: true
       attribute :paragraphs, ::Sts::NisoSts::Paragraph, collection: true
       attribute :list, ::Sts::NisoSts::List, collection: true
       attribute :term_sec, ::Sts::NisoSts::TermSection, collection: true
@@ -18,33 +21,73 @@ module Sts
       attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample,
                 collection: true
       attribute :sec, ::Sts::NisoSts::Section, collection: true
-      attribute :figures, ::Sts::NisoSts::Figure, collection: true
       attribute :fig, ::Sts::NisoSts::Figure, collection: true
+      attribute :fig_group, ::Sts::NisoSts::FigGroup, collection: true
 
       attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
+      attribute :boxed_text, ::Sts::NisoSts::BoxedText, collection: true
+      attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
+      attribute :disp_formula, ::Sts::NisoSts::DisplayFormula, collection: true
+      attribute :disp_formula_group, ::Sts::NisoSts::DispFormulaGroup,
+                collection: true
+      attribute :styled_content, ::Sts::NisoSts::StyledContent, collection: true
+      attribute :editing_instruction, ::Sts::NisoSts::EditingInstruction,
+                collection: true
+      attribute :def_list, ::Sts::NisoSts::DefList, collection: true
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
+      attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
+      attribute :fn_group, ::Sts::NisoSts::FnGroup, 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 :disp_quote, ::Sts::NisoSts::DispQuote, collection: true
+      attribute :chem_struct_wrap, ::Sts::NisoSts::ChemStructWrap,
+                collection: true
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
 
+      # rubocop:disable Metrics/BlockLength
       xml do
         element "sec"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
+        map_attribute "originator", to: :originator
         map_attribute "sec-type", to: :type
         map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
 
+        map_element "sec-meta", to: :sec_meta
         map_element "label", to: :label
         map_element "title", to: :title
         map_element "p", to: :paragraphs
         map_element "sec", to: :sec
         map_element "term-sec", to: :term_sec
         map_element "list", to: :list
-        map_element "figure", to: :figures
         map_element "fig", to: :fig
+        map_element "fig-group", to: :fig_group
         map_element "ref-list", to: :ref_list
         map_element "array", to: :array
         map_element "table-wrap", to: :table_wrap
+        map_element "boxed-text", to: :boxed_text
+        map_element "preformat", to: :preformat
+        map_element "disp-formula", to: :disp_formula
+        map_element "disp-formula-group", to: :disp_formula_group
+        map_element "styled-content", to: :styled_content
+        map_element "editing-instruction", to: :editing_instruction
+        map_element "def-list", to: :def_list
+        map_element "graphic", to: :graphic
+        map_element "std", to: :std
+        map_element "fn-group", to: :fn_group
+        map_element "xref", to: :xref
+        map_element "ext-link", to: :ext_link
+        map_element "inline-formula", to: :inline_formula
+        map_element "disp-quote", to: :disp_quote
+        map_element "chem-struct-wrap", to: :chem_struct_wrap
+        map_element "fn", to: :fn
         map_element "non-normative-note", to: :non_normative_note
         map_element "non-normative-example", to: :non_normative_example
       end
+      # rubocop:enable Metrics/BlockLength
     end
   end
 end

data/lib/sts/niso_sts/see_also_entry.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class SeeAlsoEntry < Lutaml::Model::Serializable
+      attribute :content_type, :string
+      attribute :id, :string
+      attribute :rid, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "see-also-entry"
+        mixed_content
+
+        map_attribute "content-type", to: :content_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
+  end
+end

data/lib/sts/niso_sts/see_entry.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class SeeEntry < Lutaml::Model::Serializable
+      attribute :content_type, :string
+      attribute :id, :string
+      attribute :rid, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "see-entry"
+        mixed_content
+
+        map_attribute "content-type", to: :content_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
+  end
+end

data/lib/sts/niso_sts/self_uri.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class SelfUri < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :href, :xlink_href
       attribute :content_type, :string
@@ -10,6 +11,7 @@ module Sts
 
       xml do
         element "self-uri"
+        map_attribute "id", to: :id
         mixed_content
 
         map_content to: :content

data/lib/sts/niso_sts/series.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class Series < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content_type, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
       attribute :content, :string, collection: true
       xml do
         element "series"
+        map_attribute "id", to: :id
         mixed_content
 
         map_attribute "content-type", to: :content_type

data/lib/sts/niso_sts/series_text.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class SeriesText < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content_type, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
       attribute :content, :string, collection: true
       xml do
         element "series-text"
+        map_attribute "id", to: :id
         mixed_content
 
         map_attribute "content-type", to: :content_type

data/lib/sts/niso_sts/series_title.rb

@@ -3,12 +3,14 @@
 module Sts
   module NisoSts
     class SeriesTitle < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content_type, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
       attribute :content, :string, collection: true
       xml do
         element "series-title"
+        map_attribute "id", to: :id
         mixed_content
 
         map_attribute "content-type", to: :content_type

data/lib/sts/niso_sts/sig.rb

@@ -3,10 +3,12 @@
 module Sts
   module NisoSts
     class Sig < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :graphic, ::Sts::NisoSts::Graphic
       attribute :content, :string, collection: true
       xml do
         element "sig"
+        map_attribute "id", to: :id
         mixed_content
 
         map_element "graphic", to: :graphic

data/lib/sts/niso_sts/size.rb

@@ -3,10 +3,12 @@
 module Sts
   module NisoSts
     class Size < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :units, :string
       attribute :content, :string, collection: true
       xml do
         element "size"
+        map_attribute "id", to: :id
         mixed_content
 
         map_attribute "units", to: :units

data/lib/sts/niso_sts/source.rb

@@ -3,17 +3,46 @@
 module Sts
   module NisoSts
     class Source < Lutaml::Model::Serializable
+      attribute :content_type, :string
+      attribute :id, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
       attribute :content, :string, 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 :ext_link, ::Sts::NisoSts::ExtLink, collection: true
+      attribute :inline_graphic, ::Sts::NisoSts::InlineGraphic, collection: true
+      attribute :private_char, ::Sts::NisoSts::PrivateChar, collection: true
+      attribute :named_content, ::Sts::NisoSts::NamedContent, collection: true
+      attribute :styled_content, ::Sts::NisoSts::StyledContent, collection: true
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
+      attribute :target, ::Sts::NisoSts::Target, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
 
       xml do
         element "source"
         mixed_content
 
+        map_attribute "content-type", to: :content_type
+        map_attribute "id", to: :id
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
+
         map_content to: :content
         map_element "bold", to: :bold
         map_element "italic", to: :italic
+        map_element "sub", to: :sub
+        map_element "sup", to: :sup
+        map_element "ext-link", to: :ext_link
+        map_element "inline-graphic", to: :inline_graphic
+        map_element "private-char", to: :private_char
+        map_element "named-content", to: :named_content
+        map_element "styled-content", to: :styled_content
+        map_element "fn", to: :fn
+        map_element "target", to: :target
+        map_element "xref", to: :xref
       end
     end
   end

data/lib/sts/niso_sts/speaker.rb

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

data/lib/sts/niso_sts/speech.rb

@@ -11,7 +11,7 @@ module Sts
 
       xml do
         element "speech"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type

data/lib/sts/niso_sts/standard.rb

@@ -8,12 +8,14 @@ module Sts
       attribute :back, ::Sts::NisoSts::Back
       attribute :id, :string
       attribute :lang, Lutaml::Xml::W3c::XmlLangType
+      attribute :dtd_version, :string
       attribute :mml, :string
       attribute :tbx, :string
       attribute :xlink, :string
 
       xml do
         element "standard"
+        ordered
         namespace_scope [
           ::Sts::Namespaces::MathmlNamespace,
           ::Sts::Namespaces::TbxNamespace,
@@ -22,6 +24,7 @@ module Sts
 
         map_attribute "id", to: :id
         map_attribute "lang", to: :lang
+        map_attribute "dtd-version", to: :dtd_version
         map_element "front", to: :front
         map_element "body", to: :body
         map_element "back", to: :back

data/lib/sts/niso_sts/standard_identification.rb

@@ -9,11 +9,12 @@ module Sts
       attribute :edition, :string
       attribute :version, :string
       attribute :part_number, :string
+      attribute :sub_part_number, :string, collection: true
       attribute :std_id_group, ::Sts::NisoSts::StdIdGroup
 
       xml do
         element "std-ident"
-        mixed_content
+        ordered
 
         map_element "originator", to: :originator
         map_element "doc-type", to: :doc_type
@@ -23,6 +24,7 @@ module Sts
         map_element "version", to: :version,
                                value_map: { to: { empty: :empty } }
         map_element "part-number", to: :part_number
+        map_element "sub-part-number", to: :sub_part_number
         map_element "std-id-group", to: :std_id_group
       end
     end

data/lib/sts/niso_sts/state.rb

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

data/lib/sts/niso_sts/statement.rb

@@ -13,7 +13,7 @@ module Sts
 
       xml do
         element "statement"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type