metanorma-ietf 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47adf288717bcbd4914d1a3d43fb8eeea4d18fbb6f9675846c9ec37a9664f142
-  data.tar.gz: f0486d16c7a457465cce21790e3c76cb3422b0508d5ae57a150e15bf4e1059a7
+  metadata.gz: '08a3fef1af7e02a0c603e1304ccd50b2122efb82fb744f2f31e651fe90c13622'
+  data.tar.gz: 18eaa00b783bfb0308a5fc088ad78562b4ed6f21a950b0494603dc5d47c0933a
 SHA512:
-  metadata.gz: e22190786fb20f67dd85cc5e0bd3e831e32b5ee54c0de91d08780106a624e902c11108672469afdcf80451489fddc11472f0ee73910592c947550b3f243b4c0b
-  data.tar.gz: 85c7688efec6428a459a6d6f7d182c092ad68a5ed6a6e971e379fab3d6c6c46f5e77e083aa11be20d7570691505d3b61da50e217c93643451d215387e747d486
+  metadata.gz: 4dff850b703e42b2f6ee3fe5a7408a6b8fc33eb05bd6987b48761ee5def3d62ba3acebc0332768de34b5b84201e4003adaddf4cfe70dde1b6c7aadda2eb21fb7
+  data.tar.gz: 6ab998721ba99fb4a82589c9cd3aa25e090b86535e6b8ecb953a6679b70910cf4165e5bf15787154fffb52090ccb2299476e913f35df444d0d8e5c160361dffc

data/.github/workflows/macos.yml

@@ -36,7 +36,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         run: |
           sudo gem install bundler --force

data/.github/workflows/ubuntu.yml

@@ -35,7 +35,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         run: |
           gem install bundler

data/.github/workflows/windows.yml

@@ -36,7 +36,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         shell: pwsh
         run: |

data/lib/asciidoctor/ietf/front.rb

@@ -11,7 +11,7 @@ module Asciidoctor
 
       def metadata_publisher(node, xml)
         publishers = node.attr("publisher") || "IETF"
-        publishers.split(/,[ ]?/).each do |p|
+        csv_split(publishers)&.each do |p|
           xml.contributor do |c|
             c.role **{ type: "publisher" }
             c.organization { |a| organization(a, p) }
@@ -20,8 +20,8 @@ module Asciidoctor
       end
 
       def metadata_copyright(node, xml)
-        publishers = node.attr("publisher") || "IETF"
-        publishers.split(/,[ ]?/).each do |p|
+        publishers = node.attr("copyright-holder") || node.attr("publisher") || "IETF"
+        csv_split(publishers)&.each do |p|
           xml.copyright do |c|
             c.from (node.attr("copyright-year") || Date.today.year)
             c.owner do |owner|

data/lib/asciidoctor/ietf/isodoc.rng

@@ -922,6 +922,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +964,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +992,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1014,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,6 +1042,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1180,6 +1183,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/isodoc/ietf/blocks.rb

@@ -72,7 +72,9 @@ module IsoDoc::Ietf
     end
 
     def note_label(node)
-      l10n("#{super}: ")
+      n = @xrefs.get[node["id"]]
+      return l10n("#{@i18n.note}: ") if n.nil? || n[:label].nil? || n[:label].empty?
+      l10n("#{@i18n.note} #{n[:label]}: ")
     end
 
     def note_parse(node, out)
@@ -96,8 +98,8 @@ 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?) ? @example_lbl :
-          l10n("#{@example_lbl} #{n[:label]}")
+        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @i18n.example :
+          l10n("#{@i18n.example} #{n[:label]}")
         p << lbl
         name and !lbl.nil? and p << ": "
         name and name.children.each { |n| parse(n, p) }
@@ -137,7 +139,7 @@ module IsoDoc::Ietf
 
     def formula_where(dl, out)
       return unless dl
-      out.t { |p| p << @where_lbl }
+      out.t { |p| p << @i18n.where }
       parse(dl, out)
     end
 

data/lib/isodoc/ietf/cleanup.rb

@@ -157,7 +157,8 @@ 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)
-        s.children = "<![CDATA[#{s.children.to_xml.sub(/\A\n+/, "")}]]>"
+        text = HTMLEntities.new.decode(s.children.to_xml.sub(/\A\n+/, ""))
+        s.children = "<![CDATA[#{text}]]>"
       end
     end
 

data/lib/isodoc/ietf/front.rb

@@ -23,11 +23,16 @@ module IsoDoc::Ietf
       super
     end
 
+    def output_if_translit(text)
+      return nil if text.nil?
+      text.transliterate != text ? text.transliterate : nil
+    end
+
     def title(isoxml, front)
       title = @meta.get[:doctitle] or return
       front.title title, **attr_code(abbrev: @meta.get[:docabbrev],
-                                     ascii: @meta.get[:docascii] ||
-                                     title.transliterate)
+                                     ascii: (@meta.get[:docascii] ||
+                                     output_if_translit(title)))
     end
 
     def seriesinfo(isoxml, front)
@@ -37,7 +42,7 @@ module IsoDoc::Ietf
 
     def seriesinfo_attr(isoxml)
       attr_code(value: @meta.get[:docnumber] || "",
-                asciiValue: @meta.get[:docnumber]&.transliterate,
+                asciiValue: output_if_translit(@meta.get[:docnumber]),
                 status: @meta.get[:stage],
                 stream: isoxml&.at(ns("//bibdata/series[@type = 'stream']/"\
                                       "title"))&.text)
@@ -82,9 +87,9 @@ module IsoDoc::Ietf
 
     def pers_author_attrs1(ret, full, init, c)
       full and ret.merge!(attr_code(
-        asciiFullname: full&.transliterate,
-        asciiInitials: init&.transliterate,
-        asciiSurname: c&.at(ns("./surname"))&.text&.transliterate))
+        asciiFullname: output_if_translit(full),
+        asciiInitials: output_if_translit(init),
+        asciiSurname: output_if_translit(c&.at(ns("./surname")))))
       ret
     end
 
@@ -113,8 +118,8 @@ module IsoDoc::Ietf
     def organization(org, out, show)
       name = org.at(ns("./name"))&.text
       out.organization name, **attr_code(
-        showOnFrontPage: show&.text, ascii: name&.transliterate,
-        asciiAbbrev: org&.at(ns("./abbreviation"))&.transliterate,
+        showOnFrontPage: show&.text, ascii: output_if_translit(name),
+        asciiAbbrev: output_if_translit(org.at(ns("./abbreviation"))),
         abbrev: org.at(ns("./abbreviation")))
     end
 
@@ -163,7 +168,7 @@ module IsoDoc::Ietf
 
     def date(isoxml, front)
       date = @meta.get[:publisheddate] || @meta.get[:circulateddate] || return
-      date.gsub!(/T.*$/, "")
+      date = date.gsub(/T.*$/, "")
       attr = date_attr(date) || return
       front.date **attr_code(attr)
     end

data/lib/isodoc/ietf/reqt.rb

@@ -1,5 +1,10 @@
 module IsoDoc::Ietf
   class RfcConvert < ::IsoDoc::Convert
+    def recommendation_labels(node)
+      [node.at(ns("./label")), node.at(ns("./title")), 
+       @xrefs.anchor(node['id'], :label, false)]
+    end
+
     def recommendation_name(node, out, type)
       label, title, lbl = recommendation_labels(node)
       out.t **{ keepWithNext: "true" }  do |b|
@@ -27,7 +32,7 @@ module IsoDoc::Ietf
     end
 
     def recommendation_parse(node, out)
-      recommendation_name(node, out, @recommendation_lbl)
+      recommendation_name(node, out, @i18n.recommendation)
       recommendation_attributes(node, out)
       node.children.each do |n|
         parse(n, out) unless %w(label title).include? n.name
@@ -35,7 +40,7 @@ module IsoDoc::Ietf
     end
 
     def requirement_parse(node, out)
-      recommendation_name(node, out, @requirement_lbl)
+      recommendation_name(node, out, @i18n.requirement)
       recommendation_attributes(node, out)
       node.children.each do |n|
         parse(n, out) unless %w(label title).include? n.name
@@ -43,7 +48,7 @@ module IsoDoc::Ietf
     end
 
     def permission_parse(node, out)
-      recommendation_name(node, out, @permission_lbl)
+      recommendation_name(node, out, @i18n.permission)
       recommendation_attributes(node, out)
       node.children.each do |n|
         parse(n, out) unless %w(label title).include? n.name

data/lib/isodoc/ietf/rfc_convert.rb

@@ -27,12 +27,12 @@ module IsoDoc::Ietf
           set_pis(docxml, Nokogiri::XML(xml))
     end
 
-    def metadata_init(lang, script, labels)
-      @meta = Metadata.new(lang, script, labels)
+    def metadata_init(lang, script, i18n)
+      @meta = Metadata.new(lang, script, i18n)
     end
 
-    def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, klass, labels, options)
+    def xref_init(lang, script, klass, i18n, options)
+        @xrefs = Xref.new(lang, script, klass, i18n, options)
       end
 
     def extract_delims(text)

data/lib/isodoc/ietf/section.rb

@@ -63,6 +63,7 @@ module IsoDoc::Ietf
         category:       series2category(
           docxml&.at(ns("//bibdata/series[@type = 'intended']/title"))&.text),
         ipr:            docxml&.at(ns("//bibdata/ext/ipr"))&.text,
+        consensus:      docxml&.at(ns("//bibdata/ext/consensus"))&.text,
         obsoletes:      obs,
         updates:        upd,
         indexInclude:   docxml&.at(ns("//bibdata/ext/indexInclude"))&.text,
@@ -81,11 +82,11 @@ module IsoDoc::Ietf
 
     def series2category(series)
       case series&.downcase
-      when "standard" then "std"
-      when "informational" then "info"
-      when "experimental" then "exp"
+      when "standard", "std" then "std"
+      when "informational", "info" then "info"
+      when "experimental", "exp" then "exp"
       when "bcp" then "bcp"
-      when "fyi" then "info"
+      when "fyi", "info" then "info"
       when "full-standard" then "std"
       when "historic" then "historic"
       else
@@ -132,7 +133,7 @@ module IsoDoc::Ietf
       end
     end
 
-    def clause_parse_title(node, div, c1, out)
+    def clause_parse_title(node, div, c1, out, _heading_attrs = {})
       return unless c1
       div.name do |n|
         c1&.children&.each { |c2| parse(c2, n) }

data/lib/isodoc/ietf/terms.rb

@@ -13,7 +13,7 @@ module IsoDoc::Ietf
 
     def deprecated_term_parse(node, out)
       out.t do |p|
-        p << l10n("#{@deprecated_lbl}: ")
+        p << l10n("#{@i18n.deprecated}: ")
         node.children.each { |c| parse(c, p) }
       end
     end

data/lib/metanorma/ietf/processor.rb

@@ -26,11 +26,6 @@ module Metanorma
         "Metanorma::Ietf #{::Metanorma::Ietf::VERSION}"
       end
 
-      def input_to_isodoc(file, filename)
-        # This is XML RFC v3 output in text
-        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
-      end
-
       def extract_options(isodocxml)
         {}
       end
@@ -48,6 +43,10 @@ module Metanorma
         nil
       end
 
+      def use_presentation_xml(ext)
+        false
+      end
+
       def xml2rfc_present?
         !which("xml2rfc").nil?
       end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-   VERSION = "2.1.0".freeze
+   VERSION = "2.2.1".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -35,8 +35,8 @@ 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.4.0"
-  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
   spec.add_dependency "mathml2asciimath"
 
   spec.add_development_dependency "byebug"

metadata

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