relaton-bib 2.0.0.pre.alpha.1 → 2.0.0

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
@@ -1120,11 +1142,11 @@ NOTE: This should preferably be encoded as  a URI or short identifier, rather th
         <a:documentation>Information about how long the current description of the bibliographic item is valid for</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction">
         <a:documentation>Depiction of the bibliographic item, typically an image</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="ReducedBibliographicItem">
     <a:documentation>Reduced description of a bibliographic resource, without mandatory title and docidentifier, used for document relations
@@ -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">
@@ -1907,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>
@@ -2031,13 +2063,13 @@ provided that it is not the entire bibliographic item that is so related</a:docu
           <ref name="LocalizedString"/>
         </element>
       </optional>
-      <oneOrMore>
+      <zeroOrMore>
         <element name="taxon">
           <a:documentation>The keywords as a hierarchical taxonomy. For example, the sequence of `taxon` elements
 `pump`, `centrifugal pump`, `line shaft pump` represents a taxonomic classification</a:documentation>
           <ref name="LocalizedString"/>
         </element>
-      </oneOrMore>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="vocabid">
           <a:documentation>Identifiers for the keyword as a controlled vocabulary</a:documentation>

data/grammars/versions.json

@@ -1,35 +1,35 @@
 {
-"relaton-models": "v1.4.1",
-"basicdoc-models": "v1.2.2",
+"relaton-models": "v1.5.6",
+"basicdoc-models": "v1.2.5",
 "metanorma-requirements-models": "v1.0.2",
-"relaton-model-ieee": "v1.0.1",
-"relaton-model-iso": "v1.0.5",
-"relaton-model-iec": "v1.0.0",
-"relaton-model-bsi": "v1.0.3",
-"relaton-model-gb": "v1.0.0",
+"relaton-model-ieee": "v1.1.3",
+"relaton-model-iso": "v1.1.2",
+"relaton-model-iec": "v1.1.2",
+"relaton-model-bsi": "v1.1.3",
+"relaton-model-gb": "v1.1.2",
 "relaton-model-mpfa": "v1.0.0",
-"relaton-model-bipm": "v1.0.1",
+"relaton-model-bipm": "v1.1.2",
 "relaton-model-w3c": "v1.0.0",
-"relaton-model-3gpp": "v1.0.1",
-"relaton-model-csa": "v1.0.0",
-"relaton-model-cc": "v1.0.0",
-"relaton-model-ietf": "v1.0.1",
-"relaton-model-iho": "v1.0.0",
-"relaton-model-itu": "v1.0.2",
-"relaton-model-m3aawg": "v1.0.0",
-"relaton-model-nist": "v1.0.0",
-"relaton-model-ribose": "v1.0.0",
-"relaton-model-ogc": "v1.0.1",
-"relaton-model-un": "v1.0.0",
+"relaton-model-3gpp": "v1.0.4",
+"relaton-model-cc": "v1.1.2",
+"relaton-model-ietf": "v1.1.2",
+"relaton-model-iho": "v1.1.2",
+"relaton-model-itu": "v1.1.3",
+"relaton-model-m3aawg": "v1.0.1",
+"relaton-model-nist": "v1.1.2",
+"relaton-model-ribose": "v1.1.2",
+"relaton-model-ogc": "v1.1.2",
 "relaton-model-cen": "v1.0.1",
 "relaton-model-ecma": "v1.0.0",
 "relaton-model-cie": "v1.0.0",
 "relaton-model-iana": "v1.0.0",
 "relaton-model-omg": "v1.0.0",
-"relaton-model-oasis": "v1.0.1",
-"relaton-model-jis": "v0.0.1",
-"relaton-model-etsi": "v0.0.3",
-"relaton-model-plateau": "v0.0.2",
-"metanorma-model": "v1.4.1",
-"date": "2024-12-03T03:33:24Z"
+"relaton-model-oasis": "v1.0.4",
+"relaton-model-jis": "v1.0.2",
+"relaton-model-etsi": "v0.1.2",
+"relaton-model-plateau": "v0.1.0",
+"relaton-model-ccsds": "",
+"relaton-model-un": "v1.0.2",
+"metanorma-model": "v2.1.6",
+"date": "2026-04-03T02:05:43Z"
 }