sts 0.5.2 → 0.5.3

data/lib/sts/iso_sts/table_wrap_foot.rb

@@ -14,6 +14,7 @@ module Sts
 
       xml do
         element "table-wrap-foot"
+        ordered
 
         map_element "title", to: :title
         map_element "p", to: :paragraph

data/lib/sts/iso_sts/td.rb

@@ -18,20 +18,30 @@ module Sts
       attribute :valign, :string
       attribute :content, :string, collection: true
       attribute :paragraph, ::Sts::IsoSts::Paragraph, collection: true
-      attribute :fig, ::Sts::IsoSts::Fig
-      attribute :graphic, ::Sts::IsoSts::Graphic
-      attribute :disp_formula, ::Sts::IsoSts::DispFormula
-      attribute :list, ::Sts::IsoSts::List
-      attribute :def_list, ::Sts::IsoSts::DefList
-      attribute :math, ::Sts::IsoSts::Mathml2::Math
-      attribute :std, ::Sts::IsoSts::Std
-      attribute :fn, ::Sts::TbxIsoTml::Fn
-      attribute :xref, ::Sts::TbxIsoTml::Xref
-      attribute :bold, ::Sts::IsoSts::Bold
-      attribute :italic, ::Sts::IsoSts::Italic
-      attribute :non_normative_note, ::Sts::IsoSts::NonNormativeNote
-      attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample
-      attribute :styled_content, ::Sts::IsoSts::StyledContent
+      attribute :fig, ::Sts::IsoSts::Fig, collection: true
+      attribute :graphic, ::Sts::IsoSts::Graphic, collection: true
+      attribute :disp_formula, ::Sts::IsoSts::DispFormula, collection: true
+      attribute :list, ::Sts::IsoSts::List, collection: true
+      attribute :def_list, ::Sts::IsoSts::DefList, collection: true
+      attribute :math, Mml::V3::Math, collection: true
+      attribute :std, ::Sts::IsoSts::Std, collection: true
+      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :bold, ::Sts::IsoSts::Bold, collection: true
+      attribute :italic, ::Sts::IsoSts::Italic, collection: true
+      attribute :non_normative_note, ::Sts::IsoSts::NonNormativeNote,
+                collection: true
+      attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample,
+                collection: true
+      attribute :styled_content, ::Sts::IsoSts::StyledContent, collection: true
+      attribute :brk, ::Sts::IsoSts::Break, collection: true
+      attribute :underline, ::Sts::NisoSts::Underline, 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 :monospace, ::Sts::NisoSts::Monospace, collection: true
+      attribute :sc, ::Sts::NisoSts::Sc, collection: true
+      attribute :strike, ::Sts::NisoSts::Strike, collection: true
 
       xml do # rubocop:disable Metrics/BlockLength
         element "td"
@@ -68,6 +78,14 @@ module Sts
         map_element "non-normative-note", to: :non_normative_note
         map_element "non-normative-example", to: :non_normative_example
         map_element "styled-content", to: :styled_content
+        map_element "break", to: :brk
+        map_element "underline", to: :underline
+        map_element "sub", to: :sub
+        map_element "sup", to: :sup
+        map_element "ext-link", to: :ext_link
+        map_element "monospace", to: :monospace
+        map_element "sc", to: :sc
+        map_element "strike", to: :strike
       end
     end
   end

data/lib/sts/iso_sts/term.rb

@@ -17,7 +17,7 @@ module Sts
       attribute :uri, ::Sts::NisoSts::Uri
       attribute :named_content, ::Sts::NisoSts::NamedContent
       attribute :styled_content, ::Sts::IsoSts::StyledContent
-      attribute :math, ::Sts::IsoSts::Mathml2::Math
+      attribute :math, Mml::V3::Math
 
       xml do
         element "term"

data/lib/sts/iso_sts/term_sec.rb

@@ -24,6 +24,7 @@ module Sts
 
       xml do
         element "term-sec"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "lang", to: :xml_lang

data/lib/sts/iso_sts/th.rb

@@ -18,20 +18,30 @@ module Sts
       attribute :valign, :string
       attribute :content, :string, collection: true
       attribute :paragraph, ::Sts::IsoSts::Paragraph, collection: true
-      attribute :fig, ::Sts::IsoSts::Fig
-      attribute :graphic, ::Sts::IsoSts::Graphic
-      attribute :disp_formula, ::Sts::IsoSts::DispFormula
-      attribute :list, ::Sts::IsoSts::List
-      attribute :def_list, ::Sts::IsoSts::DefList
-      attribute :math, ::Sts::IsoSts::Mathml2::Math
-      attribute :std, ::Sts::IsoSts::Std
-      attribute :fn, ::Sts::TbxIsoTml::Fn
-      attribute :xref, ::Sts::TbxIsoTml::Xref
-      attribute :bold, ::Sts::IsoSts::Bold
-      attribute :italic, ::Sts::IsoSts::Italic
-      attribute :non_normative_note, ::Sts::IsoSts::NonNormativeNote
-      attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample
-      attribute :styled_content, ::Sts::IsoSts::StyledContent
+      attribute :fig, ::Sts::IsoSts::Fig, collection: true
+      attribute :graphic, ::Sts::IsoSts::Graphic, collection: true
+      attribute :disp_formula, ::Sts::IsoSts::DispFormula, collection: true
+      attribute :list, ::Sts::IsoSts::List, collection: true
+      attribute :def_list, ::Sts::IsoSts::DefList, collection: true
+      attribute :math, Mml::V3::Math, collection: true
+      attribute :std, ::Sts::IsoSts::Std, collection: true
+      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :bold, ::Sts::IsoSts::Bold, collection: true
+      attribute :italic, ::Sts::IsoSts::Italic, collection: true
+      attribute :non_normative_note, ::Sts::IsoSts::NonNormativeNote,
+                collection: true
+      attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample,
+                collection: true
+      attribute :styled_content, ::Sts::IsoSts::StyledContent, collection: true
+      attribute :brk, ::Sts::IsoSts::Break, collection: true
+      attribute :underline, ::Sts::NisoSts::Underline, 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 :monospace, ::Sts::NisoSts::Monospace, collection: true
+      attribute :sc, ::Sts::NisoSts::Sc, collection: true
+      attribute :strike, ::Sts::NisoSts::Strike, collection: true
 
       xml do # rubocop:disable Metrics/BlockLength
         element "th"
@@ -68,6 +78,14 @@ module Sts
         map_element "non-normative-note", to: :non_normative_note
         map_element "non-normative-example", to: :non_normative_example
         map_element "styled-content", to: :styled_content
+        map_element "break", to: :brk
+        map_element "underline", to: :underline
+        map_element "sub", to: :sub
+        map_element "sup", to: :sup
+        map_element "ext-link", to: :ext_link
+        map_element "monospace", to: :monospace
+        map_element "sc", to: :sc
+        map_element "strike", to: :strike
       end
     end
   end

data/lib/sts/iso_sts/title.rb

@@ -4,13 +4,17 @@ module Sts
   module IsoSts
     class Title < Lutaml::Model::Serializable
       attribute :content, :string, collection: true
-      attribute :bold, ::Sts::IsoSts::Bold
-      attribute :italic, ::Sts::IsoSts::Italic
-      attribute :sub, ::Sts::NisoSts::Sub
-      attribute :sup, ::Sts::NisoSts::Sup
-      attribute :xref, ::Sts::TbxIsoTml::Xref
-      attribute :break, ::Sts::IsoSts::Break
-      attribute :styled_content, ::Sts::IsoSts::StyledContent
+      attribute :bold, ::Sts::IsoSts::Bold, collection: true
+      attribute :italic, ::Sts::IsoSts::Italic, collection: true
+      attribute :sub, ::Sts::NisoSts::Sub, collection: true
+      attribute :sup, ::Sts::NisoSts::Sup, collection: true
+      attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
+      attribute :break, ::Sts::IsoSts::Break, collection: true
+      attribute :styled_content, ::Sts::IsoSts::StyledContent, collection: true
+      attribute :monospace, ::Sts::NisoSts::Monospace, collection: true
+      attribute :sc, ::Sts::NisoSts::Sc, collection: true
+      attribute :inline_formula, ::Sts::IsoSts::InlineFormula, collection: true
+      attribute :std, ::Sts::IsoSts::Std, collection: true
 
       xml do
         element "title"
@@ -24,6 +28,10 @@ module Sts
         map_element "xref", to: :xref
         map_element "break", to: :break
         map_element "styled-content", to: :styled_content
+        map_element "monospace", to: :monospace
+        map_element "sc", to: :sc
+        map_element "inline-formula", to: :inline_formula
+        map_element "std", to: :std
       end
     end
   end

data/lib/sts/iso_sts/title_wrap.rb

@@ -12,6 +12,7 @@ module Sts
 
       xml do
         element "title-wrap"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "xml:lang", to: :xml_lang

data/lib/sts/iso_sts/tr.rb

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

data/lib/sts/iso_sts.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "mml"
+
 module Sts
   module IsoSts
     autoload :Standard, "#{__dir__}/iso_sts/standard"

data/lib/sts/{niso_sts/mathml.rb → mathml.rb}

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
+require "mml"
 
 module Sts
   module Mathml
     class Math < Lutaml::Model::Serializable
-      # Delegate to Mml::V3::Math for actual MathML handling
       attribute :id, :string
       attribute :display, :string
       attribute :math, Mml::V3::Math
@@ -38,7 +38,6 @@ module Sts
         math.display = value if math
       end
 
-      # Forward missing methods to the underlying math object
       def method_missing(method_name, *args, &block)
         if math.respond_to?(method_name)
           math.send(method_name, *args, &block)
@@ -56,7 +55,6 @@ module Sts
       end
 
       def self.from_xml(input)
-        # Parse the inner math element and wrap it
         parsed = Mml::V3::Math.from_xml(input)
         math = new
         math.instance_variable_set(:@math, parsed)

data/lib/sts/namespaces.rb

@@ -7,6 +7,7 @@ module Sts
 
     class TbxNamespace < Lutaml::Xml::Namespace
       uri "urn:iso:std:iso:30042:ed-1"
+      uri_aliases "urn:iso:std:iso:30042:ed-2"
       prefix_default "tbx"
     end
   end

data/lib/sts/niso_sts/abstract.rb

@@ -11,6 +11,7 @@ module Sts
 
       xml do
         element "abstract"
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "abstract-type", to: :abstract_type

data/lib/sts/niso_sts/ack.rb

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

data/lib/sts/niso_sts/address.rb

@@ -14,6 +14,7 @@ module Sts
 
       xml do
         element "address"
+        ordered
 
         map_element "addr-line", to: :addr_line
         map_element "city", to: :city

data/lib/sts/niso_sts/adoption.rb

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

data/lib/sts/niso_sts/adoption_front.rb

@@ -5,6 +5,7 @@ module Sts
     class AdoptionFront < Front
       xml do
         element "adoption-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/alternatives.rb

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

data/lib/sts/niso_sts/annotation.rb

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

data/lib/sts/niso_sts/app.rb

@@ -14,11 +14,18 @@ module Sts
       attribute :ref_list, ::Sts::NisoSts::ReferenceList, collection: true
       attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote,
                 collection: true
+      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample,
+                collection: true
       attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :array, ::Sts::NisoSts::SectionArray, collection: true
+      attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
+      attribute :boxed_text, ::Sts::NisoSts::BoxedText, collection: true
+      attribute :graphic, ::Sts::NisoSts::Graphic, collection: true
 
       xml do
         element "app"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type
@@ -31,7 +38,13 @@ module Sts
         map_element "p", to: :paragraph
         map_element "ref-list", to: :ref_list
         map_element "non-normative-note", to: :non_normative_note
+        map_element "non-normative-example", to: :non_normative_example
         map_element "table-wrap", to: :table_wrap
+        map_element "list", to: :list
+        map_element "array", to: :array
+        map_element "preformat", to: :preformat
+        map_element "boxed-text", to: :boxed_text
+        map_element "graphic", to: :graphic
       end
     end
   end

data/lib/sts/niso_sts/app_group.rb

@@ -3,11 +3,16 @@
 module Sts
   module NisoSts
     class AppGroup < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
       attribute :app, Sts::NisoSts::App, collection: true
 
       xml do
         element "app-group"
+        ordered
 
+        map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
         map_element "app", to: :app
       end
     end

data/lib/sts/niso_sts/author_comment.rb

@@ -7,16 +7,14 @@ module Sts
       attribute :content_type, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
-      attribute :content, :string, collection: true
       xml do
         element "author-comment"
-        mixed_content
+        ordered
 
         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
       end
     end
   end

data/lib/sts/niso_sts/author_notes.rb

@@ -14,7 +14,7 @@ module Sts
 
       xml do
         element "author-notes"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "xml:lang", to: :xml_lang

data/lib/sts/niso_sts/award_group.rb

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

data/lib/sts/niso_sts/back.rb

@@ -3,13 +3,14 @@
 module Sts
   module NisoSts
     class Back < Lutaml::Model::Serializable
-      attribute :ref_list, ::Sts::NisoSts::ReferenceList
-      attribute :app_group, ::Sts::NisoSts::AppGroup
-      attribute :sec, ::Sts::NisoSts::Section
-      attribute :fn_group, ::Sts::NisoSts::FnGroup
+      attribute :ref_list, ::Sts::NisoSts::ReferenceList, collection: true
+      attribute :app_group, ::Sts::NisoSts::AppGroup, collection: true
+      attribute :sec, ::Sts::NisoSts::Section, collection: true
+      attribute :fn_group, ::Sts::NisoSts::FnGroup, collection: true
 
       xml do
         element "back"
+        ordered
 
         map_element "ref-list", to: :ref_list
         map_element "app-group", to: :app_group

data/lib/sts/niso_sts/bio.rb

@@ -4,17 +4,15 @@ module Sts
   module NisoSts
     class Bio < 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
       attribute :paragraph, ::Sts::NisoSts::Paragraph, collection: true
 
       xml do
         element "bio"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
-        map_content to: :content
         map_element "bold", to: :bold
         map_element "italic", to: :italic
         map_element "p", to: :paragraph

data/lib/sts/niso_sts/body.rb

@@ -4,10 +4,46 @@ module Sts
   module NisoSts
     class Body < Lutaml::Model::Serializable
       attribute :sec, ::Sts::NisoSts::Section, collection: true
+      attribute :term_sec, ::Sts::NisoSts::TermSection, collection: true
+      attribute :paragraph, ::Sts::NisoSts::Paragraph, collection: true
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :def_list, ::Sts::NisoSts::DefList, collection: true
+      attribute :table_wrap, ::Sts::TbxIsoTml::TableWrap, collection: true
+      attribute :fig, ::Sts::NisoSts::Figure, collection: true
+      attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote,
+                collection: true
+      attribute :non_normative_example, ::Sts::NisoSts::NonNormativeExample,
+                collection: true
+      attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
+      attribute :styled_content, ::Sts::NisoSts::StyledContent, collection: true
+      attribute :array, ::Sts::NisoSts::SectionArray, collection: true
+      attribute :disp_formula, ::Sts::NisoSts::DisplayFormula, collection: true
+      attribute :disp_formula_group, ::Sts::NisoSts::DispFormulaGroup,
+                collection: true
+      attribute :editing_instruction, ::Sts::NisoSts::EditingInstruction,
+                collection: true
+      attribute :disp_quote, ::Sts::NisoSts::DispQuote, collection: true
 
       xml do
         element "body"
+        ordered
+
         map_element "sec", to: :sec
+        map_element "term-sec", to: :term_sec
+        map_element "p", to: :paragraph
+        map_element "list", to: :list
+        map_element "def-list", to: :def_list
+        map_element "table-wrap", to: :table_wrap
+        map_element "fig", to: :fig
+        map_element "non-normative-note", to: :non_normative_note
+        map_element "non-normative-example", to: :non_normative_example
+        map_element "preformat", to: :preformat
+        map_element "styled-content", to: :styled_content
+        map_element "array", to: :array
+        map_element "disp-formula", to: :disp_formula
+        map_element "disp-formula-group", to: :disp_formula_group
+        map_element "editing-instruction", to: :editing_instruction
+        map_element "disp-quote", to: :disp_quote
       end
     end
   end

data/lib/sts/niso_sts/boxed_text.rb

@@ -11,10 +11,12 @@ module Sts
       attribute :caption, ::Sts::NisoSts::Caption
       attribute :label, ::Sts::NisoSts::Label
       attribute :paragraphs, ::Sts::NisoSts::Paragraph, collection: true
+      attribute :preformat, ::Sts::NisoSts::Preformat, collection: true
+      attribute :list, ::Sts::NisoSts::List, collection: true
 
       xml do
         element "boxed-text"
-        mixed_content
+        ordered
 
         map_attribute "id", to: :id
         map_attribute "content-type", to: :content_type
@@ -25,6 +27,8 @@ module Sts
         map_element "caption", to: :caption
         map_element "label", to: :label
         map_element "p", to: :paragraphs
+        map_element "preformat", to: :preformat
+        map_element "list", to: :list
       end
     end
   end

data/lib/sts/niso_sts/break.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Sts
+  module NisoSts
+    class Break < Lutaml::Model::Serializable
+      xml do
+        element "break"
+      end
+    end
+  end
+end

data/lib/sts/niso_sts/caption.rb

@@ -29,14 +29,20 @@ module Sts
       attribute :paragraphs, ::Sts::NisoSts::Paragraph, collection: true
       attribute :non_normative_note, ::Sts::NisoSts::NonNormativeNote,
                 collection: true
+      attribute :label, ::Sts::NisoSts::Label
+      attribute :list, ::Sts::NisoSts::List, collection: true
+      attribute :def_list, ::Sts::NisoSts::DefList, collection: true
 
       xml do
         element "caption"
-        mixed_content
+        ordered
 
         map_element "p", to: :paragraphs
         map_element "non-normative-note", to: :non_normative_note
         map_element "title", to: :title
+        map_element "label", to: :label
+        map_element "list", to: :list
+        map_element "def-list", to: :def_list
       end
     end
   end

data/lib/sts/niso_sts/chem_struct_wrap.rb

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

data/lib/sts/niso_sts/citation_alternatives.rb

@@ -9,6 +9,7 @@ module Sts
 
       xml do
         element "citation-alternatives"
+        ordered
 
         map_element "mixed-citation", to: :mixed_citation
         map_element "element-citation", to: :element_citation

data/lib/sts/niso_sts/collab.rb

@@ -10,6 +10,10 @@ module Sts
       attribute :id, :string
       attribute :collab_alternatives, ::Sts::NisoSts::CollabAlternatives
       attribute :on_behalf_of, :string
+      attribute :sc, ::Sts::NisoSts::Sc, collection: true
+      attribute :bold, ::Sts::TbxIsoTml::Bold, collection: true
+      attribute :italic, ::Sts::TbxIsoTml::Italic, collection: true
+      attribute :underline, ::Sts::NisoSts::Underline, collection: true
 
       xml do
         element "collab"
@@ -21,6 +25,10 @@ module Sts
         map_attribute "id", to: :id
         map_element "collab-alternatives", to: :collab_alternatives
         map_element "on-behalf-of", to: :on_behalf_of
+        map_element "sc", to: :sc
+        map_element "bold", to: :bold
+        map_element "italic", to: :italic
+        map_element "underline", to: :underline
         map_content to: :content
       end
     end

data/lib/sts/niso_sts/conference.rb

@@ -14,6 +14,7 @@ module Sts
 
       xml do
         element "conference"
+        ordered
 
         map_element "conf-date", to: :conf_date
         map_element "conf-name", to: :conf_name