sts 0.5.2 → 0.5.4

data/lib/sts/niso_sts/kwd_group.rb

@@ -7,6 +7,10 @@ module Sts
       attribute :kwd_group_type, :string
       attribute :xml_lang, :string
       attribute :specific_use, :string
+      attribute :vocab, :string
+      attribute :vocab_identifier, :string
+      attribute :vocab_term, :string
+      attribute :vocab_term_identifier, :string
       attribute :label, ::Sts::NisoSts::Label
       attribute :title, ::Sts::NisoSts::Title
       attribute :kwd, ::Sts::NisoSts::Kwd, collection: true
@@ -17,11 +21,16 @@ module Sts
 
       xml do
         element "kwd-group"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "kwd-group-type", to: :kwd_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_attribute "vocab-term", to: :vocab_term
+        map_attribute "vocab-term-identifier", to: :vocab_term_identifier
 
         map_element "label", to: :label
         map_element "title", to: :title

data/lib/sts/niso_sts/label.rb

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

data/lib/sts/niso_sts/legend.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class Legend < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :content, :string, collection: true
+      attribute :title, ::Sts::NisoSts::Title
+      attribute :p, ::Sts::NisoSts::Paragraph, collection: true
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :def_list, ::Sts::NisoSts::DefList, collection: true
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
+      attribute :supplementary_material,
+                ::Sts::NisoSts::SupplementaryMaterial, collection: true
+
+      xml do
+        element "legend"
+        mixed_content
+
+        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_content to: :content
+        map_element "title", to: :title
+        map_element "p", to: :p
+        map_element "list", to: :list
+        map_element "def-list", to: :def_list
+        map_element "graphic", to: :graphic
+        map_element "supplementary-material",
+                    to: :supplementary_material
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/license.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class License < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :href, :xlink_href
       attribute :lang, Lutaml::Xml::W3c::XmlLangType
       attribute :license_p, ::Sts::NisoSts::LicenseP, collection: true
@@ -10,6 +11,7 @@ module Sts
       xml do
         element "license"
 
+        map_attribute "id", to: :id
         map_attribute "xlink:href", to: :href
         map_attribute "xml:lang", to: :lang
         map_element "license-p", to: :license_p

data/lib/sts/niso_sts/license_p.rb

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

data/lib/sts/niso_sts/list.rb

@@ -3,15 +3,22 @@
 module Sts
   module NisoSts
     class List < Lutaml::Model::Serializable
-      attribute :text, :string
+      attribute :id, :string
       attribute :list_type, :string
+      attribute :content_type, :string
+      attribute :originator, :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 "originator", to: :originator
+        map_attribute "specific-use", to: :specific_use
         map_element "list-item", to: :list_item
       end
     end

data/lib/sts/niso_sts/list_item.rb

@@ -1,21 +1,26 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     class ListItem < Lutaml::Model::Serializable
+      attribute :id, :string
       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_attribute "id", to: :id
         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/long_desc.rb

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

data/lib/sts/niso_sts/lpage.rb

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

data/lib/sts/niso_sts/main.rb

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

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_date.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class MetaDate < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :content, :string
       attribute :type, :string
 
@@ -11,6 +12,7 @@ module Sts
 
         map_content to: :content
 
+        map_attribute "id", to: :id
         map_attribute :type, to: :type
       end
     end

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

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 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 +12,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 +42,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

data/lib/sts/niso_sts/mml_content.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Sts
   module NisoSts
     module MmlContent

data/lib/sts/niso_sts/monospace.rb

@@ -7,6 +7,11 @@ module Sts
       attribute :specific_use, :string
       attribute :toggle, :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 :styled_content, ::Sts::NisoSts::StyledContent, collection: true
+
       xml do
         element "monospace"
         mixed_content
@@ -15,6 +20,10 @@ module Sts
         map_attribute "specific-use", to: :specific_use
         map_attribute "toggle", to: :toggle
         map_content to: :content
+        map_element "bold", to: :bold
+        map_element "italic", to: :italic
+        map_element "underline", to: :underline
+        map_element "styled-content", to: :styled_content
       end
     end
   end

data/lib/sts/niso_sts/month.rb

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

data/lib/sts/niso_sts/name.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class Name < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :name_style, :string
       attribute :content_type, :string
       attribute :surname, ::Sts::NisoSts::Surname
@@ -12,6 +13,8 @@ module Sts
 
       xml do
         element "name"
+        map_attribute "id", to: :id
+        ordered
 
         map_attribute "name-style", to: :name_style
         map_attribute "content-type", to: :content_type

data/lib/sts/niso_sts/name_alternatives.rb

@@ -3,12 +3,17 @@
 module Sts
   module NisoSts
     class NameAlternatives < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :name, ::Sts::NisoSts::Name, collection: true
+      attribute :string_name, ::Sts::NisoSts::StringName, collection: true
 
       xml do
         element "name-alternatives"
 
+        map_attribute "id", to: :id
+
         map_element "name", to: :name
+        map_element "string-name", to: :string_name
       end
     end
   end

data/lib/sts/niso_sts/named_content.rb

@@ -3,14 +3,64 @@
 module Sts
   module NisoSts
     class NamedContent < Lutaml::Model::Serializable
+      attribute :alt, :string
       attribute :content_type, :string
-      attribute :content, :string
+      attribute :id, :string
+      attribute :rid, :string
+      attribute :specific_use, :string
+      attribute :vocab, :string
+      attribute :vocab_identifier, :string
+      attribute :vocab_term, :string
+      attribute :vocab_term_identifier, :string
+      attribute :xlink_href, :string
+      attribute :xlink_role, :string
+      attribute :xlink_title, :string
+      attribute :xlink_show, :string
+      attribute :xlink_actuate, :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 :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 "named-content"
+        mixed_content
 
+        map_attribute "alt", to: :alt
         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 "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 "xlink:href", to: :xlink_href
+        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_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 "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/nat_meta.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class NatMeta < 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 "nat-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/nested_kwd.rb

@@ -3,12 +3,15 @@
 module Sts
   module NisoSts
     class NestedKwd < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :kwd, ::Sts::NisoSts::Kwd
       attribute :kwd_group, ::Sts::NisoSts::KwdGroup, collection: true
       attribute :nested_kwd, ::Sts::NisoSts::NestedKwd, collection: true
 
       xml do
         element "nested-kwd"
+        map_attribute "id", to: :id
+        ordered
 
         map_element "kwd", to: :kwd
         map_element "kwd-group", to: :kwd_group

data/lib/sts/niso_sts/nlm_citation.rb

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

data/lib/sts/niso_sts/non_normative_example.rb

@@ -4,16 +4,29 @@ module Sts
   module NisoSts
     class NonNormativeExample < Lutaml::Model::Serializable
       attribute :id, :string
-      attribute :p, ::Sts::NisoSts::Paragraph
+      attribute :p, ::Sts::NisoSts::Paragraph, collection: true
       attribute :label, ::Sts::NisoSts::Label
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
+      attribute :boxed_text, ::Sts::NisoSts::BoxedText, collection: true
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
+      attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
+      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample,
+                collection: true
 
       xml do
         element "non-normative-example"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_element "p", to: :p
         map_element "label", to: :label
+        map_element "list", to: :list
+        map_element "preformat", to: :preformat
+        map_element "boxed-text", to: :boxed_text
+        map_element "graphic", to: :graphic
+        map_element "table-wrap", to: :table_wrap
+        map_element "non-normative-example", to: :non_normative_example
       end
     end
   end