sts 0.5.2 → 0.5.4

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,11 @@
 module Sts
   module NisoSts
     class FloatsGroup < Lutaml::Model::Serializable
-      attribute :content, :string, collection: true
+      attribute :id, :string
       xml do
         element "floats-group"
-        mixed_content
-
-        map_content to: :content
+        map_attribute "id", to: :id
+        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/fn_group.rb

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

data/lib/sts/niso_sts/fpage.rb

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

data/lib/sts/niso_sts/front.rb

@@ -3,15 +3,31 @@
 module Sts
   module NisoSts
     class Front < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :iso_meta, ::Sts::NisoSts::MetadataIso
       attribute :std_meta, ::Sts::NisoSts::MetadataStd
+      attribute :std_doc_meta, ::Sts::NisoSts::StdDocMeta
+      attribute :reg_meta, ::Sts::NisoSts::RegMeta
+      attribute :nat_meta, ::Sts::NisoSts::NatMeta
       attribute :sec, ::Sts::NisoSts::Section, collection: true
+      attribute :ack, ::Sts::NisoSts::Ack, collection: true
+      attribute :notes, ::Sts::NisoSts::Notes, collection: true
+      attribute :toc, ::Sts::NisoSts::Toc, collection: true
 
       xml do
         element "front"
+        ordered
+
+        map_attribute "id", to: :id
         map_element "iso-meta", to: :iso_meta
         map_element "std-meta", to: :std_meta
+        map_element "std-doc-meta", to: :std_doc_meta
+        map_element "reg-meta", to: :reg_meta
+        map_element "nat-meta", to: :nat_meta
         map_element "sec", to: :sec
+        map_element "ack", to: :ack
+        map_element "notes", to: :notes
+        map_element "toc", to: :toc
       end
     end
   end

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

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class FundingSource < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :country, :string
       attribute :deposit_funder_name, :string
       attribute :funder_id, :string
@@ -11,6 +12,7 @@ module Sts
       attribute :content, :string, collection: true
       xml do
         element "funding-source"
+        map_attribute "id", to: :id
         mixed_content
 
         map_attribute "country", to: :country

data/lib/sts/niso_sts/given_names.rb

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

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

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

data/lib/sts/niso_sts/graphic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable Layout/LineLength
 # <graphic xlink:href="e1d18be9.001.gif">
 #   <object-id pub-id-type="fpi">+//ISO 9070/RA::A00007::GE::DIN German Institute for
@@ -9,13 +11,17 @@
 module Sts
   module NisoSts
     class Graphic < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :href, :xlink_href
+      attribute :xlink_type, :string
       attribute :sts_object_id, ::Sts::NisoSts::ObjectId, collection: true
 
       xml do
         element "graphic"
 
+        map_attribute "id", to: :id
         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/hr.rb

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

data/lib/sts/niso_sts/ics.rb

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

data/lib/sts/niso_sts/ics_desc.rb

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

data/lib/sts/niso_sts/ics_wrap.rb

@@ -3,11 +3,20 @@
 module Sts
   module NisoSts
     class IcsWrap < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :specific_use, :string
+      attribute :vocab, :string
+      attribute :vocab_identifier, :string
       attribute :ics, ::Sts::NisoSts::Ics, collection: true
 
       xml do
         element "ics-wrap"
 
+        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_element "ics", to: :ics
       end
     end

data/lib/sts/niso_sts/index.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class Index < Lutaml::Model::Serializable
+      attribute :content_type, :string
+      attribute :id, :string
+      attribute :index_type, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :index_title_group, ::Sts::NisoSts::IndexTitleGroup
+      attribute :p, ::Sts::NisoSts::Paragraph, collection: true
+      attribute :index_entry, ::Sts::NisoSts::IndexEntry, collection: true
+      attribute :index_div, ::Sts::NisoSts::IndexDiv, collection: true
+
+      xml do
+        element "index"
+        ordered
+
+        map_attribute "content-type", to: :content_type
+        map_attribute "id", to: :id
+        map_attribute "index-type", to: :index_type
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
+        map_element "index-title-group", to: :index_title_group
+        map_element "p", to: :p
+        map_element "index-entry", to: :index_entry
+        map_element "index-div", to: :index_div
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/index_div.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class IndexDiv < Lutaml::Model::Serializable
+      attribute :content_type, :string
+      attribute :id, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :index_title_group, ::Sts::NisoSts::IndexTitleGroup
+      attribute :p, ::Sts::NisoSts::Paragraph, collection: true
+      attribute :index_entry, ::Sts::NisoSts::IndexEntry, collection: true
+      attribute :index_div, ::Sts::NisoSts::IndexDiv, collection: true
+
+      xml do
+        element "index-div"
+        ordered
+
+        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_element "index-title-group", to: :index_title_group
+        map_element "p", to: :p
+        map_element "index-entry", to: :index_entry
+        map_element "index-div", to: :index_div
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/index_entry.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class IndexEntry < Lutaml::Model::Serializable
+      attribute :content_type, :string
+      attribute :id, :string
+      attribute :sort_key, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :term, :string
+      attribute :index_entry, ::Sts::NisoSts::IndexEntry, collection: true
+      attribute :see_entry, ::Sts::NisoSts::SeeEntry, collection: true
+      attribute :see_also_entry, ::Sts::NisoSts::SeeAlsoEntry, collection: true
+
+      xml do
+        element "index-entry"
+        ordered
+
+        map_attribute "content-type", to: :content_type
+        map_attribute "id", to: :id
+        map_attribute "sort-key", to: :sort_key
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
+        map_element "term", to: :term
+        map_element "index-entry", to: :index_entry
+        map_element "see-entry", to: :see_entry
+        map_element "see-also-entry", to: :see_also_entry
+      end
+    end
+  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/index_title_group.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class IndexTitleGroup < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :label, ::Sts::NisoSts::Label
+      attribute :title, ::Sts::NisoSts::Title
+      attribute :subtitle, ::Sts::NisoSts::Subtitle, collection: true
+
+      xml do
+        element "index-title-group"
+        ordered
+
+        map_attribute "id", to: :id
+        map_element "label", to: :label
+        map_element "title", to: :title
+        map_element "subtitle", to: :subtitle
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/inline_formula.rb

@@ -1,16 +1,52 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class InlineFormula < 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 :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 :math, ::Sts::TbxIsoTml::Math
+      attribute :inline_formula, ::Sts::NisoSts::InlineFormula, collection: true
+      attribute :alternatives, ::Sts::NisoSts::Alternatives
+      attribute :preformat, ::Sts::NisoSts::Preformat
+      attribute :alt_text, ::Sts::NisoSts::AltText
+      attribute :long_desc, ::Sts::NisoSts::LongDesc
 
       xml do
         element "inline-formula"
+        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 "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 "math", to: :math
+        map_element "inline-formula", to: :inline_formula
+        map_element "alternatives", to: :alternatives
+        map_element "preformat", to: :preformat
+        map_element "alt-text", to: :alt_text
+        map_element "long-desc", to: :long_desc
       end
     end
   end

data/lib/sts/niso_sts/inline_media.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class InlineMedia < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :mimetype, :string
+      attribute :mime_subtype, :string
+      attribute :xlink_href, :string
+      attribute :xlink_type, :string
+      attribute :xlink_role, :string
+      attribute :xlink_title, :string
+      attribute :xlink_show, :string
+      attribute :xlink_actuate, :string
+      attribute :vocab, :string
+      attribute :vocab_identifier, :string
+      attribute :vocab_term, :string
+      attribute :vocab_term_identifier, :string
+      attribute :alt, :string
+      attribute :long_desc, :string
+
+      xml do
+        element "inline-media"
+
+        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 "mimetype", to: :mimetype
+        map_attribute "mime-subtype", to: :mime_subtype
+        map_attribute "xlink:href", to: :xlink_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 "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 "alt", to: :alt
+        map_attribute "long-desc", to: :long_desc
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/institution.rb

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

data/lib/sts/niso_sts/institution_id.rb

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

data/lib/sts/niso_sts/institution_wrap.rb

@@ -3,11 +3,14 @@
 module Sts
   module NisoSts
     class InstitutionWrap < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :institution, ::Sts::NisoSts::Institution
       attribute :institution_id, ::Sts::NisoSts::InstitutionId
 
       xml do
         element "institution-wrap"
+        map_attribute "id", to: :id
+        ordered
 
         map_element "institution", to: :institution
         map_element "institution-id", to: :institution_id

data/lib/sts/niso_sts/intro.rb

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

data/lib/sts/niso_sts/is_proof.rb

@@ -3,11 +3,13 @@
 module Sts
   module NisoSts
     class IsProof < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :is_proof, :string
 
       xml do
         element "is-proof"
 
+        map_attribute "id", to: :id
         map_attribute "is-proof", to: :is_proof
       end
     end

data/lib/sts/niso_sts/isbn.rb

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

data/lib/sts/niso_sts/issn.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class Issn < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :pub_type, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
@@ -10,6 +11,7 @@ module Sts
 
       xml do
         element "issn"
+        map_attribute "id", to: :id
         mixed_content
 
         map_attribute "pub-type", to: :pub_type

data/lib/sts/niso_sts/issn_l.rb

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

data/lib/sts/niso_sts/issue.rb

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