sts 0.5.2 → 0.5.4

data/lib/sts/niso_sts/non_normative_note.rb

@@ -5,18 +5,30 @@ module Sts
     class NonNormativeNote < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :content_type, :string
-      attribute :p, ::Sts::NisoSts::Paragraph
+      attribute :originator, :string
+      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 :array, ::Sts::NisoSts::SectionArray, collection: true
 
       xml do
         element "non-normative-note"
-        mixed_content
+        ordered
 
         map_attribute "content-type", to: :content_type
         map_attribute "id", to: :id
+        map_attribute "originator", to: :originator
 
         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 "array", to: :array
       end
     end
   end

data/lib/sts/niso_sts/normative_example.rb

@@ -12,7 +12,7 @@ module Sts
 
       xml do
         element "normative-example"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "xml:lang", to: :xml_lang

data/lib/sts/niso_sts/normative_note.rb

@@ -5,6 +5,7 @@ module Sts
     class NormativeNote < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :content_type, :string
+      attribute :originator, :string
       attribute :xml_lang, :string
       attribute :specific_use, :string
       attribute :symbol, :string
@@ -13,10 +14,11 @@ module Sts
 
       xml do
         element "normative-note"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type
+        map_attribute "originator", to: :originator
         map_attribute "xml:lang", to: :xml_lang
         map_attribute "specific-use", to: :specific_use
         map_attribute "symbol", to: :symbol

data/lib/sts/niso_sts/note.rb

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

data/lib/sts/niso_sts/notes.rb

@@ -14,7 +14,7 @@ module Sts
 
       xml do
         element "notes"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "notes-type", to: :notes_type

data/lib/sts/niso_sts/notes_group.rb

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

data/lib/sts/niso_sts/object_id.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable Layout/LineLength
 # <object-id pub-id-type="fpi">+//ISO 9070/RA::A00007::GE::DIN German Institute for
 #       Standardization::Standards//NONSGML ISO 13849-1:2006-11-00::Figure 1//EN</object-id>
@@ -7,12 +9,14 @@
 module Sts
   module NisoSts
     class ObjectId < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :pub_id_type, :string
       attribute :content, :string
 
       xml do
         element "object-id"
 
+        map_attribute "id", to: :id
         map_attribute "pub-id-type", to: :pub_id_type
         map_content to: :content
       end

data/lib/sts/niso_sts/on_behalf_of.rb

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

data/lib/sts/niso_sts/open_access.rb

@@ -3,12 +3,11 @@
 module Sts
   module NisoSts
     class OpenAccess < Lutaml::Model::Serializable
-      attribute :content, :string, collection: true
+      attribute :id, :string
       xml do
         element "open-access"
-        mixed_content
-
-        map_content to: :content
+        map_attribute "id", to: :id
+        ordered
       end
     end
   end

data/lib/sts/niso_sts/originator.rb

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

data/lib/sts/niso_sts/page_count.rb

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

data/lib/sts/niso_sts/page_range.rb

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

data/lib/sts/niso_sts/paragraph.rb

@@ -4,29 +4,50 @@ module Sts
   module NisoSts
     class Paragraph < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :originator, :string
+      attribute :style_type, :string
+      attribute :specific_use, :string
       attribute :text, :string, collection: true
       attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
       attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
-      attribute :uri, :string
-      attribute :list, ::Sts::NisoSts::List
-      attribute :def_list, ::Sts::NisoSts::DefList
-      attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote
-      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample
+      attribute :uri, ::Sts::NisoSts::Uri, collection: true
+      attribute :styled_content, ::Sts::NisoSts::StyledContent, collection: true
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :def_list, ::Sts::NisoSts::DefList, collection: true
+      attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote,
+                collection: true
+      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample,
+                collection: true
       attribute :inline_formula, ::Sts::NisoSts::InlineFormula, collection: true
       attribute :disp_formula, ::Sts::NisoSts::DisplayFormula, collection: true
       attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
       attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
-      attribute :ext_link, ::Sts::NisoSts::ExtLink
-      attribute :entailed_term, ::Sts::TbxIsoTml::EntailedTerm
+      attribute :ext_link, ::Sts::NisoSts::ExtLink, collection: true
+      attribute :entailed_term, ::Sts::TbxIsoTml::EntailedTerm, collection: true
+      attribute :sub, ::Sts::NisoSts::Sub, collection: true
+      attribute :sup, ::Sts::NisoSts::Sup, collection: true
+      attribute :sc, ::Sts::NisoSts::Sc, collection: true
+      attribute :monospace, ::Sts::NisoSts::Monospace, collection: true
+      attribute :underline, ::Sts::NisoSts::Underline, collection: true
+      attribute :break, ::Sts::NisoSts::Break, collection: true
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
+      attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
+      attribute :array, ::Sts::NisoSts::SectionArray, collection: true
+      attribute :overline, ::Sts::NisoSts::Overline, collection: true
 
       xml do
         element "p"
         mixed_content
 
         map_attribute "id", to: :id
+        map_attribute "originator", to: :originator
+        map_attribute "style-type", to: :style_type
+        map_attribute "specific-use", to: :specific_use
         map_content to: :text
         map_element "bold", to: :bold
         map_element "italic", to: :italic
+        map_element "styled-content", to: :styled_content
         map_element "list", to: :list
         map_element "def-list", to: :def_list
         map_element "non-normative-note", to: :non_normative_note
@@ -38,6 +59,17 @@ module Sts
         map_element "uri", to: :uri
         map_element "std", to: :std
         map_element "xref", to: :xref
+        map_element "sub", to: :sub
+        map_element "sup", to: :sup
+        map_element "sc", to: :sc
+        map_element "monospace", to: :monospace
+        map_element "underline", to: :underline
+        map_element "break", to: :break
+        map_element "fn", to: :fn
+        map_element "graphic", to: :graphic
+        map_element "preformat", to: :preformat
+        map_element "array", to: :array
+        map_element "overline", to: :overline
       end
     end
   end

data/lib/sts/niso_sts/part_number.rb

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

data/lib/sts/niso_sts/part_of_speech.rb

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

data/lib/sts/niso_sts/patent.rb

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

data/lib/sts/niso_sts/permissions.rb

@@ -3,15 +3,21 @@
 module Sts
   module NisoSts
     class Permissions < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :copyright_statement, :string
       attribute :copyright_year, :string
-      attribute :copyright_holder, :string
+      attribute :copyright_holder, :string, collection: true
+      attribute :license, ::Sts::NisoSts::License, collection: true
 
       xml do
         element "permissions"
+        map_attribute "id", to: :id
+        ordered
+
         map_element "copyright-statement", to: :copyright_statement
         map_element "copyright-year", to: :copyright_year
         map_element "copyright-holder", to: :copyright_holder
+        map_element "license", to: :license
       end
     end
   end

data/lib/sts/niso_sts/phone.rb

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

data/lib/sts/niso_sts/postal_code.rb

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

data/lib/sts/niso_sts/prefix.rb

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

data/lib/sts/niso_sts/preformat.rb

@@ -8,7 +8,15 @@ module Sts
       attribute :preformat_type, :string
       attribute :xml_space, :string
       attribute :language, :string
+      attribute :orientation, :string
+      attribute :position, :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
+      attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
+
       xml do
         element "preformat"
         mixed_content
@@ -18,7 +26,14 @@ module Sts
         map_attribute "preformat-type", to: :preformat_type
         map_attribute "xml:space", to: :xml_space
         map_attribute "language", to: :language
+        map_attribute "orientation", to: :orientation
+        map_attribute "position", to: :position
         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
+        map_element "std", to: :std
       end
     end
   end

data/lib/sts/niso_sts/price.rb

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

data/lib/sts/niso_sts/principal_award_recipient.rb

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

data/lib/sts/niso_sts/principal_investigator.rb

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

data/lib/sts/niso_sts/private_char.rb

@@ -3,18 +3,18 @@
 module Sts
   module NisoSts
     class PrivateChar < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :description, :string
       attribute :name, :string
       attribute :specific_use, :string
-      attribute :content, :string, collection: true
       xml do
         element "private-char"
-        mixed_content
+        map_attribute "id", to: :id
+        ordered
 
         map_attribute "description", to: :description
         map_attribute "name", to: :name
         map_attribute "specific-use", to: :specific_use
-        map_content to: :content
       end
     end
   end

data/lib/sts/niso_sts/processing_meta.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class RestrictedBy < Lutaml::Model::Serializable
+      attribute :content, :string, collection: true
+
+      xml do
+        element "restricted-by"
+        mixed_content
+        map_content to: :content
+      end
+    end
+
+    class ExtendedBy < Lutaml::Model::Serializable
+      attribute :content, :string, collection: true
+
+      xml do
+        element "extended-by"
+        mixed_content
+        map_content to: :content
+      end
+    end
+
+    class ProcessingMeta < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :tagset_family, :string
+      attribute :base_tagset, :string
+      attribute :table_model, :string
+      attribute :math_representation, :string
+      attribute :mathml_version, :string
+      attribute :terminology_model, :string
+      attribute :restricted_by, ::Sts::NisoSts::RestrictedBy,
+                collection: true
+      attribute :extended_by, ::Sts::NisoSts::ExtendedBy, collection: true
+      attribute :custom_meta_group, ::Sts::NisoSts::CustomMetaGroup
+
+      xml do
+        element "processing-meta"
+
+        map_attribute "id", to: :id
+        map_attribute "tagset-family", to: :tagset_family
+        map_attribute "base-tagset", to: :base_tagset
+        map_attribute "table-model", to: :table_model
+        map_attribute "math-representation", to: :math_representation
+        map_attribute "mathml-version", to: :mathml_version
+        map_attribute "terminology-model", to: :terminology_model
+        map_element "restricted-by", to: :restricted_by
+        map_element "extended-by", to: :extended_by
+        map_element "custom-meta-group", to: :custom_meta_group
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/product.rb

@@ -3,11 +3,13 @@
 module Sts
   module NisoSts
     class Product < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :product_type, :string
       attribute :xlink_href, :string
       attribute :content, :string, collection: true
       xml do
         element "product"
+        map_attribute "id", to: :id
         mixed_content
 
         map_attribute "product-type", to: :product_type

data/lib/sts/niso_sts/proj_id.rb

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

data/lib/sts/niso_sts/pub_date.rb

@@ -3,11 +3,13 @@
 module Sts
   module NisoSts
     class PubDate < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :day, :string
       attribute :month, :string
       attribute :year, :string
       attribute :era, :string
       attribute :season, :string
+      attribute :content, :string
       attribute :date_type, :string
       attribute :iso_8601_date, :string
       attribute :publication_format, :string
@@ -15,7 +17,9 @@ module Sts
       xml do
         element "pub-date"
 
+        map_attribute "id", to: :id
         map_attribute "date-type", to: :date_type
+        map_content to: :content
         map_attribute "iso-8601-date", to: :iso_8601_date
         map_attribute "publication-format", to: :publication_format
         map_element "day", to: :day

data/lib/sts/niso_sts/pub_id.rb

@@ -3,6 +3,7 @@
 module Sts
   module NisoSts
     class PubId < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :pub_id_type, :string
       attribute :assigning_authority, :string
       attribute :content, :string
@@ -10,6 +11,7 @@ module Sts
       xml do
         element "pub-id"
 
+        map_attribute "id", to: :id
         map_attribute "pub-id-type", to: :pub_id_type
         map_attribute "assigning-authority", to: :assigning_authority
         map_content to: :content

data/lib/sts/niso_sts/publisher.rb

@@ -3,11 +3,14 @@
 module Sts
   module NisoSts
     class Publisher < Lutaml::Model::Serializable
+      attribute :id, :string
       attribute :publisher_name, ::Sts::NisoSts::PublisherName, collection: true
       attribute :publisher_loc, ::Sts::NisoSts::PublisherLoc, collection: true
 
       xml do
         element "publisher"
+        map_attribute "id", to: :id
+        ordered
 
         map_element "publisher-name", to: :publisher_name
         map_element "publisher-loc", to: :publisher_loc

data/lib/sts/niso_sts/publisher_loc.rb

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

data/lib/sts/niso_sts/publisher_name.rb

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

data/lib/sts/niso_sts/ref_count.rb

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