relaton-bib 1.16.5 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cd83f1b6817d3aff3fb219312882391f32f69a31e1683e6437e48771985b4a2
-  data.tar.gz: ecbc877b14f379f0138470922b4a40feffcec3be4a7d351d50a134108317d73b
+  metadata.gz: a507a7fa74bc5be4e5148c8f80f91dc77a602b356187168d412beb958d30ad67
+  data.tar.gz: 41d821df9469b709f76d98288d6ec80fa0959d3d6e7ab867f08095283ed3eaf9
 SHA512:
-  metadata.gz: 04f486d465f35b8214bc0978a15d47678e26fc2e78d72bb6e3875771af2c480bc21f2cef576a3deee9fb99c72ecec40da6a6826c88cbf81607aba51e84757647
-  data.tar.gz: 17a64cd868fa320959cf44a65e0794273aaf8ba992d36d4bf90bd774b66484d4021dde1285144530892a398d84b955f8aba1774ffdcbc7532d56d60ee6c6c738
+  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

@@ -46,9 +46,12 @@ module RelatonBib
     attr_accessor :all_parts
 
     # @return [String, nil]
-    attr_reader :id, :type, :docnumber, :doctype, :subdoctype
+    attr_reader :id, :type, :docnumber, :subdoctype
 
-    # @return [RelatonBib::Edition, nil] <description>
+    # @return [RelatonBib::DocumentType] document type
+    attr_reader :doctype
+
+    # @return [RelatonBib::Edition, nil] edition
     attr_reader :edition
 
     # @!attribute [r] title
@@ -157,7 +160,7 @@ module RelatonBib
     # @param validity [RelatonBib:Validity, nil]
     # @param fetched [Date, nil] default nil
     # @param keyword [Array<String>]
-    # @param doctype [String]
+    # @param doctype [RelatonBib::DocumentType]
     # @param subdoctype [String]
     # @param editorialgroup [RelatonBib::EditorialGroup, nil]
     # @param ics [Array<RelatonBib::ICS>]
@@ -321,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)
@@ -330,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
 
@@ -421,7 +420,7 @@ module RelatonBib
       hash["fetched"] = fetched.to_s if fetched
       hash["keyword"] = single_element_array(keyword) if keyword&.any?
       hash["license"] = single_element_array(license) if license&.any?
-      hash["doctype"] = doctype if doctype
+      hash["doctype"] = doctype.to_hash if doctype
       hash["subdoctype"] = subdoctype if subdoctype
       if editorialgroup&.presence?
         hash["editorialgroup"] = editorialgroup.to_hash
@@ -576,7 +575,7 @@ module RelatonBib
       end
       out += relation.to_asciibib prefix if relation
       series.each { |s| out += s.to_asciibib prefix, series.size }
-      out += "#{pref}doctype:: #{doctype}\n" if doctype
+      out += doctype.to_asciibib prefix if doctype
       out += "#{pref}subdoctype:: #{subdoctype}\n" if subdoctype
       out += "#{pref}formattedref:: #{formattedref}\n" if formattedref
       keyword.each { |kw| out += kw.to_asciibib "#{pref}keyword", keyword.size }
@@ -639,7 +638,7 @@ module RelatonBib
         elsif opts[:bibdata] && (doctype || editorialgroup || ics&.any? ||
                                  structuredidentifier&.presence?)
           ext = builder.ext do |b|
-            b.doctype doctype if doctype
+            doctype.to_xml b if doctype
             b.subdoctype subdoctype if subdoctype
             editorialgroup&.to_xml b
             ics.each { |i| i.to_xml b }

data/lib/relaton_bib/bibxml_parser.rb

@@ -409,11 +409,12 @@ module RelatonBib
     # @param anchor [String]
     # @return [String]
     def doctype(anchor)
-      case anchor
-      when /I-D/ then "internet-draft"
-      when /IEEE/ then "ieee"
-      else "rfc"
-      end
+      type =  case anchor
+              when /I-D/ then "internet-draft"
+              when /IEEE/ then "ieee"
+              else "rfc"
+              end
+      DocumentType.new type: type
     end
 
     extend BibXMLParser

data/lib/relaton_bib/document_type.rb

@@ -0,0 +1,52 @@
+module RelatonBib
+  class DocumentType
+    attr_reader :type, :abbreviation
+
+    #
+    # Initialize a DocumentType.
+    #
+    # @param [String] type document type
+    # @param [String, nil] abbreviation type abbreviation
+    #
+    def initialize(type:, abbreviation: nil)
+      @type = type
+      @abbreviation = abbreviation
+    end
+
+    #
+    # Build XML representation of the document type.
+    #
+    # @param [Nokogiri::XML::Builder] builder XML builder
+    #
+    def to_xml(builder)
+      xml = builder.doctype @type
+      xml[:abbreviation] = @abbreviation if @abbreviation
+    end
+
+    #
+    # Hash representation of the document type.
+    #
+    # @return [Hash]
+    #
+    def to_hash
+      hash = { "type" => @type }
+      hash["abbreviation"] = @abbreviation if @abbreviation
+      hash
+    end
+
+    #
+    # Asciibib representation of the document type.
+    #
+    # @param [String] prefix prefix
+    #
+    # @return [String] AsciiBib representation
+    #
+    def to_asciibib(prefix = "")
+      pref = prefix.empty? ? prefix : prefix + "."
+      pref += "doctype."
+      out = "#{pref}type:: #{@type}\n"
+      out += "#{pref}abbreviation:: #{@abbreviation}\n" if @abbreviation
+      out
+    end
+  end
+end