sts 0.6.2 → 0.6.3

data/lib/sts/iso_sts/ext_link.rb

@@ -8,6 +8,11 @@ module Sts
       attribute :specific_use, :string
       attribute :xml_lang, :string
       attribute :xlink_href, :string
+      attribute :xlink_type, :string
+      attribute :xlink_role, :string
+      attribute :xlink_title, :string
+      attribute :xlink_show, :string
+      attribute :xlink_actuate, :string
       attribute :content, :string
       attribute :bold, ::Sts::IsoSts::Bold
       attribute :italic, ::Sts::IsoSts::Italic
@@ -21,6 +26,11 @@ module Sts
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
         map_attribute "xlink:href", to: :xlink_href
+        map_attribute "xlink:type", to: :xlink_type
+        map_attribute "xlink:role", to: :xlink_role
+        map_attribute "xlink:title", to: :xlink_title
+        map_attribute "xlink:show", to: :xlink_show
+        map_attribute "xlink:actuate", to: :xlink_actuate
 
         map_content to: :content
 

data/lib/sts/iso_sts/fpage.rb

@@ -8,6 +8,7 @@ module Sts
       attribute :seq, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
+      attribute :id, :string
 
       xml do
         element "fpage"
@@ -17,6 +18,7 @@ module Sts
         map_attribute "seq", to: :seq
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/graphic.rb

@@ -13,7 +13,12 @@ module Sts
       attribute :mime_subtype, :string
       attribute :xlink_href, :string
       attribute :xlink_type, :string
+      attribute :xlink_role, :string
+      attribute :xlink_title, :string
+      attribute :xlink_show, :string
+      attribute :xlink_actuate, :string
       attribute :graphic_type, :string
+      attribute :originator, :string
       attribute :label, ::Sts::IsoSts::Label
       attribute :caption, ::Sts::IsoSts::Caption
       attribute :alt_text, ::Sts::IsoSts::AltText
@@ -33,7 +38,12 @@ module Sts
         map_attribute "mime-subtype", to: :mime_subtype
         map_attribute "xlink:href", to: :xlink_href
         map_attribute "xlink:type", to: :xlink_type
+        map_attribute "xlink:role", to: :xlink_role
+        map_attribute "xlink:title", to: :xlink_title
+        map_attribute "xlink:show", to: :xlink_show
+        map_attribute "xlink:actuate", to: :xlink_actuate
         map_attribute "type", to: :graphic_type
+        map_attribute "originator", to: :originator
 
         map_element "label", to: :label
         map_element "caption", to: :caption

data/lib/sts/iso_sts/ics.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <ics> as type="xs:string" -- no attributes.
+    # ISOSTS declares <ics> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class Ics < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "ics"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/is_proof.rb

@@ -2,11 +2,16 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <is-proof> as an empty complexType: its presence is the
-    # whole signal -- no attributes, no content.
+    # ISOSTS declares <is-proof> as an empty complexType: its presence carries
+    # no content. The @id follows the NisoSts convention established in 86948b9,
+    # not ISOSTS itself.
     class IsProof < Lutaml::Model::Serializable
+      attribute :id, :string
+
       xml do
         element "is-proof"
+
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/issue.rb

@@ -8,6 +8,7 @@ module Sts
       attribute :seq, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
+      attribute :id, :string
 
       xml do
         element "issue"
@@ -17,6 +18,7 @@ module Sts
         map_attribute "seq", to: :seq
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/italic.rb

@@ -22,7 +22,7 @@ module Sts
       attribute :sc, ::Sts::IsoSts::Sc, collection: true
       attribute :strike, ::Sts::IsoSts::Strike, collection: true
       attribute :underline, ::Sts::IsoSts::Underline, collection: true
-      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :fn, ::Sts::IsoSts::Fn, collection: true
 
       xml do
         element "italic"

data/lib/sts/iso_sts/label.rb

@@ -4,6 +4,8 @@ module Sts
   module IsoSts
     class Label < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :alt, :string
+      attribute :xml_lang, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::IsoSts::Bold
       attribute :italic, ::Sts::IsoSts::Italic
@@ -19,6 +21,8 @@ module Sts
       xml do
         element "label"
         map_attribute "id", to: :id
+        map_attribute "alt", to: :alt
+        map_attribute "xml:lang", to: :xml_lang
         mixed_content
 
         map_content to: :content

data/lib/sts/iso_sts/lpage.rb

@@ -7,6 +7,7 @@ module Sts
       attribute :content_type, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
+      attribute :id, :string
 
       xml do
         element "lpage"
@@ -15,6 +16,7 @@ module Sts
         map_attribute "content-type", to: :content_type
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/mixed_citation.rb

@@ -9,6 +9,12 @@ module Sts
       attribute :publication_format, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
+      attribute :xlink_type, :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::IsoSts::Bold, collection: true
       attribute :italic, ::Sts::IsoSts::Italic, collection: true
@@ -19,7 +25,7 @@ module Sts
       attribute :uri, ::Sts::IsoSts::Uri, collection: true
       attribute :named_content, ::Sts::IsoSts::NamedContent, collection: true
       attribute :styled_content, ::Sts::IsoSts::StyledContent, collection: true
-      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :fn, ::Sts::IsoSts::Fn, collection: true
       attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
       attribute :break, ::Sts::IsoSts::Break, collection: true
       attribute :person_group, ::Sts::NisoSts::PersonGroup, collection: true
@@ -35,7 +41,7 @@ module Sts
       attribute :publisher, ::Sts::NisoSts::Publisher
       attribute :pub_id, ::Sts::IsoSts::PubId, collection: true
 
-      xml do
+      xml do # rubocop:disable Metrics/BlockLength
         element "mixed-citation"
         mixed_content
 
@@ -45,6 +51,12 @@ module Sts
         map_attribute "publication-format", to: :publication_format
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
+        map_attribute "xlink:type", to: :xlink_type
+        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
 

data/lib/sts/iso_sts/named_content.rb

@@ -9,6 +9,7 @@ module Sts
       attribute :specific_use, :string
       attribute :xml_lang, :string
       attribute :xlink_href, :string
+      attribute :xlink_type, :string
       attribute :xlink_role, :string
       attribute :xlink_title, :string
       attribute :xlink_show, :string
@@ -29,6 +30,7 @@ module Sts
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
         map_attribute "xlink:href", to: :xlink_href
+        map_attribute "xlink:type", to: :xlink_type
         map_attribute "xlink:role", to: :xlink_role
         map_attribute "xlink:title", to: :xlink_title
         map_attribute "xlink:show", to: :xlink_show

data/lib/sts/iso_sts/originator.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <originator> as type="xs:string" -- no attributes.
+    # ISOSTS declares <originator> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class Originator < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "originator"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/page_range.rb

@@ -7,6 +7,7 @@ module Sts
       attribute :content_type, :string
       attribute :specific_use, :string
       attribute :xml_lang, :string
+      attribute :id, :string
 
       xml do
         element "page-range"
@@ -15,6 +16,7 @@ module Sts
         map_attribute "content-type", to: :content_type
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/paragraph.rb

@@ -24,7 +24,7 @@ module Sts
                 collection: true
       attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample,
                 collection: true
-      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :fn, ::Sts::IsoSts::Fn, collection: true
       attribute :styled_content, ::Sts::IsoSts::StyledContent, collection: true
       attribute :graphic, ::Sts::IsoSts::Graphic, collection: true
       attribute :math, Mml::V2::Math, collection: true

data/lib/sts/iso_sts/part_number.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <part-number> as type="xs:string" -- no attributes.
+    # ISOSTS declares <part-number> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class PartNumber < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "part-number"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/proj_id.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <proj-id> as type="xs:string" -- no attributes.
+    # ISOSTS declares <proj-id> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class ProjId < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "proj-id"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/pub_date.rb

@@ -5,12 +5,14 @@ module Sts
     class PubDate < Lutaml::Model::Serializable
       attribute :content, :string
       attribute :pub_type, :string
+      attribute :id, :string
 
       xml do
         element "pub-date"
 
         map_content to: :content
         map_attribute "pub-type", to: :pub_type
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/pub_id.rb

@@ -6,6 +6,7 @@ module Sts
       attribute :content, :string
       attribute :pub_id_type, :string
       attribute :specific_use, :string
+      attribute :id, :string
 
       xml do
         element "pub-id"
@@ -13,6 +14,7 @@ module Sts
         map_content to: :content
         map_attribute "pub-id-type", to: :pub_id_type
         map_attribute "specific-use", to: :specific_use
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/release_version.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <release-version> as type="xs:string" -- no attributes.
+    # ISOSTS declares <release-version> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class ReleaseVersion < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "release-version"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/sdo.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <sdo> as type="xs:string" -- no attributes.
+    # ISOSTS declares <sdo> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class Sdo < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "sdo"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/sec.rb

@@ -34,7 +34,7 @@ module Sts
       attribute :sec, ::Sts::IsoSts::Sec, collection: true
       attribute :term_sec, ::Sts::IsoSts::TermSec, collection: true
       attribute :disp_quote, ::Sts::NisoSts::DispQuote, collection: true
-      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :fn, ::Sts::IsoSts::Fn, collection: true
       attribute :editing_instruction, ::Sts::NisoSts::EditingInstruction,
                 collection: true
       attribute :boxed_text, ::Sts::NisoSts::BoxedText, collection: true
@@ -44,7 +44,7 @@ module Sts
         ordered
 
         map_attribute "id", to: :id
-        map_attribute "lang", to: :xml_lang
+        map_attribute "xml:lang", to: :xml_lang
         map_attribute "sec-type", to: :sec_type
         map_attribute "specific-use", to: :specific_use
         map_attribute "originator", to: :originator

data/lib/sts/iso_sts/secretariat.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <secretariat> as type="xs:string" -- no attributes.
+    # ISOSTS declares <secretariat> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class Secretariat < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "secretariat"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/standard.rb

@@ -4,7 +4,7 @@ module Sts
   module IsoSts
     class Standard < Lutaml::Model::Serializable
       attribute :id, :string
-      attribute :lang, :string
+      attribute :xml_lang, :string
       attribute :dtd_version, :string
       attribute :specific_use, :string
       attribute :front, ::Sts::IsoSts::Front
@@ -21,7 +21,7 @@ module Sts
           ::Lutaml::Xml::W3c::XlinkNamespace,
         ]
         map_attribute "id", to: :id
-        map_attribute "lang", to: :lang
+        map_attribute "xml:lang", to: :xml_lang
         map_attribute "dtd-version", to: :dtd_version
         map_attribute "specific-use", to: :specific_use
 

data/lib/sts/iso_sts/std.rb

@@ -11,7 +11,7 @@ module Sts
       attribute :xml_lang, :string
       attribute :std_ref, ::Sts::IsoSts::StdRef, collection: true
       attribute :title, ::Sts::IsoSts::Title
-      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :fn, ::Sts::IsoSts::Fn, collection: true
       attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
       attribute :bold, ::Sts::IsoSts::Bold, collection: true
       attribute :italic, ::Sts::IsoSts::Italic, collection: true

data/lib/sts/iso_sts/sub.rb

@@ -4,10 +4,14 @@ module Sts
   module IsoSts
     class Sub < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :arrange, :string
+      attribute :specific_use, :string
       attribute :content, :string, collection: true
       xml do
         element "sub"
         map_attribute "id", to: :id
+        map_attribute "arrange", to: :arrange
+        map_attribute "specific-use", to: :specific_use
         mixed_content
 
         map_content to: :content

data/lib/sts/iso_sts/sup.rb

@@ -4,10 +4,14 @@ module Sts
   module IsoSts
     class Sup < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :arrange, :string
+      attribute :specific_use, :string
       attribute :content, :string, collection: true
       xml do
         element "sup"
         map_attribute "id", to: :id
+        map_attribute "arrange", to: :arrange
+        map_attribute "specific-use", to: :specific_use
         mixed_content
 
         map_content to: :content

data/lib/sts/iso_sts/suppl_number.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <suppl-number> as type="xs:string" -- no attributes.
+    # ISOSTS declares <suppl-number> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class SupplNumber < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "suppl-number"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/suppl_type.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <suppl-type> as type="xs:string" -- no attributes.
+    # ISOSTS declares <suppl-type> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class SupplType < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "suppl-type"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/suppl_version.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <suppl-version> as type="xs:string" -- no attributes.
+    # ISOSTS declares <suppl-version> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class SupplVersion < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "suppl-version"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end

data/lib/sts/iso_sts/td.rb

@@ -25,7 +25,7 @@ module Sts
       attribute :def_list, ::Sts::IsoSts::DefList, collection: true
       attribute :math, Mml::V2::Math, collection: true
       attribute :std, ::Sts::IsoSts::Std, collection: true
-      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :fn, ::Sts::IsoSts::Fn, collection: true
       attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
       attribute :bold, ::Sts::IsoSts::Bold, collection: true
       attribute :italic, ::Sts::IsoSts::Italic, collection: true

data/lib/sts/iso_sts/term_sec.rb

@@ -27,7 +27,7 @@ module Sts
         ordered
 
         map_attribute "id", to: :id
-        map_attribute "lang", to: :xml_lang
+        map_attribute "xml:lang", to: :xml_lang
         map_attribute "sec-type", to: :sec_type
         map_attribute "specific-use", to: :specific_use
         map_attribute "originator", to: :originator

data/lib/sts/iso_sts/th.rb

@@ -25,7 +25,7 @@ module Sts
       attribute :def_list, ::Sts::IsoSts::DefList, collection: true
       attribute :math, Mml::V2::Math, collection: true
       attribute :std, ::Sts::IsoSts::Std, collection: true
-      attribute :fn, ::Sts::TbxIsoTml::Fn, collection: true
+      attribute :fn, ::Sts::IsoSts::Fn, collection: true
       attribute :xref, ::Sts::TbxIsoTml::Xref, collection: true
       attribute :bold, ::Sts::IsoSts::Bold, collection: true
       attribute :italic, ::Sts::IsoSts::Italic, collection: true

data/lib/sts/iso_sts/title.rb

@@ -4,6 +4,8 @@ module Sts
   module IsoSts
     class Title < Lutaml::Model::Serializable
       attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::IsoSts::Bold, collection: true
       attribute :italic, ::Sts::IsoSts::Italic, collection: true
@@ -20,6 +22,8 @@ module Sts
       xml do
         element "title"
         map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
+        map_attribute "specific-use", to: :specific_use
         mixed_content
 
         map_content to: :content

data/lib/sts/iso_sts/underline.rb

@@ -3,6 +3,7 @@
 module Sts
   module IsoSts
     class Underline < Lutaml::Model::Serializable
+      attribute :underline_style, :string
       attribute :specific_use, :string
       attribute :content, :string, collection: true
       attribute :bold, ::Sts::IsoSts::Bold, collection: true
@@ -14,6 +15,7 @@ module Sts
         element "underline"
         mixed_content
 
+        map_attribute "underline-style", to: :underline_style
         map_attribute "specific-use", to: :specific_use
         map_content to: :content
         map_element "bold", to: :bold

data/lib/sts/iso_sts/uri.rb

@@ -7,6 +7,7 @@ module Sts
       attribute :specific_use, :string
       attribute :xml_lang, :string
       attribute :xlink_href, :string
+      attribute :xlink_type, :string
       attribute :xlink_role, :string
       attribute :xlink_title, :string
       attribute :xlink_show, :string
@@ -21,6 +22,7 @@ module Sts
         map_attribute "specific-use", to: :specific_use
         map_attribute "xml:lang", to: :xml_lang
         map_attribute "xlink:href", to: :xlink_href
+        map_attribute "xlink:type", to: :xlink_type
         map_attribute "xlink:role", to: :xlink_role
         map_attribute "xlink:title", to: :xlink_title
         map_attribute "xlink:show", to: :xlink_show

data/lib/sts/iso_sts/urn.rb

@@ -2,14 +2,17 @@
 
 module Sts
   module IsoSts
-    # ISOSTS declares <urn> as type="xs:string" -- no attributes.
+    # ISOSTS declares <urn> as type="xs:string". The @id follows the
+    # NisoSts convention established in 86948b9, not ISOSTS itself.
     class Urn < Lutaml::Model::Serializable
       attribute :content, :string
+      attribute :id, :string
 
       xml do
         element "urn"
 
         map_content to: :content
+        map_attribute "id", to: :id
       end
     end
   end