relaton-iso-bib 1.7.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c9c23ffe34d6c88e2c4ad97f693507a6f5a19df868c2d3dffc7f4170ed1f245
-  data.tar.gz: b1e42d7f8c70e44aa7c8e9ea6a9e4dab84343a6a4b98d92bb12450ab0d97b2ea
+  metadata.gz: 7aa41387ffb08a164b4ae2cf353661b669a7e03f447b36930c9bd1ca8d729793
+  data.tar.gz: e319d85c25befe0e0b598e0f4c9fa75bdf31349715b6d5cbbba9c6f5f050fd54
 SHA512:
-  metadata.gz: 0b66cc94883fcc30a72eb92649d48fb1145ec7536bfbcf31c5c4339cf61617e49f64102a79e64350bf656b592db6874ac655ca9042bb6227ef88126ecc215ec4
-  data.tar.gz: 344ceb897089bc97ba601c9ab9aa009c419a9c218ff9331a7cebd5034cebdf1d9170280fcb6afab8f1dbb15d78ea7a307ffdc303cda6750a2c99a89ce6dbf285
+  metadata.gz: fbb0f2fd55f2278c01243d9549346871a02766654d414394c0c05758a08932dbe8f36e22d35cf2ef4bf1805284839aaafc58d383fd49c7276f3e18efc9d06df6
+  data.tar.gz: e1ffe78c0d635513c8448e51cffd97c0894296e30097d998e3729c4dbe79e2ec3930f03a94eddf25e025c375a62e1b55eddc554c17d16751ddc3181d12b191fb

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@v2
         with:

data/.rubocop.yml

@@ -2,9 +2,11 @@
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
 
+require: rubocop-rails
+
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 Rails:
   Enabled: false

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/grammars/basicdoc.rng

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng"/>
-  <start>
-    <ref name="document"/>
-  </start>
+  <include href="biblio.rng">
+    <start>
+      <ref name="document"/>
+    </start>
+  </include>
   <define name="document">
     <element name="document">
       <optional>
@@ -43,13 +44,16 @@
       </attribute>
     </optional>
     <optional>
-      <ref name="section-title"/>
+      <attribute name="language"/>
     </optional>
     <optional>
-      <ref name="BasicBlock"/>
+      <attribute name="script"/>
+    </optional>
+    <optional>
+      <ref name="section-title"/>
     </optional>
     <zeroOrMore>
-      <ref name="note"/>
+      <ref name="BasicBlock"/>
     </zeroOrMore>
   </define>
   <define name="references">
@@ -92,6 +96,10 @@
       <ref name="example"/>
       <ref name="review"/>
       <ref name="pre"/>
+      <ref name="note"/>
+      <ref name="pagebreak"/>
+      <ref name="hr"/>
+      <ref name="bookmark"/>
     </choice>
   </define>
   <define name="paragraph">
@@ -165,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>
@@ -188,6 +198,14 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
+      <optional>
+        <attribute name="inequality">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <ref name="stem"/>
       <optional>
         <ref name="dl"/>
@@ -241,6 +259,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <attribute name="lang"/>
       </optional>
@@ -266,6 +287,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>
@@ -285,9 +309,15 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="summary"/>
+      </optional>
       <optional>
         <attribute name="uri">
           <data type="anyURI"/>
@@ -313,12 +343,16 @@
   </define>
   <define name="tname">
     <element name="name">
-      <text/>
-    </element>
-  </define>
-  <define name="tclass">
-    <element name="name">
-      <text/>
+      <oneOrMore>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="stem"/>
+          <ref name="keyword"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="thead">
@@ -370,6 +404,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -397,6 +441,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -417,6 +471,12 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
+      <optional>
+        <ref name="tname"/>
+      </optional>
       <oneOrMore>
         <choice>
           <ref name="formula"/>
@@ -481,17 +541,25 @@
         </attribute>
       </optional>
       <optional>
-        <ref name="source"/>
+        <attribute name="subsequence"/>
       </optional>
       <optional>
-        <ref name="tname"/>
+        <attribute name="class"/>
       </optional>
       <optional>
-        <ref name="tclass"/>
+        <ref name="source"/>
+      </optional>
+      <optional>
+        <ref name="tname"/>
       </optional>
       <choice>
         <ref name="image"/>
+        <ref name="video"/>
+        <ref name="audio"/>
         <ref name="pre"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </oneOrMore>
         <zeroOrMore>
           <ref name="figure"/>
         </zeroOrMore>
@@ -529,6 +597,8 @@
       <ref name="pagebreak"/>
       <ref name="bookmark"/>
       <ref name="image"/>
+      <ref name="index"/>
+      <ref name="index-xref"/>
     </choice>
   </define>
   <define name="PureTextElement">
@@ -553,21 +623,38 @@
   <define name="em">
     <element name="em">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
   <define name="strong">
     <element name="strong">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -653,6 +740,65 @@
       <empty/>
     </element>
   </define>
+  <define name="index">
+    <element name="index">
+      <optional>
+        <attribute name="to">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
+      <element name="primary">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
+      <optional>
+        <element name="secondary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="tertiary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="index-xref">
+    <element name="index-xref">
+      <attribute name="also">
+        <data type="boolean"/>
+      </attribute>
+      <element name="primary">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
+      <optional>
+        <element name="secondary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="tertiary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
+      <element name="target">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
+    </element>
+  </define>
   <!-- bare ID element, used for referencing arbitrary spans of text -->
   <define name="bookmark">
     <element name="bookmark">
@@ -689,7 +835,9 @@
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
@@ -702,7 +850,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
@@ -716,7 +866,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">
@@ -778,6 +930,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
@@ -786,7 +941,7 @@
     </element>
   </define>
   <define name="video">
-    <element name="image">
+    <element name="video">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -816,6 +971,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
@@ -827,7 +985,7 @@
     </element>
   </define>
   <define name="audio">
-    <element name="image">
+    <element name="audio">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -841,6 +999,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
@@ -925,6 +1086,9 @@
           <value>alphabet_upper</value>
         </choice>
       </attribute>
+      <optional>
+        <attribute name="start"/>
+      </optional>
       <oneOrMore>
         <ref name="li"/>
       </oneOrMore>

data/grammars/biblio.rng

@@ -124,7 +124,7 @@
           <value>application/tei+xml</value>
           <value>text/x-asciidoc</value>
           <value>text/markdown</value>
-          <value>application/x-isodoc+xml</value>
+          <value>application/x-metanorma+xml</value>
           <text/>
         </choice>
       </attribute>
@@ -401,9 +401,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>
@@ -452,6 +452,7 @@
       <attribute name="type">
         <choice>
           <value>isni</value>
+          <value>orcid</value>
           <value>uri</value>
         </choice>
       </attribute>
@@ -461,10 +462,7 @@
   <define name="org-identifier">
     <element name="identifier">
       <attribute name="type">
-        <choice>
-          <value>orcid</value>
-          <value>uri</value>
-        </choice>
+        <data type="string" datatypeLibrary=""/>
       </attribute>
       <text/>
     </element>
@@ -789,6 +787,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">
@@ -1106,7 +1105,7 @@
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>
-      <value>cited</value>
+      <value>cites</value>
       <value>isCitedIn</value>
     </choice>
   </define>