sts 0.5.2 → 0.5.4

data/lib/sts/niso_sts/copyright_statement.rb

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

data/lib/sts/niso_sts/copyright_year.rb

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

data/lib/sts/niso_sts/country.rb

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

data/lib/sts/niso_sts/counts.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class Counts < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :fig_count, ::Sts::NisoSts::FigCount
       attribute :table_count, ::Sts::NisoSts::TableCount
       attribute :equation_count, ::Sts::NisoSts::EquationCount
@@ -12,6 +13,8 @@ module Sts
 
       xml do
         element "counts"
+        map_attribute "id", to: :id
+        ordered
 
         map_element "fig-count", to: :fig_count
         map_element "table-count", to: :table_count

data/lib/sts/niso_sts/custom_meta.rb

@@ -3,12 +3,15 @@
 module Sts
   module NisoSts
     class CustomMeta < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :lang, Lutaml::Xml::W3c::XmlLangType
       attribute :meta_name, :string
       attribute :meta_value, :string
 
       xml do
         element "custom-meta"
+        map_attribute "id", to: :id
+        ordered
 
         map_attribute "lang", to: :lang
         map_element "meta-name", to: :meta_name

data/lib/sts/niso_sts/custom_meta_group.rb

@@ -3,11 +3,14 @@
 module Sts
   module NisoSts
     class CustomMetaGroup < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :custom_meta, ::Sts::NisoSts::CustomMeta, collection: true
 
       xml do
         element "custom-meta-group"
 
+        map_attribute "id", to: :id
+
         map_element "custom-meta", to: :custom_meta
       end
     end

data/lib/sts/niso_sts/data_title.rb

@@ -3,17 +3,46 @@
 module Sts
   module NisoSts
     class DataTitle < 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 "data-title"
         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/date.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class Date < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :day, :string
       attribute :month, :string
       attribute :year, :string
@@ -12,6 +13,8 @@ module Sts
 
       xml do
         element "date"
+        map_attribute "id", to: :id
+        ordered
 
         map_attribute "date-type", to: :date_type
         map_element "day", to: :day

data/lib/sts/niso_sts/date_in_citation.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class DateInCitation < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content_type, :string
       attribute :day, :string
       attribute :month, :string
@@ -13,6 +14,7 @@ module Sts
       xml do
         element "date-in-citation"
 
+        map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type
         map_element "day", to: :day
         map_element "month", to: :month

data/lib/sts/niso_sts/day.rb

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

data/lib/sts/niso_sts/def.rb

@@ -3,11 +3,14 @@
 module Sts
   module NisoSts
     class Def < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :paragraph, ::Sts::NisoSts::Paragraph
 
       xml do
         element "def"
 
+        map_attribute "id", to: :id
+
         map_element "p", to: :paragraph
       end
     end

data/lib/sts/niso_sts/def_head.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class DefHead < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "def-head"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_content to: :content
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/def_item.rb

@@ -3,16 +3,29 @@
 module Sts
   module NisoSts
     class DefItem < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :specific_use, :string
+      attribute :xml_lang, :string
       attribute :term, ::Sts::NisoSts::Term
       attribute :definition, ::Sts::NisoSts::Def
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :see, ::Sts::NisoSts::See
+      attribute :see_also, ::Sts::NisoSts::SeeAlso
+      attribute :second, ::Sts::NisoSts::Term
 
       xml do
         element "def-item"
+        ordered
 
+        map_attribute "id", to: :id
         map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
         map_element "term", to: :term, render_nil: true
         map_element "def", to: :definition
+        map_element "xref", to: :xref
+        map_element "see", to: :see
+        map_element "see-also", to: :see_also
+        map_element "second", to: :second
       end
     end
   end

data/lib/sts/niso_sts/def_list.rb

@@ -3,19 +3,41 @@
 module Sts
   module NisoSts
     class DefList < Lutaml::Model::Serializable
-      attribute :title, :string
-      attribute :specific_use, :string
+      attribute :id, :string
+      attribute :continued_from, :string
+      attribute :list_content, :string
       attribute :list_type, :string
+      attribute :originator, :string
+      attribute :prefix_word, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :editing_instruction, ::Sts::NisoSts::EditingInstruction,
+                collection: true
+      attribute :label, ::Sts::NisoSts::Label
+      attribute :title, :string
+      attribute :term_head, ::Sts::NisoSts::TermHead
+      attribute :def_head, ::Sts::NisoSts::DefHead
       attribute :def_item, ::Sts::NisoSts::DefItem, collection: true
-      attribute :def_list, ::Sts::NisoSts::DefList
+      attribute :def_list, ::Sts::NisoSts::DefList, collection: true
 
       xml do
         element "def-list"
+        ordered
 
+        map_attribute "id", to: :id
+        map_attribute "continued-from", to: :continued_from
+        map_attribute "list-content", to: :list_content
         map_attribute "list-type", to: :list_type
+        map_attribute "originator", to: :originator
+        map_attribute "prefix-word", to: :prefix_word
         map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
 
+        map_element "editing-instruction", to: :editing_instruction
+        map_element "label", to: :label
         map_element "title", to: :title
+        map_element "term-head", to: :term_head
+        map_element "def-head", to: :def_head
         map_element "def-item", to: :def_item
         map_element "def-list", to: :def_list
       end

data/lib/sts/niso_sts/degrees.rb

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

data/lib/sts/niso_sts/disp_formula_group.rb

@@ -5,20 +5,17 @@ module Sts
     class DispFormulaGroup < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :content_type, :string
-      attribute :specific_use, :string
       attribute :label, ::Sts::NisoSts::Label
-      attribute :caption, ::Sts::NisoSts::Caption
       attribute :disp_formula, ::Sts::NisoSts::DisplayFormula, collection: true
 
       xml do
         element "disp-formula-group"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type
-        map_attribute "specific-use", to: :specific_use
 
         map_element "label", to: :label
-        map_element "caption", to: :caption
         map_element "disp-formula", to: :disp_formula
       end
     end

data/lib/sts/niso_sts/disp_quote.rb

@@ -5,6 +5,7 @@ module Sts
     class DispQuote < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :content_type, :string
+      attribute :originator, :string
       attribute :specific_use, :string
       attribute :label, ::Sts::NisoSts::Label
       attribute :attribution, ::Sts::NisoSts::Attribution
@@ -12,10 +13,11 @@ module Sts
 
       xml do
         element "disp-quote"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type
+        map_attribute "originator", to: :originator
         map_attribute "specific-use", to: :specific_use
 
         map_element "label", to: :label

data/lib/sts/niso_sts/display_formula.rb

@@ -1,21 +1,66 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class DisplayFormula < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :content_type, :string
+      attribute :originator, :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 :break_, ::Sts::NisoSts::Break, 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 :label, ::Sts::NisoSts::Label
       attribute :math, ::Sts::TbxIsoTml::Math
+      attribute :inline_formula, ::Sts::NisoSts::InlineFormula, collection: true
+      attribute :tex_math, ::Sts::NisoSts::TexMath
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
+      attribute :alternatives, ::Sts::NisoSts::Alternatives
+      attribute :caption, ::Sts::NisoSts::Caption
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
+      attribute :target, ::Sts::NisoSts::Target, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
 
       xml do
         element "disp-formula"
+        mixed_content
 
         map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
+        map_attribute "originator", to: :originator
+        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 "break", to: :break_
+        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 "label", to: :label
         map_element "math", to: :math
+        map_element "inline-formula", to: :inline_formula
+        map_element "tex-math", to: :tex_math
+        map_element "graphic", to: :graphic
+        map_element "alternatives", to: :alternatives
+        map_element "caption", to: :caption
+        map_element "fn", to: :fn
+        map_element "target", to: :target
+        map_element "xref", to: :xref
       end
     end
   end

data/lib/sts/niso_sts/doc_number.rb

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

data/lib/sts/niso_sts/doc_type.rb

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

data/lib/sts/niso_sts/document_identification.rb

@@ -11,6 +11,7 @@ module Sts
 
       xml do
         element "doc-ident"
+        ordered
 
         map_element "sdo", to: :sdo
         map_element "proj-id", to: :proj_id

data/lib/sts/niso_sts/editing_instruction.rb

@@ -4,20 +4,24 @@ module Sts
   module NisoSts
     class EditingInstruction < Lutaml::Model::Serializable
       attribute :id, :string
-      attribute :xml_lang, :string
+      attribute :content_type, :string
+      attribute :rid, :string
       attribute :specific_use, :string
-      attribute :content, :string, collection: true
       attribute :label, ::Sts::NisoSts::Label
+      attribute :title, :string
+      attribute :p, ::Sts::NisoSts::Paragraph, collection: true
 
       xml do
         element "editing-instruction"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
-        map_attribute "xml:lang", to: :xml_lang
+        map_attribute "content-type", to: :content_type
+        map_attribute "rid", to: :rid
         map_attribute "specific-use", to: :specific_use
-        map_content to: :content
         map_element "label", to: :label
+        map_element "title", to: :title
+        map_element "p", to: :p
       end
     end
   end

data/lib/sts/niso_sts/edition.rb

@@ -3,9 +3,11 @@
 module Sts
   module NisoSts
     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/niso_sts/element_citation.rb

@@ -50,7 +50,7 @@ module Sts
 
       xml do
         element "element-citation"
-        mixed_content
+        ordered
 
         map_attribute "publication-type", to: :publication_type
         map_attribute "id", to: :id

data/lib/sts/niso_sts/elocation_id.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class ElocationId < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string
       attribute :elocation_id_type, :string
 
@@ -10,6 +11,7 @@ module Sts
         element "elocation-id"
 
         map_content to: :content
+        map_attribute "id", to: :id
         map_attribute "elocation-id-type", to: :elocation_id_type
       end
     end

data/lib/sts/niso_sts/email.rb

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

data/lib/sts/niso_sts/equation_count.rb

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

data/lib/sts/niso_sts/era.rb

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

data/lib/sts/niso_sts/ext_link.rb

@@ -1,19 +1,49 @@
-# frozen_striing_literal: true
+# frozen_string_literal: true
 
 module Sts
   module NisoSts
     class ExtLink < Lutaml::Model::Serializable
+      attribute :assigning_authority, :string
       attribute :ext_link_type, :string
+      attribute :id, :string
+      attribute :specific_use, :string
       attribute :href, :xlink_href
-      attribute :content, :string
+      attribute :xlink_type, :string
+      attribute :xlink_role, :string
+      attribute :xlink_title, :string
+      attribute :xlink_show, :string
+      attribute :xlink_actuate, :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 :inline_formula, ::Sts::NisoSts::InlineFormula, collection: true
 
       xml do
         element "ext-link"
+        mixed_content
 
         map_content to: :content
 
+        map_attribute "assigning-authority", to: :assigning_authority
         map_attribute "ext-link-type", to: :ext_link_type
+        map_attribute "id", to: :id
+        map_attribute "specific-use", to: :specific_use
         map_attribute "href", to: :href
+        map_attribute "xlink:type", to: :xlink_type
+        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 "bold", to: :bold
+        map_element "italic", to: :italic
+        map_element "sub", to: :sub
+        map_element "sup", to: :sup
+        map_element "inline-formula", to: :inline_formula
       end
     end
   end

data/lib/sts/niso_sts/fax.rb

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

data/lib/sts/niso_sts/fig_count.rb

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

data/lib/sts/niso_sts/fig_group.rb

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