version bump

metanorma · Sep 6, 2022 · 76674e7 · 76674e7
1 parent 55f3f65
commit 76674e7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/lib/metanorma-ribose.rb b/lib/metanorma-ribose.rb
@@ -7,8 +7,9 @@
 require_relative "isodoc/ribose/presentation_xml_convert"
 require_relative "isodoc/ribose/xref"
 require_relative "metanorma/ribose/version"
+require "metanorma"
 
-if defined? Metanorma
+if defined? Metanorma::Registry
   require_relative "metanorma/ribose"
   Metanorma::Registry.instance.register(Metanorma::Ribose::Processor)
 end
diff --git a/lib/metanorma/ribose/biblio.rng b/lib/metanorma/ribose/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>

diff --git a/lib/metanorma/ribose/version.rb b/lib/metanorma/ribose/version.rb
@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "2.1.7".freeze
+    VERSION = "2.1.8".freeze
   end
 end