metanorma-ietf 2.3.0 → 2.3.5

data/lib/isodoc/ietf/blocks.rb

@@ -43,7 +43,7 @@ module IsoDoc::Ietf
     end
 
     def ol_attrs(node)
-      { anchor: node["id"], 
+      { anchor: node["id"],
         spacing: node["spacing"],
         type: ol_style(node["type"]),
         group: node["group"],
@@ -75,6 +75,7 @@ module IsoDoc::Ietf
       n = @xrefs.get[node["id"]]
       return l10n("#{@i18n.note}: ") if n.nil? || n[:label].nil? ||
         n[:label].empty?
+
       l10n("#{@i18n.note} #{n[:label]}: ")
     end
 
@@ -99,7 +100,7 @@ module IsoDoc::Ietf
     def example_label(node, div, name)
       n = @xrefs.get[node["id"]]
       div.t **attr_code(anchor: node["id"], keepWithNext: "true") do |p|
-        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @i18n.example :
+        lbl = n.nil? || n[:label].nil? || n[:label].empty? ? @i18n.example :
           l10n("#{@i18n.example} #{n[:label]}")
         p << lbl
         name and !lbl.nil? and p << ": "
@@ -110,9 +111,10 @@ module IsoDoc::Ietf
     def sourcecode_parse(node, out)
       out.sourcecode **attr_code(
         anchor: node["id"], type: node["lang"], name: node["filename"],
-        markers: node["markers"], src: node["src"]) do |s|
-          node.children.each { |x| parse(x, s) unless x.name == "name" }
-        end
+        markers: node["markers"], src: node["src"]
+      ) do |s|
+        node.children.each { |x| parse(x, s) unless x.name == "name" }
+      end
     end
 
     def pre_parse(node, out) 
@@ -135,6 +137,7 @@ module IsoDoc::Ietf
 
     def formula_where(dl, out)
       return unless dl
+
       out.t { |p| p << @i18n.where }
       parse(dl, out)
     end
@@ -142,7 +145,7 @@ module IsoDoc::Ietf
     def formula_parse1(node, out)
       out.t **attr_code(anchor: node["id"]) do |p|
         parse(node.at(ns("./stem")), p)
-        lbl = @xrefs.anchor(node['id'], :label, false)
+        lbl = @xrefs.anchor(node["id"], :label, false)
         lbl.nil? or
           p << "    (#{lbl})"
       end
@@ -153,6 +156,7 @@ module IsoDoc::Ietf
       formula_where(node.at(ns("./dl")), out)
       node.children.each do |n|
         next if %w(stem dl).include? n.name
+
         parse(n, out)
       end
     end
@@ -172,7 +176,7 @@ module IsoDoc::Ietf
     end
 
     def admonition_name_parse(_node, div, name)
-      div.t **{keepWithNext: "true" } do |p|
+      div.t **{ keepWithNext: "true" } do |p|
         name.children.each { |n| parse(n, p) }
       end
     end
@@ -196,8 +200,9 @@ module IsoDoc::Ietf
       end
     end
 
-    def figure_name_parse(node, div, name)
+    def figure_name_parse(_node, div, name)
       return if name.nil?
+
       div.name do |n|
         name.children.each { |n| parse(n, div) }
       end
@@ -210,6 +215,7 @@ module IsoDoc::Ietf
     def figure_parse(node, out)
       return pseudocode_parse(node, out) if node["class"] == "pseudocode" ||
         node["type"] == "pseudocode"
+
       @in_figure = true
       out.figure **attr_code(anchor: node["id"]) do |div|
         figure_name_parse(node, div, node.at(ns("./name")))

data/lib/isodoc/ietf/cleanup.rb

@@ -15,14 +15,14 @@ module IsoDoc::Ietf
     end
 
     # TODO: insert <u>
-    
+
     def front_cleanup(xmldoc)
-        xmldoc.xpath("//title").each { |s| s.children = s.text }
-        xmldoc.xpath("//reference/front[not(author)]").each do |f|
-          insert = f.at("./seriesInfo[last()]") || f.at("./title")
-          insert.next = "<author surname='Unknown'/>"
-        end
+      xmldoc.xpath("//title").each { |s| s.children = s.text }
+      xmldoc.xpath("//reference/front[not(author)]").each do |f|
+        insert = f.at("./seriesInfo[last()]") || f.at("./title")
+        insert.next = "<author surname='Unknown'/>"
       end
+    end
 
     def table_footnote_cleanup(docxml)
       docxml.xpath("//table[descendant::fn]").each do |t|
@@ -48,15 +48,28 @@ 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)
       docxml.xpath("//figure[descendant::figure]").each do |f|
         insert = f
         f.xpath(".//figure").each do |a|
+          title = f.at("./name") and a.children.first.previous = title.remove
           insert.next = a.remove
           insert = insert.next_element
         end
+        f.remove
       end
     end
 
@@ -126,10 +139,12 @@ module IsoDoc::Ietf
 
     def make_endnotes(docxml)
       return unless docxml.at("//fn")
-      endnotes = docxml.at("//back") or
-      docxml << "<back/>" and endnotes = docxml.at("//back")
+
+      unless endnotes = docxml.at("//back")
+        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)
@@ -138,7 +153,7 @@ module IsoDoc::Ietf
         t.xpath(".//artwork").each_with_index do |a, i|
           insert.next = a.dup
           insert = insert.next
-          a.replace("[IMAGE #{i+1}]")
+          a.replace("[IMAGE #{i + 1}]")
         end
       end
     end
@@ -146,20 +161,22 @@ module IsoDoc::Ietf
     # for markup in pseudocode
     def sourcecode_cleanup(docxml)
       docxml.xpath("//sourcecode").each do |s|
-        s.children = s.children.to_xml.gsub(%r{<br/>\n}, "\n").
-          gsub(%r{\s+(<t[ >])}, "\\1").gsub(%r{</t>\s+}, "</t>")
+        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
-        if n.name == "br" then n.replace("\n")
-        elsif n.name == "t" then n.replace("\n\n#{n.children}")
+
+        case n.name
+        when "br" then n.replace("\n")
+        when "t" then n.replace("\n\n#{n.children}")
         else
           n.replace(n.children)
         end
@@ -169,6 +186,7 @@ module IsoDoc::Ietf
     def annotation_cleanup(docxml)
       docxml.xpath("//reference").each do |r|
         next unless r&.next_element&.name == "aside"
+
         aside = r.next_element
         aside.name = "annotation"
         aside.traverse do |n|
@@ -176,7 +194,7 @@ module IsoDoc::Ietf
         end
         r << aside
       end
-      docxml.xpath("//references/aside").each { |r| r.remove }
+      docxml.xpath("//references/aside").each(&:remove)
     end
 
     def deflist_cleanup(docxml)
@@ -203,9 +221,7 @@ module IsoDoc::Ietf
     end
 
     def bookmark_cleanup(docxml)
-      docxml.xpath("//bookmark").each do |b|
-        b.remove
-      end
+      docxml.xpath("//bookmark").each(&:remove)
     end
 
     def aside_cleanup(docxml)

data/lib/isodoc/ietf/front.rb

@@ -25,10 +25,11 @@ module IsoDoc::Ietf
 
     def output_if_translit(text)
       return nil if text.nil?
+
       text.transliterate != text ? text.transliterate : nil
     end
 
-    def title(isoxml, front)
+    def title(_isoxml, front)
       title = @meta.get[:doctitle] or return
       front.title title, **attr_code(abbrev: @meta.get[:docabbrev],
                                      ascii: (@meta.get[:docascii] ||
@@ -49,18 +50,20 @@ module IsoDoc::Ietf
     end
 
     def rfc_seriesinfo(isoxml, front)
-      front.seriesInfo **seriesinfo_attr(isoxml).merge({name: "RFC",
-                                                        asciiName: "RFC"})
+      front.seriesInfo **seriesinfo_attr(isoxml).merge({ name: "RFC",
+                                                         asciiName: "RFC" })
       i = isoxml&.at(ns("//bibdata/series[@type = 'intended']")) and
         front.seriesInfo nil,
-        **attr_code(name: "", status: i&.at(ns("./title"))&.text,
-                    value: i&.at(ns("./number"))&.text || "")
+                         **attr_code(name: "",
+                                     status: i&.at(ns("./title"))&.text,
+                                     value: i&.at(ns("./number"))&.text || "")
     end
 
     def id_seriesinfo(isoxml, front)
       front.seriesInfo nil,
-        **seriesinfo_attr(isoxml).merge({name: "Internet-Draft",
-                                         asciiName: "Internet-Draft"})
+                       **seriesinfo_attr(isoxml)
+                         .merge({ name: "Internet-Draft",
+                                  asciiName: "Internet-Draft" })
       i = isoxml&.at(ns("//bibdata/series[@type = 'intended']/title"))&.text and
         front.seriesInfo **attr_code(name: "", value: "", status: i)
     end
@@ -74,44 +77,49 @@ module IsoDoc::Ietf
       end
     end
 
-    def person_author_attrs(c, role)
-      return {} if c.nil?
-      full = c&.at(ns("./completename"))&.text
-      init = c&.at(ns("./initial"))&.text ||
-        c&.xpath(ns("./forename")).map { |n| n.text[0] }.join(".")
+    def person_author_attrs(contrib, role)
+      return {} if contrib.nil?
+
+      full = contrib&.at(ns("./completename"))&.text
+      init = contrib&.at(ns("./initial"))&.text ||
+        contrib&.xpath(ns("./forename"))&.map { |n| n.text[0] }&.join(".")
       init = nil if init.empty?
       ret = attr_code(role: role, fullname: full, initials: init,
-                      surname: c&.at(ns("./surname"))&.text)
-      pers_author_attrs1(ret, full, init, c)
-    end
-
-    def pers_author_attrs1(ret, full, init, c)
-      full and ret.merge!(attr_code(
-        asciiFullname: output_if_translit(full),
-        asciiInitials: output_if_translit(init),
-        asciiSurname: output_if_translit(c&.at(ns("./surname")))))
+                      surname: contrib&.at(ns("./surname"))&.text)
+      pers_author_attrs1(ret, full, init, contrib)
+    end
+
+    def pers_author_attrs1(ret, full, init, contrib)
+      full and ret.merge!(
+        attr_code(
+          asciiFullname: output_if_translit(full),
+          asciiInitials: output_if_translit(init),
+          asciiSurname: output_if_translit(contrib&.at(ns("./surname"))),
+        ),
+      )
       ret
     end
 
-    def person_author(c, role, front)
-      front.author **person_author_attrs(c.at(ns("./person/name")), role) do |a|
-        org = c.at(ns("./person/affiliation/organization")) and
-          organization(org, a, c.document.at(ns("//showOnFrontPage")))
-        address(c.xpath(ns(".//address")),
-                c.at(ns(".//phone[not(@type = 'fax')]")),
-                c.at(ns(".//phone[@type = 'fax']")),
-                c.xpath(ns(".//email")), c.xpath(ns(".//uri")), a)
+    def person_author(contrib, role, front)
+      attrs = person_author_attrs(contrib.at(ns("./person/name")), role)
+      front.author **attrs do |a|
+        org = contrib.at(ns("./person/affiliation/organization")) and
+          organization(org, a, contrib.document.at(ns("//showOnFrontPage")))
+        address(contrib.xpath(ns(".//address")),
+                contrib.at(ns(".//phone[not(@type = 'fax')]")),
+                contrib.at(ns(".//phone[@type = 'fax']")),
+                contrib.xpath(ns(".//email")), contrib.xpath(ns(".//uri")), a)
       end
     end
 
-    def org_author(c, role, front)
+    def org_author(contrib, role, front)
       front.author **attr_code(role: role) do |a|
-        organization(c.at(ns("./organization")), a,
-                     c.document.at(ns("//showOnFrontPage")))
-        address(c.at(ns(".//address")),
-                c.at(ns(".//phone[not(@type = 'fax')]")),
-                c.at(ns(".//phone[@type = 'fax']")),
-                c.at(ns(".//email")), c.at(ns(".//uri")), a)
+        organization(contrib.at(ns("./organization")), a,
+                     contrib.document.at(ns("//showOnFrontPage")))
+        address(contrib.at(ns(".//address")),
+                contrib.at(ns(".//phone[not(@type = 'fax')]")),
+                contrib.at(ns(".//phone[@type = 'fax']")),
+                contrib.at(ns(".//email")), contrib.at(ns(".//uri")), a)
       end
     end
 
@@ -120,11 +128,13 @@ module IsoDoc::Ietf
       out.organization name, **attr_code(
         showOnFrontPage: show&.text, ascii: output_if_translit(name),
         asciiAbbrev: output_if_translit(org.at(ns("./abbreviation"))),
-        abbrev: org.at(ns("./abbreviation")))
+        abbrev: org.at(ns("./abbreviation"))
+      )
     end
 
     def address(addr, phone, fax, email, uri, out)
       return unless addr || phone || fax || email || uri
+
       out.address do |a|
         addr and postal(addr, a)
         phone and a.phone phone.text
@@ -164,10 +174,10 @@ module IsoDoc::Ietf
     def email(email, out)
       ascii = email.text.transliterate
       out.email email.text,
-        **attr_code(ascii: ascii == email.text ? nil : ascii )
+                **attr_code(ascii: ascii == email.text ? nil : ascii)
     end
 
-    def date(isoxml, front)
+    def date(_isoxml, front)
       date = @meta.get[:publisheddate] || @meta.get[:circulateddate] || return
       date = date.gsub(/T.*$/, "")
       attr = date_attr(date) || return
@@ -176,8 +186,9 @@ module IsoDoc::Ietf
 
     def date_attr(date)
       return nil if date.nil?
+
       if date.length == 4 && date =~ /^\d\d\d\d$/ then { year: date }
-      elsif date =~ /^\d\d\d\d-?\d\d$/
+      elsif /^\d\d\d\d-?\d\d$/.match?(date)
         m = /^(?<year>\d\d\d\d)-(?<month>\d\d)$/.match date
         { month: Date::MONTHNAMES[(m[:month]).to_i], year: m[:year] }
       else
@@ -185,25 +196,25 @@ module IsoDoc::Ietf
           d = Date.iso8601 date
           { day: d.day.to_s.gsub(/^0/, ""), year: d.year,
             month: Date::MONTHNAMES[d.month] }
-        rescue
+        rescue StandardError
           nil
         end
       end
     end
 
-    def area(isoxml, front)
+    def area(_isoxml, front)
       @meta.get[:areas].each do |w|
         front.area w
       end
     end
 
-    def workgroup(isoxml, front)
+    def workgroup(_isoxml, front)
       @meta.get[:wg].each do |w|
         front.workgroup w
       end
     end
 
-    def keyword(isoxml, front)
+    def keyword(_isoxml, front)
       @meta.get[:keywords].each do |kw|
         front.keyword kw
       end
@@ -231,7 +242,6 @@ module IsoDoc::Ietf
       end
     end
 
-    def boilerplate(isoxml, front)
-    end
+    def boilerplate(isoxml, front); end
   end
 end

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