metanorma-ietf 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb5f196390262aef0aec189526c2caf497e529e5ffbbbcc22a205ba43a85d85c
-  data.tar.gz: 37ec8453f4ef211f479e7553bd9cb6481f5f50f872793bb571f184654b299051
+  metadata.gz: 5810ee943727c95c708a2375a3c38c473ba80c7ed8a0f99449d76de0d73cf514
+  data.tar.gz: 9cdfa5258245b10631c9f44bfc873f27113ef53d92ac3e63a2d92b2277582655
 SHA512:
-  metadata.gz: 39f727292be5e328f32369cdfd9212037beab415e017f95f66b3dbbd3ae5a060f5594fb49341d317dd6463fca4f33df65535358da0ee12fbaf7e297c50ef1eb2
-  data.tar.gz: 587c593828181e860d7041d88f43bd6c7a48f09c2f7a70049f464a661480fb4f91c103706b1bb2fe5db882c23db66bf9ae2757ae441e0c449dcada0893e4d874
+  metadata.gz: e3778ea665033cf2245defda88dc0743dc26db811b5863e4d4a8c5a594958f560b1b807534a3e7e47eb490a18f3b479f6529d809256b5199adaa18ee61c12699
+  data.tar.gz: 5a1f75cfeae796f38f4e117088e6afa52fccc6a536307afa2ce6d4c2839c62ac59eade3be28636c02358cb228268c6439d41220d484ff442302ed75fd16c7441

data/lib/asciidoctor/ietf/biblio.rng

@@ -49,11 +49,17 @@
   </define>
   <define name="stage">
     <element name="stage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
   <define name="substage">
     <element name="substage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -452,9 +458,14 @@
     <attribute name="bibitemid">
       <data type="IDREF"/>
     </attribute>
-    <zeroOrMore>
-      <ref name="locality"/>
-    </zeroOrMore>
+    <choice>
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="localityStack"/>
+      </zeroOrMore>
+    </choice>
     <optional>
       <ref name="date"/>
     </optional>
@@ -469,6 +480,25 @@
       <ref name="BibItemLocality"/>
     </element>
   </define>
+  <define name="localityStack">
+    <element name="localityStack">
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="sourceLocality">
+    <element name="sourceLocality">
+      <ref name="BibItemLocality"/>
+    </element>
+  </define>
+  <define name="sourceLocalityStack">
+    <element name="sourceLocalityStack">
+      <zeroOrMore>
+        <ref name="sourceLocality"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemLocality">
     <attribute name="type">
       <ref name="LocalityType"/>
@@ -1028,12 +1058,30 @@
       <attribute name="type">
         <ref name="DocRelationType"/>
       </attribute>
+      <optional>
+        <element name="description">
+          <ref name="FormattedString"/>
+        </element>
+      </optional>
       <element name="bibitem">
         <ref name="BibliographicItem"/>
       </element>
-      <zeroOrMore>
-        <ref name="locality"/>
-      </zeroOrMore>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
+      <choice>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="sourceLocalityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="version">

data/lib/asciidoctor/ietf/converter.rb

@@ -22,6 +22,7 @@ module Asciidoctor
         @draft = node.attributes.has_key?("draft")
         @workgroups = cache_workgroup(node)
         @bcp_bold = !node.attr?("no-rfc-bold-bcp14")
+        @xinclude = node.attr?("use-xinclude") 
         super
       end
 
@@ -198,6 +199,10 @@ module Asciidoctor
         end
       end
 
+      def html_extract_attributes(node)
+        super.merge(use_xinclude: node.attr("use-xinclude"))
+      end
+
       def rfc_converter(node)
         IsoDoc::Ietf::RfcConvert.new(html_extract_attributes(node))
       end

data/lib/asciidoctor/ietf/front.rb

@@ -2,7 +2,7 @@ module Asciidoctor
   module Ietf
     class Converter < ::Asciidoctor::Standoc::Converter
       def relaton_relations
-        %w(included-in described-by derived-from equivalent obsoletes updates)
+        %w(included-in described-by derived-from instance obsoletes updates)
       end
 
       def metadata_author(node, xml)

data/lib/isodoc/ietf/inline.rb

@@ -110,9 +110,17 @@ module IsoDoc::Ietf
                            end
     end
 
+    def get_linkend(node)
+      contents = node.children.select { |c| !%w{locality localityStack}.include? c.name }.
+        select { |c| !c.text? || /\S/.match(c) }
+      !contents.empty? and
+        return Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
+      ""
+    end
+
     def eref_parse(node, out)
-      linkend = node.children.select { |c| c.name != "locality" }
-      section = eref_clause(node.xpath(ns("./locality")), nil) || ""
+      linkend = node.children.reject { |c| %w{locality localityStack}.include? c.name }
+      section = eref_clause(node.xpath(ns("./locality | ./localityStack")), nil) || ""
       out.relref **attr_code(target: node["bibitemid"], section: section,
                              displayFormat: node["displayFormat"]) do |l|
         linkend.each { |n| parse(n, l) }
@@ -120,11 +128,27 @@ module IsoDoc::Ietf
     end
 
     def eref_clause(refs, target)
+      ret = []
+      ret1 = ""
+      refs.each do |l|
+        if l.name == "localityStack"
+          ret << ret1
+          ret1 = ""
+          ret << eref_clause1(l.elements, target)
+        else
+          ret1 += eref_clause1([l], target)
+        end
+      end
+      ret << ret1
+      ret.reject { |c| c.nil? || c.empty? }.join("; ")
+    end
+
+    def eref_clause1(refs, target)
       refs.each do |l|
         next unless %w(clause section).include? l["type"]
         return l&.at(ns("./referenceFrom"))&.text
       end
-      return nil
+      return ""
     end
 
     def index_parse(node, out)

data/lib/isodoc/ietf/metadata.rb

@@ -15,7 +15,7 @@ module IsoDoc
       end
 
       def relaton_relations
-        %w(included-in described-by derived-from equivalent)
+        %w(included-in described-by derived-from instance)
         # = item describedby convertedfrom alternate
       end
 

data/lib/isodoc/ietf/references.rb

@@ -31,7 +31,13 @@ module IsoDoc::Ietf
 
     def nonstd_bibitem(list, b, ordinal, bibliography)
       uris = b.xpath(ns("./uri"))
-      list.reference **attr_code(target: uris.empty? ? nil : uris[0]&.text,
+      target = nil
+      uris&.each do |u|
+        if u["type"] == "src" then
+          target = u.text
+        end
+      end
+      list.reference **attr_code(target: target,
                                  anchor: b["id"]) do |r|
         r.front do |f|
           relaton_to_title(b, f)
@@ -40,25 +46,39 @@ module IsoDoc::Ietf
           relaton_to_keyword(b, f)
           relaton_to_abstract(b, f)
         end
-        uris[1..-1]&.each do |u|
+        uris&.each do |u|
           r.format nil, **attr_code(target: u.text, type: u["type"])
         end
+        docidentifiers = b.xpath(ns("./docidentifier"))
+        id = bibitem_ref_code(b) and id.text != "(NO ID)" and
+          r.refcontent render_identifier(id)
+        docidentifiers&.each do |u|
+          if %w(DOI IETF).include? u["type"]
+            r.seriesInfo nil, **attr_code(value: u.text, name: u["type"])
+          end
+        end
       end
     end
 
     def relaton_to_title(b, f)
-      id = bibitem_ref_code(b)
-      identifier = render_identifier(id)
       title = b&.at(ns("./title")) || b&.at(ns("./formattedref")) or return
       f.title do |t|
-        t << "#{identifier}, "
         title.children.each { |n| parse(n, t) }
       end
     end
 
+    def bibitem_ref_code(b)
+      id =  b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
+                    "or @type = 'ISSN' or @type = 'ISBN' or @type = 'IETF')]"))
+      return id if id
+      id = Nokogiri::XML::Node.new("docidentifier", b.document)
+      id << "(NO ID)"
+      id
+    end
+
     def relaton_to_author(b, f)
       auths = b.xpath(ns("./contributor[xmlns:role/@type = 'author' or "\
-                 "xmlns:role/@type = 'editor']"))
+                         "xmlns:role/@type = 'editor']"))
       auths.empty? and auths = b.xpath(ns("./contributor[xmlns:role/@type = "\
                                           "'publisher']"))
       auths.each do |a|
@@ -111,7 +131,13 @@ module IsoDoc::Ietf
     def relaton_to_abstract(b, f)
       b.xpath(ns("./abstract")).each do |k|
         f.abstract do |abstract|
-          k.children.each { |n| parse(n, abstract) }
+          if k.at(ns("./p"))
+            k.children.each { |n| parse(n, abstract) }
+          else
+            abstract.t do |t|
+              k.children.each { |n| parse(n, t) }
+            end
+          end
         end
       end
     end
@@ -122,6 +148,7 @@ module IsoDoc::Ietf
     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/isodoc/ietf/rfc_convert.rb

@@ -61,5 +61,10 @@ module IsoDoc::Ietf
       filename = filename.sub(/\.rfc\.xml$/, ".rfc")
       super
     end
+
+    def initialize(options)
+      super
+      @xinclude = options[:use_xinclude] == "true"
+    end
   end
 end

data/lib/isodoc/ietf/section.rb

@@ -75,8 +75,6 @@ module IsoDoc::Ietf
         'xml:lang':     docxml&.at(ns("//bibdata/language"))&.text,
         version:        "3",
         'xmlns:xi':        "http://www.w3.org/2001/XInclude",
-        prepTime:       sprintf("%04d-%02d-%02dT%02d:%02d:%02dZ",
-                                t.year, t.month, t.day, t.hour, t.min, t.sec),
       }
     end
 
@@ -88,7 +86,7 @@ module IsoDoc::Ietf
     def make_link(out, isoxml)
       links = isoxml.xpath(ns(
         "//bibdata/relation[@type = 'includedIn' or @type = 'describedBy' or "\
-        "@type = 'derivedFrom' or @type = 'equivalent']")) || return
+        "@type = 'derivedFrom' or @type = 'instance']")) || return
         links.each do |l|
           out.link **{ href: l&.at(ns("./bibitem/docidentifier"))&.text,
                        rel: rel2iana(l["type"]) }
@@ -100,7 +98,7 @@ module IsoDoc::Ietf
       when "includedIn" then "item"
       when "describedBy" then "describedby"
       when "derivedFrom" then "convertedfrom"
-      when "equivalent" then "alternate"
+      when "instance" then "alternate"
       else 
         "alternate"
       end
@@ -114,8 +112,8 @@ module IsoDoc::Ietf
 
     def make_back(out, isoxml)
       out.back do |back|
-        annex isoxml, back
         bibliography isoxml, back
+        annex isoxml, back
       end
     end
 

data/lib/metanorma/ietf/processor.rb

@@ -17,7 +17,8 @@ module Metanorma
           xml: "xml",
           rfc: "rfc.xml",
           html: "html",
-          txt: "txt"
+          txt: "txt",
+          pdf: "pdf"
         }
       end
 
@@ -68,6 +69,17 @@ module Metanorma
 
           system("xml2rfc --text #{rfcname} -o #{outname}")
 
+        when :pdf
+          unless xml2rfc_present?
+            warn "[metanorma-ietf] Error: unable to generate #{format}, the command `xml2rfc` is not found in path."
+            return
+          end
+
+          rfcname = outname.sub(/\.pdf$/, ".rfc.xml")
+          output(isodoc_node, outname, :rfc, options) unless @done_rfc
+
+          system("xml2rfc --pdf #{rfcname} -o #{outname}")
+
         when :html
           unless xml2rfc_present?
             warn "[metanorma-ietf] Error: unable to generate #{format}, the command `xml2rfc` is not found in path."

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-   VERSION = "2.0.7".freeze
+   VERSION = "2.0.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc