fix issue #81

relaton · Nov 15, 2023 · 20c3c02 · 20c3c02
1 parent 19f59f0
commit 20c3c02
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 17 deletions.
diff --git a/grammars/basicdoc.rng b/grammars/basicdoc.rng
@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,14 +654,20 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

diff --git a/grammars/biblio.rng b/grammars/biblio.rng
@@ -942,6 +942,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

diff --git a/grammars/versions.json b/grammars/versions.json
@@ -1,6 +1,6 @@
 {
-"relaton-models": "v1.2.4",
-"basicdoc-models": "v1.0.2",
+"relaton-models": "v1.2.5",
+"basicdoc-models": "v1.0.3",
 "metanorma-requirements-models": "v1.0.0",
 "relaton-model-ieee": "v1.0.0",
 "relaton-model-iso": "v1.0.0",
@@ -28,6 +28,7 @@
 "relaton-model-omg": "v1.0.0",
 "relaton-model-oasis": "v1.0.1",
 "relaton-model-jis": "v0.0.1",
-"metanorma-model": "v1.2.4",
-"date": "2023-08-31T02:58:33Z"
+"relaton-model-etsi": "v0.0.1",
+"metanorma-model": "v1.2.8",
+"date": "2023-11-13T23:08:26Z"
 }
diff --git a/lib/relaton_bib/bibliographic_date.rb b/lib/relaton_bib/bibliographic_date.rb
@@ -6,8 +6,8 @@ module RelatonBib
   # Bibliographic date.
   class BibliographicDate
     TYPES = %w[published accessed created implemented obsoleted confirmed
-               updated issued transmitted copied unchanged circulated adapted
-               vote-started vote-ended announced].freeze
+               updated corrected issued transmitted copied unchanged circulated adapted
+               vote-started vote-ended announced stable-until].freeze
 
     # @return [String]
     attr_reader :type

diff --git a/lib/relaton_bib/version.rb b/lib/relaton_bib/version.rb
@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.16.3".freeze
+  VERSION = "1.16.4".freeze
 end
diff --git a/spec/examples/bib_item.xml b/spec/examples/bib_item.xml
@@ -1,4 +1,4 @@
-<bibitem id="ISOTC211" type="standard" schema-version="v1.2.4">
+<bibitem id="ISOTC211" type="standard" schema-version="v1.2.5">
   <fetched>2023-10-02</fetched>
   <title type="title-main" format="text/plain">Geographic information</title>
   <title type="main" format="text/plain">Geographic information</title>
@@ -275,4 +275,4 @@
     <validityEnds>2011-02-03 18:30</validityEnds>
     <revision>2011-03-04 09:00</revision>
   </validity>
-</bibitem>
+</bibitem>
diff --git a/spec/examples/bibdata_item.xml b/spec/examples/bibdata_item.xml
@@ -1,4 +1,4 @@
-<bibdata type="standard" schema-version="v1.2.4">
+<bibdata type="standard" schema-version="v1.2.5">
   <fetched>2023-10-02</fetched>
   <title type="title-main" format="text/plain">Geographic information</title>
   <title type="main" format="text/plain">Geographic information</title>
@@ -303,4 +303,4 @@
       <docnumber>456</docnumber>
     </structuredidentifier>
   </ext>
-</bibdata>
+</bibdata>
diff --git a/spec/examples/bibdata_item_fr.xml b/spec/examples/bibdata_item_fr.xml
@@ -1,4 +1,4 @@
-<bibdata type="standard" schema-version="v1.2.4">
+<bibdata type="standard" schema-version="v1.2.5">
   <fetched>2023-10-02</fetched>
   <title format="text/plain" language="fr" script="Latn">Information géographique</title>
   <uri type="src" language="en" script="Latn">https://www.iso.org/standard/53798.html</uri>
@@ -298,4 +298,4 @@
       <docnumber>456</docnumber>
     </structuredidentifier>
   </ext>
-</bibdata>
+</bibdata>
diff --git a/spec/examples/from_bibtex.xml b/spec/examples/from_bibtex.xml
@@ -1,4 +1,4 @@
-<bibitem id="mrx05" type="article" schema-version="v1.2.4">
+<bibitem id="mrx05" type="article" schema-version="v1.2.5">
   <fetched>2019-12-05</fetched>
   <title type="main" format="text/plain">Something Great</title>
   <title type="main" format="text/plain">Sub title</title>

diff --git a/spec/examples/hash.yml b/spec/examples/hash.yml
@@ -1,5 +1,5 @@
 ---
-schema-version: v1.2.4
+schema-version: v1.2.5
 id: ISOTC211
 title:
 - content: Geographic information