metanorma-ietf 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 158e5eef3f87d8f6ce1242339d819343ea8b8ab744f522eafb9c7f16e20f6c55
-  data.tar.gz: '089428469df3542fa94fcb535aa54d0a899b74b3aea35567239f5a24b4525366'
+  metadata.gz: 7a12328cf063937699b9e4713e4f02ecb83baed14af90b6cb8c05e44d68361f0
+  data.tar.gz: e89e8c1aa57a7341298ac5a3b01c17ecdab3ed746e9fcb915730dade6a8241db
 SHA512:
-  metadata.gz: 33db0a9a909d0253f3b91fed431e7194c53abab8ae396cea3a6944bcc56d1f2fbade0c79444d7b5d87deeab75a8e33ed1771e574a21fbf77884d9052a3b69a30
-  data.tar.gz: 9217f91cfb840cafb5dcdda4520dfcf378634d568960a02580760fd182f0d7f4f47f23b90b143aeff3209135fc62e3c782eb5d6383b39932149666cbbdc3d7c9
+  metadata.gz: 3279c11e5298c25e7fd5d45d441416156bbf051791cd8883675c101a1b153455c01a3b14b62cd341f29fb3c2be0c58b2273eeb501dfa7dd5e1e56d7388941c19
+  data.tar.gz: 6662f000dadd312542ba8e57023237bfd9036055df0c53c235fcc0dc7b7ac8b131023139fa4c029d27d5a4d0ea7929f0a2850dd3a1d747f57cd3b50cf2dbcd12

data/.rubocop.yml

@@ -7,4 +7,4 @@ inherit_from:
 # ...
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5

data/lib/isodoc/ietf/cleanup.rb

@@ -48,6 +48,17 @@ module IsoDoc::Ietf
       figure_postamble(docxml)
       figure_unnest(docxml)
       figure_footnote_cleanup(docxml)
+      figure_data_uri(docxml)
+    end
+
+    def figure_data_uri(docxml)
+      docxml.xpath("//artwork").each do |a|
+        next unless %r{^data:image/svg\+xml;base64}.match?(a["src"])
+
+        f = Metanorma::Utils::save_dataimage(a["src"])
+        a.delete("src")
+        a.children = File.read(f).sub(%r{<\?.+\?>}, "")
+      end
     end
 
     def figure_unnest(docxml)
@@ -133,7 +144,7 @@ module IsoDoc::Ietf
         docxml << "<back/>" and endnotes = docxml.at("//back")
       end
       endnotes << "<section><name>Endnotes</name></section>"
-      endnotes = docxml.at("//back/section[last()]")
+      docxml.at("//back/section[last()]")
     end
 
     def image_cleanup(docxml)
@@ -153,13 +164,13 @@ module IsoDoc::Ietf
         s.children = s.children.to_xml.gsub(%r{<br/>\n}, "\n")
           .gsub(%r{\s+(<t[ >])}, "\\1").gsub(%r{</t>\s+}, "</t>")
         sourcecode_remove_markup(s)
-        text = HTMLEntities.new.decode(s.children.to_xml.sub(/\A\n+/, ""))
-        s.children = "<![CDATA[#{text}]]>"
+        s.children = "<![CDATA[#{HTMLEntities.new.decode(s
+        .children.to_xml.sub(/\A\n+/, ''))}]]>"
       end
     end
 
-    def sourcecode_remove_markup(s)
-      s.traverse do |n|
+    def sourcecode_remove_markup(node)
+      node.traverse do |n|
         next if n.text?
         next if %w(name callout annotation note sourcecode).include? n.name
 

data/lib/isodoc/ietf/references.rb

@@ -3,6 +3,9 @@ module IsoDoc::Ietf
     # TODO displayreference will be implemented as combination of autofetch and user-provided citations
 
     def bibliography(isoxml, out)
+      isoxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
+        i.children = docid_prefix(i["type"], i.text)
+      end
       isoxml.xpath(ns("//bibliography/references | "\
                       "//bibliography/clause[.//references] | "\
                       "//annex/clause[.//references] | "\
@@ -31,22 +34,21 @@ module IsoDoc::Ietf
       i = 0
       f.xpath(ns("./bibitem | ./note")).each do |b|
         next if implicit_reference(b)
+
         i += 1 if b.name == "bibitem"
         if b.name == "note" then note_parse(b, div)
-        elsif(is_ietf(b)) then ietf_bibitem_entry(div, b, i)
+        elsif is_ietf(b) then ietf_bibitem_entry(div, b, i)
         else
           nonstd_bibitem(div, b, i, biblio)
         end
       end
     end
 
-    def nonstd_bibitem(list, b, ordinal, bibliography)
+    def nonstd_bibitem(list, b, _ordinal, _bibliography)
       uris = b.xpath(ns("./uri"))
       target = nil
       uris&.each do |u|
-        if u["type"] == "src" then
-          target = u.text
-        end
+        target = u.text if u["type"] == "src"
       end
       list.reference **attr_code(target: target,
                                  anchor: b["id"]) do |r|
@@ -66,7 +68,8 @@ module IsoDoc::Ietf
           r.refcontent id[1]
         docidentifiers&.each do |u|
           if %w(DOI IETF).include? u["type"]
-            r.seriesInfo nil, **attr_code(value: u.text, name: u["type"])
+            r.seriesInfo nil, **attr_code(value: u.text.sub(/^DOI /, ""),
+                                          name: u["type"])
           end
         end
       end
@@ -86,7 +89,7 @@ module IsoDoc::Ietf
                                           "'publisher']"))
       auths.each do |a|
         role = a.at(ns("./role[@type = 'editor']")) ? "editor" : nil
-        p = a&.at(ns("./person/name")) and 
+        p = a&.at(ns("./person/name")) and
           relaton_person_to_author(p, role, f) or
           relaton_org_to_author(a&.at(ns("./organization")), role, f)
       end
@@ -99,17 +102,17 @@ module IsoDoc::Ietf
         p&.xpath(ns("./forename"))&.map { |i| i.text[0] }&.join(" ")
       initials = nil if initials.empty?
       f.author nil,
-        **attr_code(fullname: fullname, asciiFullname: fullname&.transliterate,
-                    role: role, surname: surname, initials: initials,
-                    asciiSurname: fullname ? surname&.transliterate : nil,
-                    asciiInitials: fullname ? initials&.transliterate : nil)
+               **attr_code(fullname: fullname, asciiFullname: fullname&.transliterate,
+                           role: role, surname: surname, initials: initials,
+                           asciiSurname: fullname ? surname&.transliterate : nil,
+                           asciiInitials: fullname ? initials&.transliterate : nil)
     end
 
-    def relaton_org_to_author(o, role, f)
+    def relaton_org_to_author(o, _role, f)
       name = o&.at(ns("./name"))&.text
       abbrev = o&.at(ns("./abbreviation"))&.text
-      f.author do |a|
-        f.organization name, **attr_code(ascii: name&.transliterate, 
+      f.author do |_a|
+        f.organization name, **attr_code(ascii: name&.transliterate,
                                          abbrev: abbrev)
       end
     end
@@ -119,6 +122,7 @@ module IsoDoc::Ietf
         b.at(ns("./date[@type = 'issued']")) ||
         b.at(ns("./date[@type = 'circulated']"))
       return unless date
+
       attr = date_attr(date&.at(ns("./on | ./from"))&.text) || return
       f.date **attr_code(attr)
     end
@@ -145,13 +149,14 @@ module IsoDoc::Ietf
       end
     end
 
-    def ietf_bibitem_entry(div, b, i)
+    def ietf_bibitem_entry(div, b, _i)
       url = b&.at(ns("./uri[@type = 'xml']"))&.text
       div << "<xi:include href='#{url}'/>"
     end
 
     def is_ietf(b)
       return false if !@xinclude
+
       url = b.at(ns("./uri[@type = 'xml']")) or return false
       /xml2rfc\.tools\.ietf\.org/.match(url)
     end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "2.3.3".freeze
+    VERSION = "2.3.4".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "isodoc", "~> 1.6.0"
   spec.add_dependency "mathml2asciimath"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc
@@ -320,7 +320,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="