metanorma-ogc 2.0.2 → 2.0.3

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -166,7 +166,6 @@ module IsoDoc
       def block(docxml)
         super
         recommendation_to_table(docxml)
-        ol docxml
       end
 
       def section(docxml)
@@ -213,16 +212,12 @@ module IsoDoc
           doctype.children = "technical-paper"
       end
 
-      def ol(docxml)
-        docxml.xpath(ns("//ol")).each { |f| ol1(f) }
-      end
-
-      def ol1(elem)
-        return unless elem["class"] == "steps"
+      def ol_depth(node)
+        return super unless node["class"] == "steps" ||
+          node.at(".//ancestor::xmlns:ol[@class = 'steps']")
 
-        idx = elem.xpath("./ancestor-or-self::xmlns:ol[@class = 'steps']").size
-        elem["type"] = %w(arabic alphabet roman alphabet_upper
-                          roman_upper)[(idx - 1) % 5]
+        idx = node.xpath("./ancestor-or-self::xmlns:ol[@class = 'steps']").size
+        %i(arabic alphabet roman alphabet_upper roman_upper)[(idx - 1) % 5]
       end
 
       def termsource1(elem)

data/lib/metanorma/ogc/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"/>

data/lib/metanorma/ogc/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639