relaton-3gpp 2.0.0.pre.alpha.1 → 2.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 830c9ce4026ab42300e748d1bd41e3ac6463270e2e117a10bece2311893da2bf
-  data.tar.gz: 18e1109fef82978adbda01cb4ef3e6fa46410cba1d3cca85fe53c538838e439c
+  metadata.gz: 8115c4928f5c80d2a7ff35ddb0678d54ef08fcb0ffd2f567d6b2050d1d032300
+  data.tar.gz: 911500efaec29a5b822c46ff7a3fb586806c06c4bfe2a6b750288063004de17c
 SHA512:
-  metadata.gz: d905a7c7d24648f1610fa69a347a23be8ee9e16e2327622f8bbe470c3d4c345d262e7fb455777756cf072ebccb43960c5ee302b609fde1fdb2910a4b16d33c30
-  data.tar.gz: a56c0bfb15f44c4c3ceecdd50b8fe96bdef61b53f04a6a60826ef7b4b4ecac08ee316e596fadc739bbdfbec9bc5bcfc16aebc25e499ebd225cb88051f2c18c47
+  metadata.gz: 5464d1af9db712a9d777fe6bf322c1b086989273dbfead28e4cfc2479d482a6aa16a1bbb6ea966ed49d662c155c4587c9a71ed743f366b9164c3a6b727088c0d
+  data.tar.gz: b4947a9a2bd6b0c2f116fb37e7ec4d9cecbc073548c345cd739afed6cb1ac4efc18351c15bd6d27f622d665e63b6d33427d863ed4d061dfea5541b3e819375ce

data/.gitignore

@@ -14,3 +14,4 @@ Gemfile.lock
 .vscode/
 .rspec_status
 status_smg_3GPP*
+.claude/settings.local.json

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
 Rails:
   Enabled: false

data/grammars/basicdoc.rng

@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
         </zeroOrMore>
       </element>
     </optional>
-    <optional>
+    <zeroOrMore>
       <element name="description">
-        <a:documentation>Description of the change described in this block</a:documentation>
-        <zeroOrMore>
+        <a:documentation>Description(s) of the change described in this block</a:documentation>
+        <oneOrMore>
           <ref name="BasicBlock"/>
-        </zeroOrMore>
+        </oneOrMore>
       </element>
-    </optional>
+    </zeroOrMore>
     <optional>
       <element name="newcontent">
         <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
@@ -267,6 +267,10 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <value>justified</value>
     </choice>
   </define>
+  <define name="IdRefType">
+    <a:documentation>Type of cross-references to elements. In BasicDoc, these always point to id { xsd:ID } </a:documentation>
+    <data type="IDREF"/>
+  </define>
   <define name="RequiredId">
     <a:documentation>Mandatory anchor of element, to be used for cross-references within the document</a:documentation>
     <attribute name="id">
@@ -382,33 +386,7 @@ in a document (e.g. sourcecode annotations)</a:documentation>
     <a:documentation>Block intended to capture reviewer comments about some text in the document</a:documentation>
     <element name="review">
       <ref name="RequiredId"/>
-      <attribute name="reviewer">
-        <a:documentation>The party who has offered the comment</a:documentation>
-      </attribute>
-      <optional>
-        <attribute name="type">
-          <a:documentation>The type of reviewer comment</a:documentation>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="date">
-          <a:documentation>The date when the comment was made</a:documentation>
-          <data type="dateTime"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="from">
-          <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
-If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
-          <data type="IDREF"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="to">
-          <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
-          <data type="IDREF"/>
-        </attribute>
-      </optional>
+      <ref name="ReviewAttributes"/>
       <oneOrMore>
         <ref name="paragraph">
           <a:documentation>Reviewer comments content</a:documentation>
@@ -416,6 +394,35 @@ If not provided, the comment applies in the vicinity of the place it has been in
       </oneOrMore>
     </element>
   </define>
+  <define name="ReviewAttributes">
+    <attribute name="reviewer">
+      <a:documentation>The party who has offered the comment</a:documentation>
+    </attribute>
+    <optional>
+      <attribute name="type">
+        <a:documentation>The type of reviewer comment</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="date">
+        <a:documentation>The date when the comment was made</a:documentation>
+        <data type="dateTime"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="from">
+        <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
+If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
+        <ref name="IdRefType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="to">
+        <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
+        <ref name="IdRefType"/>
+      </attribute>
+    </optional>
+  </define>
   <define name="NumberingAttributes">
     <optional>
       <attribute name="unnumbered">
@@ -599,17 +606,9 @@ It is included for convenience, in case processing the citation to extract the a
         <a:documentation>The caption of the block</a:documentation>
       </ref>
     </optional>
-    <oneOrMore>
-      <choice>
-        <text>
-          <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
-(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
-        </text>
-        <ref name="callout">
-          <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
-        </ref>
-      </choice>
-    </oneOrMore>
+    <ref name="sourcecodebody">
+      <a:documentation>The sourcecode content</a:documentation>
+    </ref>
     <zeroOrMore>
       <ref name="annotation">
         <a:documentation>Annotations to the source code; each annotation consists of zero or more paragraphs,
@@ -628,17 +627,9 @@ and is intended to be referenced by a callout within the source code</a:document
         <a:documentation>The caption of the block</a:documentation>
       </ref>
     </optional>
-    <oneOrMore>
-      <choice>
-        <text>
-          <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
-(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
-        </text>
-        <ref name="callout">
-          <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
-        </ref>
-      </choice>
-    </oneOrMore>
+    <ref name="sourcecodebody">
+      <a:documentation>The sourcecode content</a:documentation>
+    </ref>
     <zeroOrMore>
       <ref name="annotation">
         <a:documentation>Annotations to the source code; each annotation consists of zero or more paragraphs,
@@ -651,6 +642,20 @@ and is intended to be referenced by a callout within the source code</a:document
       </ref>
     </zeroOrMore>
   </define>
+  <define name="sourcecodebody">
+    <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
+(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
+    <element name="body">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="callout">
+            <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
+          </ref>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="pre">
     <a:documentation>Pre-formatted block. Wrapper for text to be rendered with fixed-width typeface, and preserving spaces including line breaks. 
 They are intended for a restricted number of functions, most typically ASCII Art (which is still in prominent use in some 
@@ -859,6 +864,7 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
   <define name="tr">
     <a:documentation>Sequence of cells to be displayed as a row in a table</a:documentation>
     <element name="tr">
+      <ref name="TrAttributes"/>
       <oneOrMore>
         <choice>
           <ref name="td">
@@ -871,6 +877,9 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="TrAttributes">
+    <empty/>
+  </define>
   <define name="tr-no-id">
     <a:documentation>Sequence of cells to be displayed as a row in a table: optional ID attributes recursively (for use in Relaton, metadata)</a:documentation>
     <element name="tr">
@@ -1282,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
       <ref name="pure_strike"/>
       <ref name="pure_smallcap"/>
       <ref name="br"/>
+      <ref name="stem"/>
     </choice>
   </define>
   <define name="NestedTextElement">
     <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
     <choice>
       <ref name="PureTextElement"/>
-      <ref name="stem"/>
       <ref name="eref"/>
       <ref name="xref"/>
       <ref name="hyperlink"/>
@@ -1499,7 +1508,7 @@ Restricted recursively to contain only other such inline elements with no identi
         <attribute name="to">
           <a:documentation>A reference to an anchor element (typically a bookmark), 
 to indicate that the index range covers a range of locations between the current index element and the `to` anchor</a:documentation>
-          <data type="IDREF"/>
+          <ref name="IdRefType"/>
         </attribute>
       </optional>
       <ref name="index-primary">
@@ -1657,7 +1666,7 @@ which can be bookmarks as well as block or section references</a:documentation>
   <define name="XrefAttributes">
     <attribute name="target">
       <a:documentation>The identifier of a section, block or inlined element being referenced</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <optional>
       <attribute name="type">
@@ -1672,40 +1681,53 @@ which can be bookmarks as well as block or section references</a:documentation>
     </optional>
   </define>
   <define name="XrefBody">
-    <oneOrMore>
-      <ref name="PureTextElement">
-        <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-      </ref>
-    </oneOrMore>
+    <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
+    <optional>
+      <element name="display-text">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
+    </optional>
   </define>
   <define name="ErefBody">
-    <oneOrMore>
-      <ref name="PureTextElement">
-        <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-      </ref>
-    </oneOrMore>
+    <optional>
+      <element name="display-text">
+        <oneOrMore>
+          <ref name="PureTextElement">
+            <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
+          </ref>
+        </oneOrMore>
+      </element>
+    </optional>
   </define>
   <define name="fn">
     <a:documentation>Inline reference to a paragraph or paragraphs, appearing as a footnote.
 The target of a footnote is the location it is embedded in within the text</a:documentation>
     <element name="fn">
-      <attribute name="reference">
-        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
-      </attribute>
-      <oneOrMore>
-        <ref name="paragraph">
-          <a:documentation>The content of the footnote</a:documentation>
-        </ref>
-      </oneOrMore>
+      <ref name="FnAttributes"/>
+      <ref name="FnBody"/>
     </element>
   </define>
+  <define name="FnBody">
+    <oneOrMore>
+      <ref name="paragraph">
+        <a:documentation>The content of the footnote</a:documentation>
+      </ref>
+    </oneOrMore>
+  </define>
+  <define name="FnAttributes">
+    <attribute name="reference">
+      <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
+    </attribute>
+  </define>
   <define name="callout">
     <a:documentation>Inline reference to a paragraph or paragraphs, appearing as annotation of source code</a:documentation>
     <element name="callout">
       <attribute name="target">
         <a:documentation>The target of the callout is understood to be the location of the callout within the source code; 
 the extent of the target is not expressed overtly</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
       <text>
         <a:documentation>The label of the callout, used to identify its target within the source code</a:documentation>

data/grammars/biblio-standoc.rng

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
-  <!--
-    Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
-    of relaton
-    
-    Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
-    (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
-  -->
   <include href="biblio.rng">
+    <!-- ALERT: we cannot have comments on root element, as they intervene with https://github.com/metanorma/metanorma/issues/437 fix -->
+    <!--
+      Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
+      of relaton
+      
+      Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
+      (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
+    -->
     <define name="BibData">
       <a:documentation>The bibliographic description of a standardisation document</a:documentation>
       <ref name="StandardBibliographicItem"/>
@@ -75,12 +76,6 @@ from other documents in the same doctype</a:documentation>
     <ref name="flavor">
       <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
     </ref>
-    <optional>
-      <ref name="editorialgroup">
-        <a:documentation>Groups associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-      </ref>
-    </optional>
     <zeroOrMore>
       <ref name="ics">
         <a:documentation>Classification of the document contents taken from the International Classification of Standards</a:documentation>
@@ -91,6 +86,9 @@ a standards definition organization</a:documentation>
         <a:documentation>Representation of the identifier for the standardisation document, giving its individual semantic components</a:documentation>
       </ref>
     </zeroOrMore>
+    <ref name="DocumentImages">
+      <a:documentation>Coverpage and other images to be rendered with document</a:documentation>
+    </ref>
   </define>
   <define name="doctype">
     <a:documentation>Classification of the standardisation document</a:documentation>
@@ -126,49 +124,6 @@ a standards definition organization</a:documentation>
 However we prefer not to hardcode it, given ongoing extension.</a:documentation>
     <text/>
   </define>
-  <define name="editorialgroup">
-    <a:documentation>A group associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-    <element name="editorialgroup">
-      <oneOrMore>
-        <ref name="technical-committee">
-          <a:documentation>A technical committee associated with the production of the standards document</a:documentation>
-        </ref>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="technical-committee">
-    <a:documentation>Technical committee associated with the production of a standards document</a:documentation>
-    <element name="technical-committee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="IsoWorkgroup">
-    <optional>
-      <attribute name="number">
-        <a:documentation>Numeric identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="type">
-        <a:documentation>Type of the technical committee, used in identifying the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="identifier">
-        <a:documentation>Non-numeric, complete identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="prefix">
-        <a:documentation>Disambiguating prefix added to number to form the identifier of the technical committee,
-typically indicating its type</a:documentation>
-      </attribute>
-    </optional>
-    <text>
-      <a:documentation>Name of the technical committee</a:documentation>
-    </text>
-  </define>
   <define name="ics">
     <a:documentation>Classification taken from the International Classification of Standards. 
 ICS is defined by ISO here -- https://www.iso.org/publication/PUB100033.html</a:documentation>
@@ -268,6 +223,32 @@ and not those document components</a:documentation>
       </optional>
     </element>
   </define>
+  <define name="DocumentImages">
+    <zeroOrMore>
+      <element name="coverpage-image">
+        <a:documentation>Images to be displayed on the coverpage of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+    <zeroOrMore>
+      <element name="innercoverpage-image">
+        <a:documentation>Images to be displayed on the inner coverpage of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+    <zeroOrMore>
+      <element name="tocside-image">
+        <a:documentation>Images to be displayed on the Table of Contents page of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+    <zeroOrMore>
+      <element name="backpage-image">
+        <a:documentation>Images to be displayed on the backpage of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+  </define>
   <define name="StandardBibliographicItem">
     <ref name="BibliographicItem"/>
     <zeroOrMore>

data/grammars/biblio.rng

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  instantiations of this grammar may replace leaf strings
-  with more elaborated types; e.g. title (text) replaced with
-  title-main, title-intro, title-part; type replaced with
-  enum.
-  
-  some renaming at leaf nodes is permissible
-  
-  obligations can change both from optional to mandatory,
-  and from mandatory to optional; optional elements may
-  be omitted; freely positioned alternatives may be replaced
-  with strict ordering
-  
-  DO NOT introduce a namespace here. We do not want a distinct namespace
-  for these elements, and a distinct namespace for any grammar inheriting
-  these elements; we just want one namespace for any child grammars
-  of this.
--->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!--
+    ALERT: we cannot have comments on root element, as they intervene with https://github.com/metanorma/metanorma/issues/437 fix
+    
+    Instantiations of this grammar may replace leaf strings
+    with more elaborated types; e.g. title (text) replaced with
+    title-main, title-intro, title-part; type replaced with
+    enum.
+    
+    Some renaming at leaf nodes is permissible
+    
+    Obligations can change both from optional to mandatory,
+    and from mandatory to optional; optional elements may
+    be omitted; freely positioned alternatives may be replaced
+    with strict ordering
+    
+    DO NOT introduce a namespace here. We do not want a distinct namespace
+    for these elements, and a distinct namespace for any grammar inheriting
+    these elements; we just want one namespace for any child grammars
+    of this.
+  -->
   <!--
     https://www.myintervals.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
     iso8601date = xsd:string { pattern = "([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?" }
@@ -240,6 +242,8 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
     </choice>
   </define>
   <define name="roledescription">
+    <a:documentation>A more detailed description of the role of the contributor
+Some descriptions are reserved words; in particular, the editorial committee of a standard has the role description "committee"</a:documentation>
     <element name="description">
       <ref name="LocalizedMarkedUpString"/>
     </element>
@@ -441,7 +445,10 @@ real names (if the person is named with a pseudonym or user name); previous lega
     </oneOrMore>
     <zeroOrMore>
       <ref name="subdivision">
-        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item</a:documentation>
+        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item.
+Multiple subdivisions can be specified for an organization, with no implication of hierarchical
+relation between them
+Editorial and advisory groups are represented as consecutive subdivisions of the SDO</a:documentation>
       </ref>
     </zeroOrMore>
     <optional>
@@ -459,11 +466,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="orgname">
     <element name="name">
@@ -483,6 +490,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
           <a:documentation>The type of subdivision</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subtype">
+          <a:documentation>The subtype of subdivision; e.g. different types of technical committee</a:documentation>
+        </attribute>
+      </optional>
       <ref name="OrganizationType">
         <a:documentation>The subdivision, modelled recursively as an organization</a:documentation>
       </ref>
@@ -490,6 +502,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
   </define>
   <define name="logo">
     <element name="logo">
+      <optional>
+        <attribute name="type">
+          <a:documentation>The type of logo</a:documentation>
+        </attribute>
+      </optional>
       <ref name="image-no-id"/>
     </element>
   </define>
@@ -501,6 +518,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
           <a:documentation>Description of what is being depicted</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Description of what kind of depiction this</a:documentation>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="image-no-id">
           <a:documentation>A visual depiction of the bibliographic item</a:documentation>
@@ -678,7 +700,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -857,7 +879,7 @@ depending on whether the items exist as independent documents, or are parts of a
       </zeroOrMore>
     </element>
   </define>
-  <define name="BibItemType" combine="choice">
+  <define name="BibItemType">
     <a:documentation>Type of bibliographic item.
 The value list complies with the types provided in ISO 690:2021.
 NOTE: These values represent a strict superset to BibTeX
@@ -1224,9 +1246,9 @@ Refer to `BibliographicItem` for definitions</a:documentation>
     <optional>
       <ref name="validity"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction"/>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="btitle">
     <a:documentation>A title of a bibliographic item, associated with a type of title</a:documentation>
@@ -1241,6 +1263,11 @@ Refer to `BibliographicItem` for definitions</a:documentation>
   </define>
   <define name="formattedref">
     <element name="formattedref">
+      <optional>
+        <attribute name="format">
+          <a:documentation>format of formatted reference; Metanorma assumes references are formatted as Metanorma XML</a:documentation>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1279,17 +1306,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -1812,6 +1839,11 @@ May be used to differentiate rendering of notes in bibliographies</a:documentati
     <a:documentation>Abstract of bibliographic item</a:documentation>
     <element name="abstract">
       <ref name="LocalizedStringAttributes"/>
+      <optional>
+        <attribute name="format">
+          <a:documentation>What format the formatted abstract is in. In Metanorma, assumed to be Metanorma XML</a:documentation>
+        </attribute>
+      </optional>
       <choice>
         <oneOrMore>
           <ref name="BasicBlockNoId">

data/grammars/relaton-3gpp.rng

@@ -21,9 +21,6 @@
       <optional>
         <ref name="docsubtype"/>
       </optional>
-      <optional>
-        <ref name="editorialgroup"/>
-      </optional>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>

data/lib/relaton/3gpp/bibliography.rb

@@ -6,12 +6,11 @@ module Relaton
     module Bibliography
       # SOURCE = "http://xml2rfc.tools.ietf.org/public/rfc/bibxml-3gpp-new/"
       SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-3gpp/refs/heads/data-v2/"
-      INDEX_FILE = "index-v1.yaml"
 
       # @param text [String]
       # @return [RelatonBib::BibliographicItem]
       def search(text) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        index = Relaton::Index.find_or_create "3GPP", url: "#{SOURCE}index-v1.zip", file: INDEX_FILE
+        index = Relaton::Index.find_or_create "3GPP", url: "#{SOURCE}#{INDEXFILE}.zip", file: "#{INDEXFILE}.yaml"
         row = index.search(text.sub(/^3GPP\s/, "")).min_by { |r| r[:id] }
         return unless row
 

data/lib/relaton/3gpp/data_fetcher.rb

@@ -9,7 +9,7 @@ module Relaton
       CURRENT = "current.yaml".freeze
 
       def index
-        @index ||= Relaton::Index.find_or_create "3gpp", file: Bibliography::INDEX_FILE
+        @index ||= Relaton::Index.find_or_create "3gpp", file: "#{INDEXFILE}.yaml"
       end
 
       #
@@ -214,11 +214,15 @@ module Relaton
       end
 
       def to_xml(bib)
-        Bibdata.to_xml(bib)
+        bib.to_xml(bibdata: true)
       end
 
       def to_yaml(bib)
-        Item.to_yaml(bib)
+        bib.to_yaml
+      end
+
+      def to_bibxml(bib)
+        bib.to_rfcxml
       end
     end
   end

data/lib/relaton/3gpp/ext.rb

@@ -3,12 +3,10 @@ require_relative "release"
 
 module Relaton
   module ThreeGpp
-    class Ext < Lutaml::Model::Serializable
+    class Ext < Bib::Ext
       attribute :schema_version, method: :get_schema_version
       attribute :doctype, Doctype
       attribute :subdoctype, :string, values: %w[spec release]
-      attribute :editorialgroup, Relaton::Bib::EditorialGroup
-      attribute :ics, Relaton::Bib::ICS, collection: true
       attribute :radiotechnology, :string, values: %w[2G 3G LTE 5G]
       attribute :common_ims_spec, :boolean
       attribute :internal, :boolean
@@ -19,11 +17,6 @@ module Relaton
       end
 
       xml do
-        map_attribute "schema-version", to: :schema_version
-        map_element "doctype", to: :doctype
-        map_element "subdoctype", to: :subdoctype
-        map_element "editorialgroup", to: :editorialgroup
-        map_element "ics", to: :ics
         map_element "radiotechnology", to: :radiotechnology
         map_element "common-ims-spec", to: :common_ims_spec
         map_element "internal", to: :internal

data/lib/relaton/3gpp/item.rb

@@ -3,7 +3,7 @@ require_relative "ext"
 
 module Relaton
   module ThreeGpp
-    class Item < Relaton::Bib::Item
+    class Item < Bib::Item
       model ItemData
 
       attribute :ext, Ext

data/lib/relaton/3gpp/item_data.rb

@@ -1,6 +1,6 @@
 module Relaton
   module ThreeGpp
-    class ItemData < Relaton::Bib::ItemData
+    class ItemData < Bib::ItemData
       def to_xml(bibdata: false, **opts)
         add_notes opts[:note] do
           bibdata ? Bibdata.to_xml(self) : Bibitem.to_xml(self)

data/lib/relaton/3gpp/parser.rb

@@ -32,7 +32,6 @@ module Relaton
       #
       def parse # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         ItemData.new(
-          id: parse_id,
           type: "standard",
           language: ["en"],
           script: ["Latn"],
@@ -53,10 +52,6 @@ module Relaton
         )
       end
 
-      def parse_id
-        number.gsub(/[\s:\/]/, "-").squeeze("-").upcase
-      end
-
       #
       # Parse title
       #
@@ -191,10 +186,37 @@ module Relaton
         abbrev = Bib::LocalizedString.new content: "3GPP"
         org = Bib::Organization.new(name: [name], abbreviation: abbrev, address: [address])
         contribs = [Bib::Contributor.new(organization: org, role: contributor_role)]
-        return contribs unless @row["Last Name"] && @row["Last Name"] != "Vacant"
+        if @row["Last Name"] && @row["Last Name"] != "Vacant"
+          role = Bib::Contributor::Role.new type: "author"
+          contribs << Bib::Contributor.new(person: person, role: [role])
+        end
+        contribs + editorial_group_contributors
+      end
 
-        role = Bib::Contributor::Role.new type: "author"
-        contribs << Bib::Contributor.new(person: person, role: [role])
+      def editorial_group_contributors # rubocop:disable Metrics/MethodLength
+        contribs = []
+        prime = @row["Responsible Primary"]
+        contribs << editorial_group_contributor(prime, "prime") unless prime.nil? || prime.empty?
+        @row["Responsible Secondary"].strip.split(", ").each do |wg|
+          contribs << editorial_group_contributor(wg, "other")
+        end
+        contribs
+      end
+
+      def editorial_group_contributor(wg_name, wg_type)
+        Bib::Contributor.new(
+          role: [Bib::Contributor::Role.new(
+            type: "author",
+            description: [Bib::LocalizedMarkedUpString.new(content: "committee")],
+          )],
+          organization: Bib::Organization.new(
+            subdivision: [Bib::Subdivision.new(
+              type: "technical-committee",
+              subtype: wg_type,
+              name: [Bib::TypedLocalizedString.new(content: wg_name)],
+            )],
+          ),
+        )
       end
 
       def address
@@ -230,7 +252,6 @@ module Relaton
       def parse_ext
         Ext.new(
           doctype: parse_doctype,
-          editorialgroup: parse_editorialgroup,
           radiotechnology: parse_radiotechnology,
           release: parse_release,
         )
@@ -242,26 +263,6 @@ module Relaton
         Doctype.new(content: doctype_abbr) # 3GPP grammar alloves only TS and TR content
       end
 
-      #
-      # Parse editorialgroup
-      #
-      # @return [RelatonBib::EditorialGroup] editorialgroups
-      #
-      def parse_editorialgroup # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        eg = []
-        prime = @row["Responsible Primary"]
-        eg << create_workgroup(prime, "prime") unless prime.nil? || prime.empty?
-
-        @row["Responsible Secondary"].strip.split(", ").each do |wg|
-          eg << create_workgroup(wg, "other")
-        end
-        Bib::EditorialGroup.new technical_committee: eg
-      end
-
-      def create_workgroup(name, type)
-        Bib::WorkGroup.new(content: name, type: type)
-      end
-
       #
       # Parse radio technology
       #

data/lib/relaton/3gpp/processor.rb

@@ -1,3 +1,5 @@
+require "relaton/core/processor"
+
 module Relaton
   module ThreeGpp
     class Processor < Relaton::Core::Processor
@@ -16,6 +18,7 @@ module Relaton
       # @param opts [Hash]
       # @return [RelatonBib::BibliographicItem]
       def get(code, date, opts)
+        require_relative "../3gpp"
         Bibliography.get(code, date, opts)
       end
 
@@ -28,24 +31,28 @@ module Relaton
       # @option opts [String] :format
       #
       def fetch_data(source, opts)
+        require_relative "data_fetcher"
         DataFetcher.fetch(source, **opts)
       end
 
       # @param xml [String]
       # @return [RelatonBib::BibliographicItem]
       def from_xml(xml)
+        require_relative "../3gpp"
         Item.from_xml xml
       end
 
       # @param yaml [String]
       # @return [Relaton::ThreeGpp::Item]
       def from_yaml(yaml)
+        require_relative "../3gpp"
         Item.from_yaml(yaml)
       end
 
       # Returns hash of XML grammar
       # @return [String]
       def grammar_hash
+        require_relative "../3gpp"
         @grammar_hash ||= ThreeGpp.grammar_hash
       end
 
@@ -53,7 +60,8 @@ module Relaton
       # Remove index file
       #
       def remove_index_file
-        Relaton::Index.find_or_create("3GPP", url: true, file: Bibliography::INDEX_FILE).remove_file
+        require_relative "../3gpp"
+        Relaton::Index.find_or_create("3GPP", url: true, file: "#{INDEXFILE}.yaml").remove_file
       end
     end
   end

data/lib/relaton/3gpp/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module ThreeGpp
-    VERSION = "2.0.0-alpha.1"
+    VERSION = "2.0.0-alpha.2"
   end
 end

data/lib/relaton/3gpp.rb

@@ -11,6 +11,8 @@ require_relative "3gpp/bibliography"
 
 module Relaton
   module ThreeGpp
+    INDEXFILE = "index-v1".freeze
+
     # Returns hash of XML reammar
     # @return [String]
     def self.grammar_hash

data/relaton_3gpp.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.description   = "Relaton::3gpp: Ruby XMLDOC impementation."
   spec.homepage      = "https://github.com/relaton/relaton-3gpp"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = ">= 3.1.0"
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'https://mygemserver.com'"
 
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
 
   spec.add_dependency "csv"
   spec.add_dependency "net-ftp", "~> 0.1.0"
-  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.2"
-  spec.add_dependency "relaton-core", "~> 0.0.6"
+  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.4"
+  spec.add_dependency "relaton-core", "~> 0.0.8"
   spec.add_dependency "relaton-index", "~> 0.2.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.1
+  version: 2.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -44,28 +43,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.2
+        version: 2.0.0.pre.alpha.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.2
+        version: 2.0.0.pre.alpha.4
 - !ruby/object:Gem::Dependency
   name: relaton-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +123,6 @@ licenses:
 - BSD-2-Clause
 metadata:
   homepage_uri: https://github.com/relaton/relaton-3gpp
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,15 +130,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: 'Relaton::3gpp: Ruby XMLDOC impementation.'
 test_files: []