relaton-bib 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f5805d9364d7a5f74ce37acdeb99ea547d928d276541ec7d01870621330f2f1
-  data.tar.gz: 2aff2d7bd6fca3bb87a34509a7b61995f3dcd0eb4bdb68b60e940887eedc4c78
+  metadata.gz: a507a7fa74bc5be4e5148c8f80f91dc77a602b356187168d412beb958d30ad67
+  data.tar.gz: 41d821df9469b709f76d98288d6ec80fa0959d3d6e7ab867f08095283ed3eaf9
 SHA512:
-  metadata.gz: 7c061fc2df92d1c1418aa9a807e496ec736eec5eddfe5734ce0bdcc3c21995c3abd22fbc9162383f2370a7546f7836b325732f92bbc65ae9484124740cf5f406
-  data.tar.gz: 21c72729a63efff9cf5a312018206b22a8da1a77e4708e27610b2c92c8a4571c0a1cb5b0af973eb5285b4e0fb111353e73499ef00bee45d40cbce7cdc5d7d0f2
+  metadata.gz: 0d1daace14ed81e05633e2340d26c1f591afcb8d5ea8b742c3cabe66e74f92def40966a20fadbd182b1b4808e6cbfa3cae9f1abb3dd40035ad2c2bc118392d85
+  data.tar.gz: a08ae4ae1f9c3563c242d8940172cf44bd23e182237b39d91a37f572719694695bbaf9b5805bfcafb76e201eaead8506a8bd878ec8f0aed7722c7d6815e19441

data/grammars/basicdoc.rng

@@ -914,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/grammars/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,21 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -752,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>

data/grammars/versions.json

@@ -1,8 +1,8 @@
 {
-"relaton-models": "v1.2.5",
+"relaton-models": "v1.2.7",
 "basicdoc-models": "v1.0.3",
 "metanorma-requirements-models": "v1.0.0",
-"relaton-model-ieee": "v1.0.0",
+"relaton-model-ieee": "v1.0.1",
 "relaton-model-iso": "v1.0.0",
 "relaton-model-iec": "v1.0.0",
 "relaton-model-bsi": "v1.0.2",
@@ -28,7 +28,7 @@
 "relaton-model-omg": "v1.0.0",
 "relaton-model-oasis": "v1.0.1",
 "relaton-model-jis": "v0.0.1",
-"relaton-model-etsi": "v0.0.1",
-"metanorma-model": "v1.2.8",
-"date": "2023-11-13T23:08:26Z"
+"relaton-model-etsi": "v0.0.3",
+"metanorma-model": "v1.2.9",
+"date": "2023-12-02T16:19:25Z"
 }

data/lib/relaton_bib/bibliographic_item.rb

@@ -324,7 +324,7 @@ module RelatonBib
       end
     end
 
-    # @param identifier [RelatonBib::DocumentIdentifier]
+    # @param identifier [RelatonBib::DocumentIdentifier, nil]
     # @param attribute [Boolean, nil]
     # @return [String]
     def makeid(identifier, attribute)
@@ -333,11 +333,7 @@ module RelatonBib
       identifier ||= @docidentifier.reject { |i| i.type == "DOI" }[0]
       return unless identifier
 
-      # contribs = publishers.map { |p| p&.entity&.abbreviation }.join '/'
-      # idstr = "#{contribs}#{delim}#{id.project_number}"
-      # idstr = id.project_number.to_s
-      idstr = identifier.id.gsub(/[:\/]/, "-").gsub(/\s/, "")
-      # if id.part_number&.size&.positive? then idstr += "-#{id.part_number}"
+      idstr = identifier.id.gsub(/[:\/]/, "-").gsub(/[\s\(\)]/, "")
       idstr.strip
     end
 

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.17.0".freeze
+  VERSION = "1.17.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable