metanorma-itu 2.1.6 → 2.1.8.1

data/lib/isodoc/itu/ref.rb

@@ -9,7 +9,7 @@ module IsoDoc
         list.tr **attr_code(iso_bibitem_entry_attrs(bibitem, biblio)) do |ref|
           id = render_identifier(bibitem_ref_code(bibitem))
           ref.td **{ style: "vertical-align:top" } do |td|
-            td << (id[:metanorma] || "[#{id[:sdo]}]")
+            td << pick_ident(id)
               &.gsub(/-/, "&#x2011;")&.gsub(/ /, "&#xa0;")
             date_note_process(bibitem, td)
           end
@@ -17,6 +17,14 @@ module IsoDoc
         end
       end
 
+      def pick_ident(id)
+        return id[:metanorma] if id[:metanorma]
+        return "[#{id[:sdo]}]" if id[:sdo]
+        return id[:ordinal] if id[:ordinal]
+
+        ""
+      end
+
       def std_bibitem_entry(list, bibitem, ordinal, biblio)
         nonstd_bibitem(list, bibitem, ordinal, biblio)
       end
@@ -73,7 +81,8 @@ module IsoDoc
         id = bibitem.xpath(ns("./docidentifier[not(@type = 'metanorma' or "\
                               "#{IGNORE_IDS})]"))
         id.empty? and
-          id = bibitem.xpath(ns("./docidentifier[not(@type = 'metanorma')]"))
+          id = bibitem.xpath(ns("./docidentifier[not(@type = 'metanorma' or "\
+                                "@type = 'metanorma-ordinal')]"))
         return [] if id.empty?
 
         id.sort_by { |i| i["type"] == "ITU" ? 0 : 1 }

data/lib/metanorma/itu/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.1.6".freeze
+    VERSION = "2.1.8.1".freeze
   end
 end

data/lib/metanorma-itu.rb

@@ -1,7 +1,8 @@
 require "metanorma/itu"
 require "asciidoctor"
 require "isodoc/itu"
+require "metanorma"
 
-if defined? Metanorma
+if defined? Metanorma::Registry
   Metanorma::Registry.instance.register(Metanorma::ITU::Processor)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.8.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -258,6 +258,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -342,7 +343,7 @@ homepage: https://github.com/metanorma/metanorma-itu
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -357,8 +358,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Metanorma for the ITU
 test_files: []