metanorma-ietf 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cdde2dd756f4b98e9e1ad918916b0fc983ced8c3917f5c365394d03b2e5510b
-  data.tar.gz: d53d5c9fadfd23fa1d9f5c400c66ecc003643e519937063180cd9574daa5cd76
+  metadata.gz: 4c4621a18fe484fb098aab72221f43765c0ae8e4d91ffd1d0319e8d894acd7aa
+  data.tar.gz: 2ff2fd68a116943e119e190267372a1e243cf20253ec6fde2a9a6ea6d91d35f8
 SHA512:
-  metadata.gz: 76de6e92a10f1a8789557d2543eda42acda12f0002e48738a7b38502eb21ec7e3927aa2a2acbc536ac5b2353ce62b32817b30ca0588c880bf72a8248c7df8076
-  data.tar.gz: 4141c256ce2b15729296f48852d42a8b0194f58b83978bb1cb2c72c2c04613ed07a9c6d1346999e96e86a99ba120ef029b85b62ae4c8e268bbadf5bd022c9afe
+  metadata.gz: 755749c0a269c0b018b93a02c2c502efde5781aa799ab07f2031ece79d88c87845d512801df2f1f4ae45b46e0fa0909107eaf52a74a11b69853d9e6eb6619bb4
+  data.tar.gz: 880c92cd6b26b25a9fc40e5f2c991fd18100bd0fff7e9c10ac7ca99a0dbc1fcb6fa6fc3543863d3c0739e3c2affe4488703c0c741d6bf34b1a5f88fffa09533a

data/Gemfile

@@ -10,4 +10,4 @@ if File.exist? 'Gemfile.devel'
   eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
 end
 
-gem "metanorma-cli"
+#gem "metanorma-cli"

data/lib/asciidoctor/ietf/biblio.rng

@@ -661,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -1021,7 +1021,17 @@
       <optional>
         <ref name="to"/>
       </optional>
-      <ref name="owner"/>
+      <oneOrMore>
+        <ref name="owner"/>
+      </oneOrMore>
+      <optional>
+        <ref name="copyright_scope"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright_scope">
+    <element name="scope">
+      <text/>
     </element>
   </define>
   <define name="from">

data/lib/asciidoctor/ietf/isodoc.rng

@@ -53,6 +53,14 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="case">
+            <choice>
+              <value>capital</value>
+              <value>lowercase</value>
+            </choice>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -902,7 +910,15 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termexample">

data/lib/isodoc/ietf/front.rb

@@ -19,7 +19,6 @@ module IsoDoc::Ietf
     end
 
     def info(isoxml, out)
-      @meta.keywords isoxml, out
       @meta.areas isoxml, out
       super
     end

data/lib/isodoc/ietf/metadata.rb

@@ -19,14 +19,6 @@ module IsoDoc
         # = item describedby convertedfrom alternate
       end
 
-      def keywords(isoxml, _out)
-        ret = []
-        isoxml.xpath(ns("//bibdata/keyword")).each do |kw|
-          ret << kw.text
-        end
-        set(:keywords, ret)
-      end
-
       def areas(isoxml, _out)
         ret = []
         isoxml.xpath(ns("//bibdata/ext/area")).each do |kw|
@@ -45,18 +37,18 @@ module IsoDoc
         wg(xml)
       end
 
-       def wg(xml)
-         workgroups = []
-         xml.xpath(ns("//bibdata/ext/editorialgroup/workgroup")).each do |wg|
-           workgroups << wg.text
+      def wg(xml)
+        workgroups = []
+        xml.xpath(ns("//bibdata/ext/editorialgroup/workgroup")).each do |wg|
+          workgroups << wg.text
         end
-         set(:wg, workgroups)
+        set(:wg, workgroups)
       end
 
-       def doctype(isoxml, _out)
-         super
-         set(:doctype, "Rfc") if get[:doctype].nil?
-       end
+      def doctype(isoxml, _out)
+        super
+        set(:doctype, "Rfc") if get[:doctype].nil?
+      end
     end
   end
 end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-   VERSION = "2.0.11".freeze
+   VERSION = "2.0.12".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 1.3.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
   spec.add_dependency "isodoc", "~> 1.0.0"
   spec.add_dependency "mathml2asciimath"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement