relaton-iso-bib 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a2758475cec25c3c0550c1416f9c2a0ca31434a9ad64bdd20b34bec8c4fd82e
-  data.tar.gz: '0949b8e51c7df831207611ef56a1d65967a140335781b9184b837a849f377c1b'
+  metadata.gz: 7aa41387ffb08a164b4ae2cf353661b669a7e03f447b36930c9bd1ca8d729793
+  data.tar.gz: e319d85c25befe0e0b598e0f4c9fa75bdf31349715b6d5cbbba9c6f5f050fd54
 SHA512:
-  metadata.gz: ea108dbdd61b94fd973b5530bed8aa637cbe2da4c1ea99845d4280d771a11c522652b879e67438822d80a0198075a25c8b04352f7a0ae70af338e63547a15f09
-  data.tar.gz: 0b0e78dcd9728b5e1e1590b9b8fe0d4cbfc9ddfcb9b7a31e23a9df6be071b81f88d5f59cd5ee1ba7e99d9684d7d06dedeb06c6592a9daf02a724d7fac9117510
+  metadata.gz: fbb0f2fd55f2278c01243d9549346871a02766654d414394c0c05758a08932dbe8f36e22d35cf2ef4bf1805284839aaafc58d383fd49c7276f3e18efc9d06df6
+  data.tar.gz: e1ffe78c0d635513c8448e51cffd97c0894296e30097d998e3729c4dbe79e2ec3930f03a94eddf25e025c375a62e1b55eddc554c17d16751ddc3181d12b191fb

data/.rubocop.yml

@@ -2,6 +2,8 @@
 # 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:

data/grammars/basicdoc.rng

@@ -173,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"/>
@@ -624,6 +626,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -634,6 +639,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -641,7 +649,12 @@
   <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>
@@ -822,7 +835,9 @@
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
@@ -835,7 +850,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
@@ -849,7 +866,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">

data/grammars/biblio.rng

@@ -401,9 +401,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>