metanorma-ietf 3.0.13 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39ea21861ccd96e10a9c03dcfa3672df68347437aed1c307680160a402195b4b
-  data.tar.gz: effa7116f2bf9f02e880e9fd2d478ef140aa45b520dc14d083dd1c6f409dad0f
+  metadata.gz: 43f207305bf9db4f24f830dca4e8b4eddc49ccc550704c65f091111225339a5b
+  data.tar.gz: fa78827c2391a0c0b4a2b788771da05bed92fae965f8b4a0a944b51a525a1fa2
 SHA512:
-  metadata.gz: bdba57407ebf106d7ca311d94dfee3e778e6f1453de5a09772d42e1f696c6b951be24d2b84764d623fe8d9e3b81d192930881b6c9ed2619a630c30c0b52addce
-  data.tar.gz: f57b8315d127c4f7dacbd295d6a899855d5d4df1ee262a9e0d993b38126c82f8b4c4c7d22529895b0351a44303efb0f8107b2ed2d0d76b4d027e2790db9a900b
+  metadata.gz: dbb040f4b685c29ee35bccff130f061fdb5665542425ca18aeb366e09afdf39dd645edf0b8bbac2eaa4ffd88f09d27fa65578002d08f13ff52d084b5fe3b81ff
+  data.tar.gz: 0221363b8c7b38fb0ba2765ebfaec2312e2868a7c75c59508049bc0d8191e34a226cbb7ec229e066283d20ddb3aefcef69c776ef7095599619431955ecbdd6f7

data/.gitignore

@@ -19,7 +19,6 @@
 
 .rubocop-https--*
 
-/Gemfile.devel
 /Gemfile.lock
 /test.err
 /test.rfc.xml.err

data/lib/isodoc/ietf/cleanup.rb

@@ -99,9 +99,9 @@ module IsoDoc
           c = a&.xpath("./following-sibling::*")&.remove
           a = a.remove
           name and f << name
-          b.empty? or f << "<preamble>#{b.to_xml}</preamble>"
+          b.empty? or f << "<preamble>#{to_xml(b)}</preamble>"
           a and f << a
-          c.empty? or f << "<postamble>#{c.to_xml}</postamble>"
+          c.empty? or f << "<postamble>#{to_xml(c)}</postamble>"
         end
       end
 
@@ -127,11 +127,11 @@ module IsoDoc
       # 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")
+          s.children = to_xml(s.children).gsub(%r{<br/>\n}, "\n")
             .gsub(%r{\s+(<t[ >])}, "\\1").gsub(%r{</t>\s+}, "</t>")
           sourcecode_remove_markup(s)
-          s.children = "<![CDATA[#{HTMLEntities.new.decode(s
-        .children.to_xml.sub(/\A\n+/, ''))}]]>"
+          s.children = "<![CDATA[#{HTMLEntities.new.decode(to_xml(s
+        .children).sub(/\A\n+/, ''))}]]>"
         end
       end
 

data/lib/isodoc/ietf/cleanup_inline.rb

@@ -14,7 +14,7 @@ module IsoDoc
       def footnote_cleanup(docxml)
         fn = footnote_refs_cleanup(docxml)
         endnotes = make_endnotes(docxml)
-        docxml.xpath("//section[descendant::fn] | "\
+        docxml.xpath("//section[descendant::fn] | " \
                      "//abstract[descendant::fn]").each do |s|
           s.xpath(".//fn").each do |f|
             ref = f.at(".//ref") and ref.replace("[#{fn[ref.text]}] ")

data/lib/isodoc/ietf/footnotes.rb

@@ -2,6 +2,7 @@ module IsoDoc::Ietf
   class RfcConvert < ::IsoDoc::Convert
     def footnote_parse(node, out)
       return table_footnote_parse(node, out) if @in_table || @in_figure
+
       fn = node["reference"]
       out.fnref fn
       make_local_footnote(node, fn, out)
@@ -9,6 +10,7 @@ module IsoDoc::Ietf
 
     def make_local_footnote(node, fn, out)
       return if @seen_footnote.include?(fn)
+
       @in_footnote = true
       out << make_generic_footnote_text(node, fn)
       @in_footnote = false
@@ -18,13 +20,13 @@ module IsoDoc::Ietf
     def make_generic_footnote_text(node, fnref)
       first = node.first_element_child
       noko do |xml|
-        xml.fn do |div|
+        xml.fn do |_div|
           xml.t **attr_code(anchor: first ? first["id"] : nil) do |div|
             div.ref fnref
             first.name == "p" and first.children.each { |n| parse(n, div) }
           end
-          first.name == "p" and
-            node.elements.drop(1).each { |n| parse(n, xml) } or
+          (first.name == "p" and
+            node.elements.drop(1).each { |n| parse(n, xml) }) or
             node.children.each { |n| parse(n, xml) }
         end
       end.join
@@ -36,6 +38,7 @@ module IsoDoc::Ietf
       make_table_footnote_link(out, tid + fn, fn)
       # do not output footnote text if we have already seen it for this table
       return if @seen_footnote.include?(tid + fn)
+
       @in_footnote = true
       out.fn do |a|
         a << make_table_footnote_text(node, tid + fn, fn)
@@ -44,19 +47,19 @@ module IsoDoc::Ietf
       @seen_footnote << (tid + fn)
     end
 
-    def make_table_footnote_link(out, fnid, fnref)
+    def make_table_footnote_link(out, _fnid, fnref)
       out << " [#{fnref}]"
     end
 
-    def make_table_footnote_text(node, fnid, fnref)
+    def make_table_footnote_text(node, _fnid, fnref)
       first = node.first_element_child
       noko do |xml|
         xml.t **attr_code(anchor: first ? first["id"] : nil) do |div|
           div << "[#{fnref}]  "
           first.name == "p" and first.children.each { |n| parse(n, div) }
         end
-        first.name == "p" and
-          node.elements.drop(1).each { |n| parse(n, xml) } or
+        (first.name == "p" and
+          node.elements.drop(1).each { |n| parse(n, xml) }) or
           node.children.each { |n| parse(n, xml) }
       end.join
     end
@@ -64,6 +67,7 @@ module IsoDoc::Ietf
     def get_table_ancestor_id(node)
       table = node.ancestors("table") || node.ancestors("figure")
       return UUIDTools::UUID.random_create.to_s if table.empty?
+
       table.last["id"]
     end
   end

data/lib/isodoc/ietf/inline.rb

@@ -112,7 +112,7 @@ module IsoDoc
         end
         contents = no_loc_contents.select { |c| !c.text? || /\S/.match(c) }
         !contents.empty? and
-          return Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
+          return to_xml(Nokogiri::XML::NodeSet.new(node.document, contents))
         ""
       end
 
@@ -120,19 +120,27 @@ module IsoDoc
         linkend = node.children.reject do |c|
           %w{locality localityStack}.include? c.name
         end
-        relative = node["relative"] ||
-          node.at(ns(".//locality[@type = 'anchor']/referenceFrom"))&.text || ""
-        section = @isodoc.eref_localities(
-          node.xpath(ns("./locality | ./localityStack")), nil, node
-        )&.sub(/^,/, "")&.sub(/^\s*(Section|Clause)/, "")&.strip&.sub(/,$/, "") || ""
         # section = "" unless relative.empty?
-        out.relref **attr_code(target: node["bibitemid"], section: section,
-                               relative: relative,
+        out.relref **attr_code(target: node["bibitemid"],
+                               section: eref_section(node),
+                               relative: eref_relative(node),
                                displayFormat: node["displayFormat"]) do |l|
                                  linkend.each { |n| parse(n, l) }
                                end
       end
 
+      def eref_relative(node)
+        node["relative"] ||
+          node.at(ns(".//locality[@type = 'anchor']/referenceFrom"))&.text || ""
+      end
+
+      def eref_section(node)
+        @isodoc.eref_localities(
+          node.xpath(ns("./locality | ./localityStack")), nil, node
+        )&.sub(/^,/, "")&.sub(/^\s*(Sections?|Clauses?)/, "")&.strip
+          &.sub(/,$/, "") || ""
+      end
+
       def index_parse(node, out)
         out.iref nil, **attr_code(item: node.at(ns("./primary")).text,
                                   primary: node["primary"],

data/lib/isodoc/ietf/rfc_convert.rb

@@ -101,7 +101,7 @@ module IsoDoc
 
       def initialize(options)
         super
-        @xinclude = options[:use_xinclude] == "true"
+        @xinclude = options[:usexinclude]
         @format = :rfc
         @suffix = "rfc.xml"
         @isodoc = IsoDoc::PresentationXMLConvert.new({})

data/lib/metanorma/ietf/basicdoc.rng

@@ -683,6 +683,9 @@
   </define>
   <define name="underline">
     <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <zeroOrMore>
         <ref name="PureTextElement"/>
       </zeroOrMore>

data/lib/metanorma/ietf/biblio-standoc.rng

@@ -47,7 +47,7 @@
     </element>
   </define>
   <define name="DocumentType">
-    <value>document</value>
+    <text/>
   </define>
   <define name="docsubtype">
     <element name="subdoctype">

data/lib/metanorma/ietf/converter.rb

@@ -159,7 +159,7 @@ module Metanorma
       end
 
       def html_extract_attributes(node)
-        super.merge(use_xinclude: node.attr("use-xinclude"))
+        super.merge(usexinclude: node.attr("use-xinclude"))
       end
 
       def rfc_converter(node)

data/lib/metanorma/ietf/isodoc.rng

@@ -1152,7 +1152,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <ref name="BibliographicItem"/>
+      <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
   <define name="image" combine="choice">
@@ -2653,6 +2653,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
+      <value>modspec</value>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.0.13".freeze
+    VERSION = "3.1.0".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.3.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: metanorma-ietf lets you write IETF documents, such as Internet-Drafts and