sts 0.5.2 → 0.5.3

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

@@ -12,6 +12,7 @@ module Sts
 
       xml do
         element "name"
+        ordered
 
         map_attribute "name-style", to: :name_style
         map_attribute "content-type", to: :content_type

data/lib/sts/niso_sts/nat_meta.rb

@@ -22,6 +22,7 @@ module Sts
 
       xml do
         element "nat-meta"
+        ordered
 
         map_element "title-wrap", to: :title_wrap
         map_element "std-ident", to: :std_ident

data/lib/sts/niso_sts/nested_kwd.rb

@@ -9,6 +9,7 @@ module Sts
 
       xml do
         element "nested-kwd"
+        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

data/lib/sts/niso_sts/non_normative_note.rb

@@ -5,18 +5,28 @@ module Sts
     class NonNormativeNote < Lutaml::Model::Serializable
       attribute :id, :string
       attribute :content_type, :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 :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_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

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

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

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

data/lib/sts/niso_sts/paragraph.rb

@@ -4,29 +4,48 @@ module Sts
   module NisoSts
     class Paragraph < Lutaml::Model::Serializable
       attribute :id, :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 "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 +57,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/permissions.rb

@@ -9,6 +9,7 @@ module Sts
 
       xml do
         element "permissions"
+        ordered
         map_element "copyright-statement", to: :copyright_statement
         map_element "copyright-year", to: :copyright_year
         map_element "copyright-holder", to: :copyright_holder

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

@@ -6,15 +6,13 @@ module Sts
       attribute :description, :string
       attribute :name, :string
       attribute :specific_use, :string
-      attribute :content, :string, collection: true
       xml do
         element "private-char"
-        mixed_content
+        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/pub_date.rb

@@ -8,6 +8,7 @@ module Sts
       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
@@ -16,6 +17,7 @@ module Sts
         element "pub-date"
 
         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/publisher.rb

@@ -8,6 +8,7 @@ module Sts
 
       xml do
         element "publisher"
+        ordered
 
         map_element "publisher-name", to: :publisher_name
         map_element "publisher-loc", to: :publisher_loc

data/lib/sts/niso_sts/reference.rb

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

data/lib/sts/niso_sts/reference_list.rb

@@ -6,12 +6,15 @@ module Sts
       attribute :content_type, :string
       attribute :id, :string
       attribute :specific_use, :string
-      attribute :title, :string
+      attribute :title, ::Sts::NisoSts::Title
       attribute :label, ::Sts::NisoSts::Label
       attribute :ref, ::Sts::NisoSts::Reference, collection: true
+      attribute :ref_list, ::Sts::NisoSts::ReferenceList, collection: true
+      attribute :paragraph, ::Sts::NisoSts::Paragraph, collection: true
 
       xml do
         element "ref-list"
+        ordered
 
         map_attribute "content-type", to: :content_type
         map_attribute "id", to: :id
@@ -19,6 +22,8 @@ module Sts
         map_element "title", to: :title
         map_element "label", to: :label
         map_element "ref", to: :ref
+        map_element "ref-list", to: :ref_list
+        map_element "p", to: :paragraph
       end
     end
   end

data/lib/sts/niso_sts/reference_standard.rb

@@ -13,6 +13,7 @@ module Sts
       attribute :fn, ::Sts::NisoSts::Fn, collection: true
       attribute :std_id_group, ::Sts::NisoSts::StdIdGroup, collection: true
       attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
 
       xml do
         element "std"
@@ -26,6 +27,7 @@ module Sts
         map_element "title", to: :title
         map_element "std-id-group", to: :std_id_group
         map_element "xref", to: :xref
+        map_element "bold", to: :bold
 
         map_content to: :content
       end

data/lib/sts/niso_sts/reg_meta.rb

@@ -22,6 +22,7 @@ module Sts
 
       xml do
         element "reg-meta"
+        ordered
 
         map_element "title-wrap", to: :title_wrap
         map_element "std-ident", to: :std_ident

data/lib/sts/niso_sts/release_date.rb

@@ -3,16 +3,19 @@
 module Sts
   module NisoSts
     class ReleaseDate < Lutaml::Model::Serializable
-      attribute :day, :string
-      attribute :month, :string
-      attribute :year, :string
+      attribute :content, :string, collection: true
+      attribute :date_type, :string
+      attribute :iso_8601_date, :string
+      attribute :std_type, :string
 
       xml do
         element "release-date"
+        mixed_content
 
-        map_element "day", to: :day
-        map_element "month", to: :month
-        map_element "year", to: :year
+        map_content to: :content
+        map_attribute "date-type", to: :date_type
+        map_attribute "iso-8601-date", to: :iso_8601_date
+        map_attribute "std-type", to: :std_type
       end
     end
   end

data/lib/sts/niso_sts/ruby.rb

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

data/lib/sts/niso_sts/section.rb

@@ -8,7 +8,7 @@ module Sts
       attribute :label, ::Sts::NisoSts::Label
       attribute :title, ::Sts::NisoSts::Title
       attribute :type, :string
-      attribute :array, ::Sts::NisoSts::SectionArray
+      attribute :array, ::Sts::NisoSts::SectionArray, collection: true
       attribute :paragraphs, ::Sts::NisoSts::Paragraph, collection: true
       attribute :list, ::Sts::NisoSts::List, collection: true
       attribute :term_sec, ::Sts::NisoSts::TermSection, collection: true
@@ -18,14 +18,33 @@ module Sts
       attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample,
                 collection: true
       attribute :sec, ::Sts::NisoSts::Section, collection: true
-      attribute :figures, ::Sts::NisoSts::Figure, collection: true
       attribute :fig, ::Sts::NisoSts::Figure, collection: true
+      attribute :fig_group, ::Sts::NisoSts::FigGroup, collection: true
 
       attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
+      attribute :boxed_text, ::Sts::NisoSts::BoxedText, collection: true
+      attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
+      attribute :disp_formula, ::Sts::NisoSts::DisplayFormula, collection: true
+      attribute :disp_formula_group, ::Sts::NisoSts::DispFormulaGroup,
+                collection: true
+      attribute :styled_content, ::Sts::NisoSts::StyledContent, collection: true
+      attribute :editing_instruction, ::Sts::NisoSts::EditingInstruction,
+                collection: true
+      attribute :def_list, ::Sts::NisoSts::DefList, collection: true
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
+      attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
+      attribute :fn_group, ::Sts::NisoSts::FnGroup, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :ext_link, ::Sts::NisoSts::ExtLink, collection: true
+      attribute :inline_formula, ::Sts::NisoSts::InlineFormula, collection: true
+      attribute :disp_quote, ::Sts::NisoSts::DispQuote, collection: true
+      attribute :chem_struct_wrap, ::Sts::NisoSts::ChemStructWrap,
+                collection: true
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
 
       xml do
         element "sec"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "sec-type", to: :type
@@ -37,11 +56,27 @@ module Sts
         map_element "sec", to: :sec
         map_element "term-sec", to: :term_sec
         map_element "list", to: :list
-        map_element "figure", to: :figures
         map_element "fig", to: :fig
+        map_element "fig-group", to: :fig_group
         map_element "ref-list", to: :ref_list
         map_element "array", to: :array
         map_element "table-wrap", to: :table_wrap
+        map_element "boxed-text", to: :boxed_text
+        map_element "preformat", to: :preformat
+        map_element "disp-formula", to: :disp_formula
+        map_element "disp-formula-group", to: :disp_formula_group
+        map_element "styled-content", to: :styled_content
+        map_element "editing-instruction", to: :editing_instruction
+        map_element "def-list", to: :def_list
+        map_element "graphic", to: :graphic
+        map_element "std", to: :std
+        map_element "fn-group", to: :fn_group
+        map_element "xref", to: :xref
+        map_element "ext-link", to: :ext_link
+        map_element "inline-formula", to: :inline_formula
+        map_element "disp-quote", to: :disp_quote
+        map_element "chem-struct-wrap", to: :chem_struct_wrap
+        map_element "fn", to: :fn
         map_element "non-normative-note", to: :non_normative_note
         map_element "non-normative-example", to: :non_normative_example
       end

data/lib/sts/niso_sts/speech.rb

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

data/lib/sts/niso_sts/standard.rb

@@ -8,12 +8,14 @@ module Sts
       attribute :back, ::Sts::NisoSts::Back
       attribute :id, :string
       attribute :lang, Lutaml::Xml::W3c::XmlLangType
+      attribute :dtd_version, :string
       attribute :mml, :string
       attribute :tbx, :string
       attribute :xlink, :string
 
       xml do
         element "standard"
+        ordered
         namespace_scope [
           ::Sts::Namespaces::MathmlNamespace,
           ::Sts::Namespaces::TbxNamespace,
@@ -22,6 +24,7 @@ module Sts
 
         map_attribute "id", to: :id
         map_attribute "lang", to: :lang
+        map_attribute "dtd-version", to: :dtd_version
         map_element "front", to: :front
         map_element "body", to: :body
         map_element "back", to: :back

data/lib/sts/niso_sts/standard_identification.rb

@@ -13,7 +13,7 @@ module Sts
 
       xml do
         element "std-ident"
-        mixed_content
+        ordered
 
         map_element "originator", to: :originator
         map_element "doc-type", to: :doc_type

data/lib/sts/niso_sts/statement.rb

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

data/lib/sts/niso_sts/std_doc_meta.rb

@@ -21,6 +21,7 @@ module Sts
 
       xml do
         element "std-doc-meta"
+        ordered
 
         map_attribute "id", to: :id
 

data/lib/sts/niso_sts/std_org.rb

@@ -12,6 +12,7 @@ module Sts
 
       xml do
         element "std-org"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "std-org-type", to: :std_org_type

data/lib/sts/niso_sts/styled_content.rb

@@ -9,6 +9,25 @@ module Sts
       attribute :specific_use, :string
       attribute :lang, :string
       attribute :content, :string, collection: true
+      attribute :uri, ::Sts::NisoSts::Uri, 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 :sc, ::Sts::NisoSts::Sc, collection: true
+      attribute :monospace, ::Sts::NisoSts::Monospace, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :ext_link, ::Sts::NisoSts::ExtLink, collection: true
+      attribute :inline_formula, ::Sts::NisoSts::InlineFormula, collection: true
+      attribute :std, ::Sts::NisoSts::ReferenceStandard, collection: true
+      attribute :break, ::Sts::NisoSts::Break, collection: true
+      attribute :fn, ::Sts::NisoSts::Fn, collection: true
+      attribute :named_content, ::Sts::NisoSts::NamedContent, collection: true
+      attribute :target, ::Sts::NisoSts::Target, collection: true
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
+      attribute :styled_content, ::Sts::NisoSts::StyledContent, collection: true
+      attribute :underline, ::Sts::NisoSts::Underline, collection: true
+
       xml do
         element "styled-content"
         mixed_content
@@ -19,6 +38,24 @@ module Sts
         map_attribute "specific-use", to: :specific_use
         map_attribute "lang", to: :lang
         map_content to: :content
+        map_element "uri", to: :uri
+        map_element "bold", to: :bold
+        map_element "italic", to: :italic
+        map_element "sub", to: :sub
+        map_element "sup", to: :sup
+        map_element "sc", to: :sc
+        map_element "monospace", to: :monospace
+        map_element "xref", to: :xref
+        map_element "ext-link", to: :ext_link
+        map_element "inline-formula", to: :inline_formula
+        map_element "std", to: :std
+        map_element "break", to: :break
+        map_element "fn", to: :fn
+        map_element "named-content", to: :named_content
+        map_element "target", to: :target
+        map_element "graphic", to: :graphic
+        map_element "styled-content", to: :styled_content
+        map_element "underline", to: :underline
       end
     end
   end