sts 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27e3b4850a13bbff3b16e63ad2293589079e4c29b4f25d2fa120a797b9f6ff7c
-  data.tar.gz: 572e19d6b4e428dca7a277d836f73b6121627d094fd1d0e492ef0ba4b82b905c
+  metadata.gz: c758f04c86a04df1adb4bc66d09aac7f31477d8ce6879bb9cd8935d86a7ae616
+  data.tar.gz: 56893d54b3e2193926f95a8a988d0a12dc73b31a85d9223e90edfe46adf80b07
 SHA512:
-  metadata.gz: ab688a012341d43a0daa2a2b79d7e68b7e2b10a9e4ee4f30824d357e1c3329721ccfe6fe071e331265ca79de26dc6d9deb54ad269519bc1a6e164f38d76bbd41
-  data.tar.gz: 1cd96829661efa371b501e25dac9f56e5aeb9b6ba3cac72c5de47e1b6d6377c2193eaf29842c36ae68a70321796ceb06079671df81ed848d2805c66256aed3e4
+  metadata.gz: e2444f3c73074bd001445a89a5712854e112b429180b7a96feff1e01e303dfd5791a7ab6e81eb27498ba859078a8a647793a8e40276ec6e2cab2d90c9b7a4517
+  data.tar.gz: d3b0d7c1ba7721b108ae509b5847e1a21917d4cc5507581d7581af2d71a0f742d16b316fc53a3d8c263b11816ee074a6b5a17547b9773dd3f99e472959db9069

data/TODO.sts-refactor/00-overview.md

@@ -19,7 +19,7 @@
 |---|------|----------|----------|--------------|
 | 01 | `01-mathml-delegation.md` | Anti-Pattern Fix | DONE | — |
 | 02 | `02-type-resolution.md` | Anti-Pattern Fix | DONE | — |
-| 03 | `03-namespace-coupling.md` | Architecture | IN PROGRESS (63→20 refs) | 01, 02 |
+| 03 | `03-namespace-coupling.md` | Architecture | IN PROGRESS (63→16 refs) | 01, 02 |
 | 04 | `04-register-versioning.md` | Architecture | HIGH | 01, 02 |
 | 05 | `05-missing-elements.md` | Feature Gap | MOSTLY DONE | 04 |
 | 06 | `06-missing-attributes.md` | Feature Gap | DONE | 04 |
@@ -166,7 +166,7 @@ grep -r "method_missing|respond_to_missing|Object.const_get|\.send" lib/
 - ~~Expand StringName usage (in contrib, element-citation, related-article — NISO STS 1.2)~~ → DONE: added to name-alternatives; already in person-group and mixed-citation
 
 ### Architectural Items (High Effort)
-- `03-namespace-coupling.md` — IN PROGRESS: 63→20 IsoSts→NisoSts references
+- `03-namespace-coupling.md` — IN PROGRESS: 63→16 IsoSts→NisoSts references
   remaining (issue #40). ISOSTS.xsd governs content models and all non-`@id`
   attributes; the `@id` follows the 86948b9 convention.
 - `04-register-versioning.md` — Version the models via lutaml-model Registers
@@ -193,9 +193,12 @@ the **NISO** XSD and applied the result to IsoSts.
 
 ## Next Action
 Two independent tracks:
-1. Finish `03` — the 20 remaining refs split into 11 deep-root refs (each
-   reaching a ~152-class recursive core) and 9 child-bearing refs whose closure
-   is unmeasured. Both need sizing before planning.
+1. Finish `03` — the 16 remaining refs split evenly between seven recursive
+   roots and five child-bearing roots. The first 15 high-reuse dependency
+   leaves are now modelled, reducing the unresolved closures to 78–84
+   not-yet-modelled ISOSTS elements before existing IsoSts boundaries. The
+   remaining work still needs an architecture decision for the recursive
+   content core.
 2. The remaining schema-conformance follow-up above — the 7 spurious attributes
    on 5 models and the 6 classes without `@id`. (The dropped-attribute data loss
    is now fixed.)

data/TODO.sts-refactor/03-namespace-coupling.md

@@ -3,7 +3,7 @@
 **Priority**: HIGH
 **Category**: Architecture
 **Estimated Effort**: High
-**Status**: Partially done — 63 → 20 references (GitHub issue #40)
+**Status**: Partially done — 63 → 16 references (GitHub issue #40)
 
 ## Problem
 
@@ -12,7 +12,7 @@ independent of NisoSts (ADR 2026-05-07): ISOSTS is frozen legacy, NISO STS
 evolves, so coupling them violates OCP.
 
 PR #31 reduced this from 157 to 63 references. Issue #40 reduced it further,
-from 63 to 20.
+from 63 to 16.
 
 ## Content models from ISOSTS.xsd; `@id` from the 86948b9 convention
 
@@ -40,7 +40,7 @@ Non-`@id` attribute lists must be **generated** from the XSD, never hand-read:
 `version` on `tex-math` and `specific-use` on `pub-id` sit after long
 `xs:enumeration` blocks and are invisible to a truncated read.
 
-## Done in issue #40 — 43 refs removed, 27 classes added
+## Done in issue #40 — 47 refs removed, 46 classes added
 
 - **14 `xs:string` elements** (`originator`, `doc-type`, `doc-number`,
   `part-number`, `version`, `suppl-type`, `suppl-number`, `suppl-version`,
@@ -56,6 +56,19 @@ Non-`@id` attribute lists must be **generated** from the XSD, never hand-read:
   `Volume`, `Issue`, `Fpage`, `Lpage`, `PageRange`. 16 refs.
 - **`WiNumber` added** — ISOSTS gives `wi-number` an `@id`; it was typed as a
   plain string, silently discarding that `@id`.
+- **`Publisher` closure added** — `Publisher`, `PublisherName`, `PublisherLoc`,
+  and `Email` are modelled from ISOSTS.xsd; `PublisherLoc` reuses the existing
+  IsoSts `ExtLink` and `Uri` boundary models. All four retain the
+  project-mandated `@id` model surface. 1 ref.
+- **15 reusable dependency leaves added** — `Abbrev`, `Annotation`, `Country`,
+  `Day`, `Etal`, `Fax`, `InlineGraphic`, `Institution`, `MilestoneEnd`,
+  `MilestoneStart`, `Month`, `Num`, `ObjectId`, `Phone`, and `Season` are
+  modelled from ISOSTS.xsd and close entirely on existing IsoSts types. They
+  remove no direct reference yet, but establish the first shared dependency
+  layer for the remaining recursive roots.
+- **3 Niso-only child refs deleted** — `std-meta` from `Front` and
+  `editing-instruction` from `Body` and `Sec`. Neither element exists in
+  ISOSTS.xsd, so adding IsoSts equivalents would incorrectly expand the schema.
 
 ### Why classes and not plain `:string`
 
@@ -66,20 +79,23 @@ round-trip. For a scalar, `render_empty: :empty` recovers it; for a collection
 to `[]`, destroying the information at parse time before any render option
 applies. Content-only classes round-trip every case.
 
-## Remaining — 20 refs
+## Remaining — 16 refs
 
-**11 refs to 9 deep roots**: `MetadataStd`, `ElementCitation`, `PersonGroup`,
-`Collab`, `Source`, `DispQuote`, `EditingInstruction`, `TermDisplay`,
-`BoxedText`. Each reaches the same ~152-class mutually-recursive core
-(`Section` → `Paragraph` → `DispQuote` → `Paragraph`). `DispQuote` has 3 direct
-children but pulls all 152. No incremental path — needs its own decision.
+**8 refs to 7 recursive roots**: `ElementCitation`, `PersonGroup`, `Collab`,
+`Source`, `DispQuote`, `TermDisplay`, and `BoxedText`. Each reaches the same
+78–79-element mutually-recursive core before existing IsoSts boundaries
+(`sec` → `p` → `disp-quote` → `p`). No direct one-file path remains.
 
-**9 refs whose ISOSTS content models have real children**, closure not measured:
-`attrib` (:1082), `term-head` (:4308), `article-title`, `license` → `license-p`
-(:51), `publisher` → `publisher-loc`, `custom-meta-group` → `custom-meta`.
-`attrib` and `term-head` are **not** trivial leaves in ISOSTS despite what the
-NisoSts models suggest; `license-p` reaches `array`/`alternatives`, so these may
-not be cheap. Measure before planning.
+**8 refs to 5 child-bearing roots**, now measured after the first dependency
+layer: `attrib` (:1082) reaches 78 not-yet-modelled ISOSTS elements before
+existing IsoSts boundaries, `term-head` (:4308) reaches 79, `article-title`
+reaches 78, `license` → `license-p` (:51) reaches 84, and
+`custom-meta-group` → `custom-meta` reaches 82. They converge on the same
+recursive content core as the deep roots, so none is another bounded model
+batch. `publisher` was the only exception: its four-element closure
+(`publisher`, `publisher-name`, `publisher-loc`, `email`) is complete.
+The Niso `Attrib` class is only 17 lines because it omits all 37 ISOSTS child
+types; copying it would silently drop valid ISO content rather than decouple it.
 
 ## Rejected: three-tier `Sts::Base` hierarchy
 
@@ -114,8 +130,8 @@ reaches `TbxIsoTml`/MathML. Those are shared namespaces, outside this ADR.
 
 ## Verification
 
-1. `grep -rho "Sts::NisoSts::" lib/sts/iso_sts/ | wc -l` → `20`
+1. `grep -rho "Sts::NisoSts::" lib/sts/iso_sts/ | wc -l` → `16`
 2. Every *non-`@id`* attribute on an IsoSts model traces to a line in
    `ISOSTS.xsd`; `@id` follows the 86948b9 convention
-3. Autoload registry 1:1 with the directory (112/112)
+3. Autoload registry 1:1 with the directory (131/131)
 4. `bundle exec rspec` green; `bundle exec rubocop` clean

data/lib/sts/iso_sts/abbrev.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Abbrev < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :alt, :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 :def, ::Sts::IsoSts::Def, collection: true
+
+      xml do
+        element "abbrev"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "alt", to: :alt
+        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
+        map_element "def", to: :def
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/annotation.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Annotation < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :paragraph, ::Sts::IsoSts::Paragraph, collection: true
+      attribute :non_normative_note, ::Sts::IsoSts::NonNormativeNote,
+                collection: true
+      attribute :non_normative_example, ::Sts::IsoSts::NonNormativeExample,
+                collection: true
+
+      xml do
+        element "annotation"
+        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_element "p", to: :paragraph
+        map_element "non-normative-note", to: :non_normative_note
+        map_element "non-normative-example", to: :non_normative_example
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/body.rb

@@ -23,8 +23,6 @@ module Sts
       attribute :array, ::Sts::IsoSts::Array, collection: true
       attribute :ref_list, ::Sts::IsoSts::RefList, collection: true
       attribute :disp_quote, ::Sts::NisoSts::DispQuote, collection: true
-      attribute :editing_instruction, ::Sts::NisoSts::EditingInstruction,
-                collection: true
 
       xml do
         element "body"
@@ -49,7 +47,6 @@ module Sts
         map_element "array", to: :array
         map_element "ref-list", to: :ref_list
         map_element "disp-quote", to: :disp_quote
-        map_element "editing-instruction", to: :editing_instruction
       end
     end
   end

data/lib/sts/iso_sts/country.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Country < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :country, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "country"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
+        map_attribute "country", to: :country
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
+        map_content to: :content
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/day.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Day < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "day"
+        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
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/email.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Email < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :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
+
+      xml do
+        element "email"
+        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_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
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/etal.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Etal < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "etal"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
+        map_content to: :content
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/fax.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Fax < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "fax"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
+        map_attribute "specific-use", to: :specific_use
+        map_content to: :content
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/front.rb

@@ -4,7 +4,6 @@ module Sts
   module IsoSts
     class Front < Lutaml::Model::Serializable
       attribute :id, :string
-      attribute :std_meta, ::Sts::NisoSts::MetadataStd
       attribute :iso_meta, ::Sts::IsoSts::IsoMeta
       attribute :reg_meta, ::Sts::IsoSts::RegMeta, collection: true
       attribute :nat_meta, ::Sts::IsoSts::NatMeta, collection: true
@@ -15,7 +14,6 @@ module Sts
         map_attribute "id", to: :id
         ordered
 
-        map_element "std-meta", to: :std_meta
         map_element "iso-meta", to: :iso_meta
         map_element "reg-meta", to: :reg_meta
         map_element "nat-meta", to: :nat_meta

data/lib/sts/iso_sts/inline_graphic.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class InlineGraphic < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :baseline_shift, :string
+      attribute :mimetype, :string
+      attribute :mime_subtype, :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 :alt_text, ::Sts::IsoSts::AltText
+
+      xml do
+        element "inline-graphic"
+
+        map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
+        map_attribute "baseline-shift", to: :baseline_shift
+        map_attribute "mimetype", to: :mimetype
+        map_attribute "mime-subtype", to: :mime_subtype
+        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_element "alt-text", to: :alt_text
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/institution.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Institution < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :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 :sub, ::Sts::IsoSts::Sub, collection: true
+      attribute :sup, ::Sts::IsoSts::Sup, collection: true
+
+      xml do
+        element "institution"
+        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_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
+        map_element "sub", to: :sub
+        map_element "sup", to: :sup
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/milestone_end.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class MilestoneEnd < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :rid, :string
+      attribute :content_type, :string
+      attribute :rationale, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+
+      xml do
+        element "milestone-end"
+
+        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_attribute "xml:lang", to: :xml_lang
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/milestone_start.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class MilestoneStart < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :rid, :string
+      attribute :content_type, :string
+      attribute :rationale, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+
+      xml do
+        element "milestone-start"
+
+        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_attribute "xml:lang", to: :xml_lang
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/mixed_citation.rb

@@ -38,7 +38,7 @@ module Sts
       attribute :fpage, ::Sts::IsoSts::Fpage
       attribute :lpage, ::Sts::IsoSts::Lpage
       attribute :page_range, ::Sts::IsoSts::PageRange
-      attribute :publisher, ::Sts::NisoSts::Publisher
+      attribute :publisher, ::Sts::IsoSts::Publisher
       attribute :pub_id, ::Sts::IsoSts::PubId, collection: true
 
       xml do # rubocop:disable Metrics/BlockLength

data/lib/sts/iso_sts/month.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Month < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "month"
+        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
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/num.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Num < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :dsep, :string
+      attribute :gsep, :string
+      attribute :specific_use, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "num"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_attribute "dsep", to: :dsep
+        map_attribute "gsep", to: :gsep
+        map_attribute "specific-use", to: :specific_use
+        map_content to: :content
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/object_id.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class ObjectId < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :pub_id_type, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "object-id"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_attribute "pub-id-type", to: :pub_id_type
+        map_attribute "content-type", to: :content_type
+        map_attribute "specific-use", to: :specific_use
+        map_content to: :content
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/phone.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Phone < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "phone"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
+        map_attribute "specific-use", to: :specific_use
+        map_content to: :content
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/publisher.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Publisher < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :publisher_name, ::Sts::IsoSts::PublisherName, collection: true
+      attribute :publisher_loc, ::Sts::IsoSts::PublisherLoc, collection: true
+
+      xml do
+        element "publisher"
+        ordered
+
+        map_attribute "id", to: :id
+        map_attribute "content-type", to: :content_type
+
+        map_element "publisher-name", to: :publisher_name
+        map_element "publisher-loc", to: :publisher_loc
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/publisher_loc.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class PublisherLoc < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :content, :string, collection: true
+      attribute :email, ::Sts::IsoSts::Email, collection: true
+      attribute :ext_link, ::Sts::IsoSts::ExtLink, collection: true
+      attribute :uri, ::Sts::IsoSts::Uri, collection: true
+
+      xml do
+        element "publisher-loc"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
+
+        map_content to: :content
+        map_element "email", to: :email
+        map_element "ext-link", to: :ext_link
+        map_element "uri", to: :uri
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/publisher_name.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class PublisherName < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "publisher-name"
+        mixed_content
+
+        map_attribute "id", to: :id
+        map_attribute "specific-use", to: :specific_use
+        map_attribute "xml:lang", to: :xml_lang
+
+        map_content to: :content
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/season.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Sts
+  module IsoSts
+    class Season < Lutaml::Model::Serializable
+      attribute :id, :string
+      attribute :content_type, :string
+      attribute :specific_use, :string
+      attribute :xml_lang, :string
+      attribute :content, :string, collection: true
+
+      xml do
+        element "season"
+        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
+      end
+    end
+  end
+end

data/lib/sts/iso_sts/sec.rb

@@ -35,8 +35,6 @@ module Sts
       attribute :term_sec, ::Sts::IsoSts::TermSec, collection: true
       attribute :disp_quote, ::Sts::NisoSts::DispQuote, 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
 
       xml do # rubocop:disable Metrics/BlockLength
@@ -74,7 +72,6 @@ module Sts
         map_element "term-sec", to: :term_sec
         map_element "disp-quote", to: :disp_quote
         map_element "fn", to: :fn
-        map_element "editing-instruction", to: :editing_instruction
         map_element "boxed-text", to: :boxed_text
       end
     end

data/lib/sts/iso_sts.rb

@@ -96,6 +96,23 @@ module Sts
     autoload :Underline, "#{__dir__}/iso_sts/underline"
     autoload :Uri, "#{__dir__}/iso_sts/uri"
 
+    # Shared model foundations
+    autoload :Abbrev, "#{__dir__}/iso_sts/abbrev"
+    autoload :Annotation, "#{__dir__}/iso_sts/annotation"
+    autoload :Country, "#{__dir__}/iso_sts/country"
+    autoload :Day, "#{__dir__}/iso_sts/day"
+    autoload :Etal, "#{__dir__}/iso_sts/etal"
+    autoload :Fax, "#{__dir__}/iso_sts/fax"
+    autoload :InlineGraphic, "#{__dir__}/iso_sts/inline_graphic"
+    autoload :Institution, "#{__dir__}/iso_sts/institution"
+    autoload :MilestoneEnd, "#{__dir__}/iso_sts/milestone_end"
+    autoload :MilestoneStart, "#{__dir__}/iso_sts/milestone_start"
+    autoload :Month, "#{__dir__}/iso_sts/month"
+    autoload :Num, "#{__dir__}/iso_sts/num"
+    autoload :ObjectId, "#{__dir__}/iso_sts/object_id"
+    autoload :Phone, "#{__dir__}/iso_sts/phone"
+    autoload :Season, "#{__dir__}/iso_sts/season"
+
     # List elements
     autoload :List, "#{__dir__}/iso_sts/list"
     autoload :ListItem, "#{__dir__}/iso_sts/list_item"
@@ -124,9 +141,13 @@ module Sts
     autoload :Graphic, "#{__dir__}/iso_sts/graphic"
 
     # Reference elements
-    autoload :RefList, "#{__dir__}/iso_sts/ref_list"
-    autoload :Ref, "#{__dir__}/iso_sts/ref"
+    autoload :Email, "#{__dir__}/iso_sts/email"
     autoload :MixedCitation, "#{__dir__}/iso_sts/mixed_citation"
+    autoload :Publisher, "#{__dir__}/iso_sts/publisher"
+    autoload :PublisherLoc, "#{__dir__}/iso_sts/publisher_loc"
+    autoload :PublisherName, "#{__dir__}/iso_sts/publisher_name"
+    autoload :Ref, "#{__dir__}/iso_sts/ref"
+    autoload :RefList, "#{__dir__}/iso_sts/ref_list"
 
     # Back matter
     autoload :AppGroup, "#{__dir__}/iso_sts/app_group"

data/lib/sts/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sts
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sts
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Ribose
@@ -120,8 +120,10 @@ files:
 - TODO.sts-refactor/11-duplicate-models.md
 - lib/sts.rb
 - lib/sts/iso_sts.rb
+- lib/sts/iso_sts/abbrev.rb
 - lib/sts/iso_sts/alt_text.rb
 - lib/sts/iso_sts/annex_type.rb
+- lib/sts/iso_sts/annotation.rb
 - lib/sts/iso_sts/app.rb
 - lib/sts/iso_sts/app_group.rb
 - lib/sts/iso_sts/array.rb
@@ -137,6 +139,8 @@ files:
 - lib/sts/iso_sts/copyright_holder.rb
 - lib/sts/iso_sts/copyright_statement.rb
 - lib/sts/iso_sts/copyright_year.rb
+- lib/sts/iso_sts/country.rb
+- lib/sts/iso_sts/day.rb
 - lib/sts/iso_sts/def.rb
 - lib/sts/iso_sts/def_item.rb
 - lib/sts/iso_sts/def_list.rb
@@ -146,7 +150,10 @@ files:
 - lib/sts/iso_sts/doc_type.rb
 - lib/sts/iso_sts/document_identification.rb
 - lib/sts/iso_sts/edition.rb
+- lib/sts/iso_sts/email.rb
+- lib/sts/iso_sts/etal.rb
 - lib/sts/iso_sts/ext_link.rb
+- lib/sts/iso_sts/fax.rb
 - lib/sts/iso_sts/fig.rb
 - lib/sts/iso_sts/fn.rb
 - lib/sts/iso_sts/fn_group.rb
@@ -155,6 +162,8 @@ files:
 - lib/sts/iso_sts/graphic.rb
 - lib/sts/iso_sts/ics.rb
 - lib/sts/iso_sts/inline_formula.rb
+- lib/sts/iso_sts/inline_graphic.rb
+- lib/sts/iso_sts/institution.rb
 - lib/sts/iso_sts/is_proof.rb
 - lib/sts/iso_sts/iso_meta.rb
 - lib/sts/iso_sts/issue.rb
@@ -168,22 +177,31 @@ files:
 - lib/sts/iso_sts/mathml2.rb
 - lib/sts/iso_sts/mathml2/math.rb
 - lib/sts/iso_sts/meta_date.rb
+- lib/sts/iso_sts/milestone_end.rb
+- lib/sts/iso_sts/milestone_start.rb
 - lib/sts/iso_sts/mixed_citation.rb
 - lib/sts/iso_sts/monospace.rb
+- lib/sts/iso_sts/month.rb
 - lib/sts/iso_sts/named_content.rb
 - lib/sts/iso_sts/nat_meta.rb
 - lib/sts/iso_sts/non_normative_example.rb
 - lib/sts/iso_sts/non_normative_note.rb
+- lib/sts/iso_sts/num.rb
+- lib/sts/iso_sts/object_id.rb
 - lib/sts/iso_sts/originator.rb
 - lib/sts/iso_sts/page_count.rb
 - lib/sts/iso_sts/page_range.rb
 - lib/sts/iso_sts/paragraph.rb
 - lib/sts/iso_sts/part_number.rb
 - lib/sts/iso_sts/permissions.rb
+- lib/sts/iso_sts/phone.rb
 - lib/sts/iso_sts/preformat.rb
 - lib/sts/iso_sts/proj_id.rb
 - lib/sts/iso_sts/pub_date.rb
 - lib/sts/iso_sts/pub_id.rb
+- lib/sts/iso_sts/publisher.rb
+- lib/sts/iso_sts/publisher_loc.rb
+- lib/sts/iso_sts/publisher_name.rb
 - lib/sts/iso_sts/ref.rb
 - lib/sts/iso_sts/ref_list.rb
 - lib/sts/iso_sts/reg_meta.rb
@@ -192,6 +210,7 @@ files:
 - lib/sts/iso_sts/release_version_id.rb
 - lib/sts/iso_sts/sc.rb
 - lib/sts/iso_sts/sdo.rb
+- lib/sts/iso_sts/season.rb
 - lib/sts/iso_sts/sec.rb
 - lib/sts/iso_sts/secretariat.rb
 - lib/sts/iso_sts/standard.rb