sts 0.5.2 → 0.5.3

data/lib/sts/niso_sts/custom_meta.rb

@@ -9,6 +9,7 @@ module Sts
 
       xml do
         element "custom-meta"
+        ordered
 
         map_attribute "lang", to: :lang
         map_element "meta-name", to: :meta_name

data/lib/sts/niso_sts/date.rb

@@ -12,6 +12,7 @@ module Sts
 
       xml do
         element "date"
+        ordered
 
         map_attribute "date-type", to: :date_type
         map_element "day", to: :day

data/lib/sts/niso_sts/def_item.rb

@@ -6,13 +6,22 @@ module Sts
       attribute :specific_use, :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 "specific-use", to: :specific_use
         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,21 +3,26 @@
 module Sts
   module NisoSts
     class DefList < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :title, :string
       attribute :specific_use, :string
       attribute :list_type, :string
       attribute :def_item, ::Sts::NisoSts::DefItem, collection: true
-      attribute :def_list, ::Sts::NisoSts::DefList
+      attribute :def_list, ::Sts::NisoSts::DefList, collection: true
+      attribute :label, ::Sts::NisoSts::Label
 
       xml do
         element "def-list"
+        ordered
 
+        map_attribute "id", to: :id
         map_attribute "list-type", to: :list_type
         map_attribute "specific-use", to: :specific_use
 
         map_element "title", to: :title
         map_element "def-item", to: :def_item
         map_element "def-list", to: :def_list
+        map_element "label", to: :label
       end
     end
   end

data/lib/sts/niso_sts/disp_formula_group.rb

@@ -1,24 +1,23 @@
 # frozen_string_literal: true
 
+require "lutaml/model"
+
 module Sts
   module NisoSts
     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

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

data/lib/sts/niso_sts/display_formula.rb

@@ -6,16 +6,28 @@ module Sts
   module NisoSts
     class DisplayFormula < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
       attribute :label, ::Sts::NisoSts::Label
       attribute :math, ::Sts::TbxIsoTml::Math
+      attribute :preformat, ::Sts::NisoSts::Preformat
+      attribute :tex_math, ::Sts::NisoSts::TexMath
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
+      attribute :alternatives, ::Sts::NisoSts::Alternatives
 
       xml do
         element "disp-formula"
 
         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 "math", to: :math
+        map_element "preformat", to: :preformat
+        map_element "tex-math", to: :tex_math
+        map_element "graphic", to: :graphic
+        map_element "alternatives", to: :alternatives
       end
     end
   end

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

@@ -6,17 +6,15 @@ module Sts
       attribute :id, :string
       attribute :xml_lang, :string
       attribute :specific_use, :string
-      attribute :content, :string, collection: true
       attribute :label, ::Sts::NisoSts::Label
 
       xml do
         element "editing-instruction"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "xml:lang", to: :xml_lang
         map_attribute "specific-use", to: :specific_use
-        map_content to: :content
         map_element "label", to: :label
       end
     end

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/ext_link.rb

@@ -1,19 +1,33 @@
-# frozen_striing_literal: true
+# frozen_string_literal: true
 
 module Sts
   module NisoSts
     class ExtLink < Lutaml::Model::Serializable
       attribute :ext_link_type, :string
       attribute :href, :xlink_href
-      attribute :content, :string
+      attribute :xlink_type, :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 "ext-link-type", to: :ext_link_type
         map_attribute "href", to: :href
+        map_attribute "xlink:type", to: :xlink_type
+
+        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/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

data/lib/sts/niso_sts/figure.rb

@@ -11,22 +11,35 @@ module Sts
     class Figure < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :orientation, :string
+      attribute :fig_type, :string
       attribute :caption, ::Sts::NisoSts::Caption
       attribute :def_list, ::Sts::NisoSts::DefList
       attribute :label, ::Sts::NisoSts::Label
       attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
+      attribute :title, ::Sts::NisoSts::Title
+      attribute :paragraph, ::Sts::NisoSts::Paragraph, collection: true
+      attribute :alternatives, ::Sts::NisoSts::Alternatives
+      attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote,
+                collection: true
+      attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
 
       xml do
         element "fig"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "orientation", to: :orientation
+        map_attribute "fig-type", to: :fig_type
 
         map_element "label", to: :label
         map_element "caption", to: :caption
         map_element "graphic", to: :graphic
         map_element "def-list", to: :def_list
+        map_element "title", to: :title
+        map_element "p", to: :paragraph
+        map_element "alternatives", to: :alternatives
+        map_element "non-normative-note", to: :non_normative_note
+        map_element "table-wrap", to: :table_wrap
       end
     end
   end

data/lib/sts/niso_sts/floats_group.rb

@@ -3,12 +3,9 @@
 module Sts
   module NisoSts
     class FloatsGroup < Lutaml::Model::Serializable
-      attribute :content, :string, collection: true
       xml do
         element "floats-group"
-        mixed_content
-
-        map_content to: :content
+        ordered
       end
     end
   end

data/lib/sts/niso_sts/fn.rb

@@ -5,10 +5,11 @@ module Sts
     class Fn < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :label, ::Sts::NisoSts::Label
-      attribute :paragraph, ::Sts::NisoSts::Paragraph
+      attribute :paragraph, ::Sts::NisoSts::Paragraph, collection: true
 
       xml do
         element "fn"
+        ordered
 
         map_attribute "id", to: :id
 

data/lib/sts/niso_sts/front.rb

@@ -9,6 +9,7 @@ module Sts
 
       xml do
         element "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/funding_group.rb

@@ -10,6 +10,7 @@ module Sts
 
       xml do
         element "funding-group"
+        ordered
 
         map_attribute "id", to: :id
 

data/lib/sts/niso_sts/glossary.rb

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

data/lib/sts/niso_sts/graphic.rb

@@ -10,12 +10,14 @@ module Sts
   module NisoSts
     class Graphic < Lutaml::Model::Serializable
       attribute :href, :xlink_href
+      attribute :xlink_type, :string
       attribute :sts_object_id, ::Sts::NisoSts::ObjectId, collection: true
 
       xml do
         element "graphic"
 
         map_attribute "href", to: :href
+        map_attribute "xlink:type", to: :xlink_type
         map_element "object-id", to: :sts_object_id
       end
     end

data/lib/sts/niso_sts/ics.rb

@@ -3,11 +3,13 @@
 module Sts
   module NisoSts
     class Ics < Lutaml::Model::Serializable
+      attribute :content, :string
       attribute :ics_desc, ::Sts::NisoSts::IcsDesc
 
       xml do
         element "ics"
 
+        map_content to: :content
         map_element "ics-desc", to: :ics_desc
       end
     end

data/lib/sts/niso_sts/index_term.rb

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

data/lib/sts/niso_sts/inline_formula.rb

@@ -5,12 +5,23 @@ require "lutaml/model"
 module Sts
   module NisoSts
     class InlineFormula < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
       attribute :math, ::Sts::TbxIsoTml::Math
+      attribute :alternatives, ::Sts::NisoSts::Alternatives
+      attribute :preformat, ::Sts::NisoSts::Preformat
 
       xml do
         element "inline-formula"
 
+        map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
+        map_attribute "specific-use", to: :specific_use
+
         map_element "math", to: :math
+        map_element "alternatives", to: :alternatives
+        map_element "preformat", to: :preformat
       end
     end
   end

data/lib/sts/niso_sts/institution_wrap.rb

@@ -8,6 +8,7 @@ module Sts
 
       xml do
         element "institution-wrap"
+        ordered
 
         map_element "institution", to: :institution
         map_element "institution-id", to: :institution_id

data/lib/sts/niso_sts/kwd_group.rb

@@ -17,6 +17,7 @@ module Sts
 
       xml do
         element "kwd-group"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "kwd-group-type", to: :kwd_group_type

data/lib/sts/niso_sts/label.rb

@@ -3,11 +3,12 @@
 module Sts
   module NisoSts
     class Label < Lutaml::Model::Serializable
-      attribute :content, :string
-      attribute :sup, Sts::TbxIsoTml::Sup
+      attribute :content, :string, collection: true
+      attribute :sup, Sts::TbxIsoTml::Sup, collection: true
 
       xml do
         element "label"
+        mixed_content
 
         map_content to: :content
         map_element "sup", to: :sup

data/lib/sts/niso_sts/list.rb

@@ -3,15 +3,20 @@
 module Sts
   module NisoSts
     class List < Lutaml::Model::Serializable
-      attribute :text, :string
+      attribute :id, :string
       attribute :list_type, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
       attribute :list_item, ::Sts::NisoSts::ListItem, collection: true
 
       xml do
         element "list"
+        ordered
 
-        map_content to: :text
+        map_attribute "id", to: :id
         map_attribute "list-type", to: :list_type
+        map_attribute "content-type", to: :content_type
+        map_attribute "specific-use", to: :specific_use
         map_element "list-item", to: :list_item
       end
     end

data/lib/sts/niso_sts/list_item.rb

@@ -6,16 +6,21 @@ module Sts
   module NisoSts
     class ListItem < Lutaml::Model::Serializable
       attribute :label, ::Sts::NisoSts::Label
-      attribute :list, ::Sts::NisoSts::List
-      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample,
+                collection: true
+      attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote,
+                collection: true
       attribute :p, ::Sts::NisoSts::Paragraph, collection: true
 
       xml do
         element "list-item"
+        ordered
 
         map_element "label", to: :label
         map_element "list", to: :list
         map_element "non-normative-example", to: :non_normative_example
+        map_element "non-normative-note", to: :non_normative_note
         map_element "p", to: :p
       end
     end

data/lib/sts/niso_sts/media.rb

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

data/lib/sts/niso_sts/meta_note.rb

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

data/lib/sts/niso_sts/metadata_iso.rb

@@ -22,7 +22,7 @@ module Sts
 
       xml do
         element "iso-meta"
-        mixed_content
+        ordered
 
         map_element "comm-ref", to: :comm_ref,
                                 value_map: { to: { empty: :empty } }

data/lib/sts/niso_sts/metadata_std.rb

@@ -6,6 +6,7 @@ module Sts
   module NisoSts
     class MetadataStd < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :std_meta_type, :string
       attribute :title_wrap, ::Sts::NisoSts::TitleWrap, collection: true
       attribute :content_language, :string
       attribute :std_ident, ::Sts::NisoSts::StandardIdentification
@@ -13,23 +14,28 @@ module Sts
       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 :proj_id, ::Sts::NisoSts::ProjId
+      attribute :release_date, ::Sts::NisoSts::ReleaseDate, collection: true
+      attribute :release_version, ::Sts::NisoSts::ReleaseVersion
+      attribute :std_org, ::Sts::NisoSts::StdOrg, collection: true
+      attribute :std_org_group, ::Sts::NisoSts::StdOrgGroup
       attribute :comm_ref, :string
       attribute :secretariat, :string
+      attribute :ics, :string, collection: true
       attribute :page_count, ::Sts::NisoSts::PageCount
-      attribute :ics, :string
-      attribute :std_xref, ::Sts::NisoSts::StdCrossReference
+      attribute :std_xref, ::Sts::NisoSts::StdCrossReference, collection: true
       attribute :permissions, ::Sts::NisoSts::Permissions
+      attribute :self_uri, ::Sts::NisoSts::SelfUri
       attribute :meta_note, ::Sts::NisoSts::MetaNote, collection: true
       attribute :custom_meta_group, ::Sts::NisoSts::CustomMetaGroup,
                 collection: true
 
       xml do
         element "std-meta"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
+        map_attribute "std-meta-type", to: :std_meta_type
 
         map_element "title-wrap", to: :title_wrap
         map_element "content-language", to: :content_language
@@ -38,16 +44,20 @@ module Sts
         map_element "std-ref", to: :std_ref
         map_element "doc-ref", to: :doc_ref
         map_element "pub-date", to: :pub_date
+        map_element "proj-id", to: :proj_id
         map_element "release-date", to: :release_date
         map_element "release-version", to: :release_version
+        map_element "std-org", to: :std_org
+        map_element "std-org-group", to: :std_org_group
         map_element "comm-ref", to: :comm_ref,
                                 value_map: { to: { empty: :empty } }
         map_element "secretariat", to: :secretariat,
                                    value_map: { to: { empty: :empty } }
-        map_element "page-count", to: :page_count
         map_element "ics", to: :ics
+        map_element "page-count", to: :page_count
         map_element "std-xref", to: :std_xref
         map_element "permissions", to: :permissions
+        map_element "self-uri", to: :self_uri
         map_element "meta-note", to: :meta_note
         map_element "custom-meta-group", to: :custom_meta_group
       end

data/lib/sts/niso_sts/milestone_end.rb

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

data/lib/sts/niso_sts/milestone_start.rb

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

data/lib/sts/niso_sts/mixed_citation.rb

@@ -4,8 +4,10 @@
 module Sts
   module NisoSts
     class MixedCitation < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string, collection: true
       attribute :publication_type, :string
+      attribute :xlink_type, :string
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
       attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
       attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
@@ -56,13 +58,24 @@ module Sts
       attribute :institution, ::Sts::NisoSts::Institution, collection: true
       attribute :publisher, ::Sts::NisoSts::Publisher
       attribute :price, :string
+      attribute :year, ::Sts::NisoSts::Year, collection: true
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
+      attribute :sc, ::Sts::NisoSts::Sc, collection: true
+      attribute :sup, ::Sts::NisoSts::Sup, collection: true
+      attribute :sub, ::Sts::NisoSts::Sub, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :uri, ::Sts::NisoSts::Uri, collection: true
+      attribute :underline, ::Sts::NisoSts::Underline, collection: true
+      attribute :break, ::Sts::NisoSts::Break, collection: true
 
       xml do
         element "mixed-citation"
         mixed_content
 
         map_content to: :content
+        map_attribute "id", to: :id
         map_attribute "publication-type", to: :publication_type
+        map_attribute "xlink:type", to: :xlink_type
 
         map_element "bold", to: :bold
         map_element "italic", to: :italic
@@ -114,6 +127,15 @@ module Sts
         map_element "institution", to: :institution
         map_element "publisher", to: :publisher
         map_element "price", to: :price
+        map_element "year", to: :year
+        map_element "fn", to: :fn
+        map_element "sc", to: :sc
+        map_element "sup", to: :sup
+        map_element "sub", to: :sub
+        map_element "xref", to: :xref
+        map_element "uri", to: :uri
+        map_element "underline", to: :underline
+        map_element "break", to: :break
       end
     end
   end