metanorma-ietf 2.0.13 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 618fe15c1205c409e7f57dc672f45545a408bf20dd7fdeb68577e295232bf226
-  data.tar.gz: 42104d4c8b90df8481c5bf25d598a68e7c447d71bfa53349b4bef8194dd0e3b0
+  metadata.gz: 47adf288717bcbd4914d1a3d43fb8eeea4d18fbb6f9675846c9ec37a9664f142
+  data.tar.gz: f0486d16c7a457465cce21790e3c76cb3422b0508d5ae57a150e15bf4e1059a7
 SHA512:
-  metadata.gz: 18a552d7d528ae211fcbad094c876c6fac60b0503687725edc13d809a3a9f2fd93aafa7a14ede31f47b7b5e9c1d6b5fa092c261f4fd6d63ca9e7eb391fcc6dea
-  data.tar.gz: 9c58535cb308711ef79df7a58d261887cbbadbedb3fb1a0edcd0247f782b5caa9c58df24ff371ffacd4fe1381f4f4840e61a267903a33fb40ccbd633a7f249c5
+  metadata.gz: e22190786fb20f67dd85cc5e0bd3e831e32b5ee54c0de91d08780106a624e902c11108672469afdcf80451489fddc11472f0ee73910592c947550b3f243b4c0b
+  data.tar.gz: 85c7688efec6428a459a6d6f7d182c092ad68a5ed6a6e971e379fab3d6c6c46f5e77e083aa11be20d7570691505d3b61da50e217c93643451d215387e747d486

data/lib/asciidoctor/ietf/converter.rb

@@ -26,19 +26,9 @@ module Asciidoctor
         super
       end
 
-      def document(node)
-        init(node)
-        ret1 = makexml(node)
-        ret = ret1.to_xml(indent: 2)
-        unless node.attr("nodoc") || !node.attr("docfile")
-          filename = node.attr("docfile").gsub(/\.adoc/, ".xml").
-            gsub(%r{^.*/}, "")
-          File.open(filename, "w") { |f| f.write(ret) }
-          rfc_converter(node).convert filename unless node.attr("nodoc")
-        end
-        @log.write(@localdir + @filename + ".err") unless @novalid
-        @files_to_delete.each { |f| FileUtils.rm f }
-        ret
+      def outputs(node, ret)
+        File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
+        rfc_converter(node).convert(@filename + ".xml")
       end
 
       def doctype(node)

data/lib/isodoc/ietf/blocks.rb

@@ -94,7 +94,7 @@ module IsoDoc::Ietf
     end
 
     def example_label(node, div, name)
-      n = get_anchors[node["id"]]
+      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]}")
@@ -144,7 +144,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 = anchor(node['id'], :label, false)
+        lbl = @xrefs.anchor(node['id'], :label, false)
         lbl.nil? or
           p << "    (#{lbl})"
       end

data/lib/isodoc/ietf/rfc_convert.rb

@@ -9,11 +9,12 @@ require_relative "./cleanup"
 require_relative "./footnotes"
 require_relative "./references"
 require_relative "./section"
+require_relative "./xref"
 
 module IsoDoc::Ietf
   class RfcConvert < ::IsoDoc::Convert
     def convert1(docxml, filename, dir)
-      anchor_names docxml
+      @xrefs.parse docxml
       info docxml, nil
       xml = noko do |xml|
         xml.rfc **attr_code(rfc_attributes(docxml)) do |html|
@@ -30,6 +31,10 @@ module IsoDoc::Ietf
       @meta = Metadata.new(lang, script, labels)
     end
 
+    def xref_init(lang, script, klass, labels, options)
+        @xrefs = Xref.new(lang, script, klass, labels, options)
+      end
+
     def extract_delims(text)
       @openmathdelim = "$$"
       @closemathdelim = "$$"
@@ -58,7 +63,7 @@ module IsoDoc::Ietf
       result = from_xhtml(cleanup(to_xhtml(textcleanup(result)))).
         sub(/<!DOCTYPE[^>]+>\n/, "").
         sub(/(<rfc[^<]+? )lang="[^"]+"/, "\\1")
-      File.open("#{filename}.rfc.xml", "w:UTF-8") { |f| f.write(result) }
+      File.open(filename, "w:UTF-8") { |f| f.write(result) }
       @files_to_delete.each { |f| FileUtils.rm_rf f }
     end
 
@@ -71,6 +76,7 @@ module IsoDoc::Ietf
       super
       @xinclude = options[:use_xinclude] == "true"
       @format = :rfc
+      @suffix = "rfc.xml"
     end
   end
 end

data/lib/isodoc/ietf/terms.rb

@@ -48,18 +48,5 @@ module IsoDoc::Ietf
 
     def termdocsource_parse(_node, _out)
     end
-
-    def termnote_anchor_names(docxml)
-      docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
-        c = Counter.new
-        notes = t.xpath(ns(".//termnote"))
-        notes.each do |n|
-          next if n["id"].nil? || n["id"].empty?
-          idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] =
-            anchor_struct(idx, n, @note_xref_lbl, "note", false)
-        end
-      end
-    end
   end
 end

data/lib/isodoc/ietf/xref.rb

@@ -0,0 +1,20 @@
+require "isodoc"
+
+module IsoDoc
+  module Ietf
+    class Xref < IsoDoc::Xref
+      def termnote_anchor_names(docxml)
+        docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
+          c = IsoDoc::XrefGen::Counter.new
+          notes = t.xpath(ns(".//termnote"))
+          notes.each do |n|
+            next if n["id"].nil? || n["id"].empty?
+            idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
+            @anchors[n["id"]] =
+              anchor_struct(idx, n, @labels["note_xref"], "note", false)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/ietf/processor.rb

@@ -52,10 +52,11 @@ module Metanorma
         !which("xml2rfc").nil?
       end
 
-      def output(isodoc_node, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options={})
         case format
         when :rfc
-          IsoDoc::Ietf::RfcConvert.new(options).convert(outname, isodoc_node)
+          outname ||= inname.sub(/\.xml$/, ".rfc.xml")
+          IsoDoc::Ietf::RfcConvert.new(options).convert(inname, isodoc_node, nil, outname)
           @done_rfc = true
 
         when :txt
@@ -64,9 +65,10 @@ module Metanorma
             return
           end
 
-          rfcname = outname.sub(/\.txt$/, ".rfc.xml")
-          output(isodoc_node, outname, :rfc, options) unless @done_rfc
+          rfcname = inname.sub(/\.xml$/, ".rfc.xml")
+          output(isodoc_node, inname, rfcname, :rfc, options) unless @done_rfc
 
+          outname ||= inname.sub(/\.xml$/, ".txt")
           system("xml2rfc --text #{rfcname} -o #{outname}")
 
         when :pdf
@@ -75,9 +77,10 @@ module Metanorma
             return
           end
 
-          rfcname = outname.sub(/\.pdf$/, ".rfc.xml")
-          output(isodoc_node, outname, :rfc, options) unless @done_rfc
+          rfcname = inname.sub(/\.xml$/, ".rfc.xml")
+          output(isodoc_node, inname, rfcname, :rfc, options) unless @done_rfc
 
+          outname ||= inname.sub(/\.xml$/, ".pdf")
           system("xml2rfc --pdf #{rfcname} -o #{outname}")
 
         when :html
@@ -86,9 +89,10 @@ module Metanorma
             return
           end
 
-          rfcname = outname.sub(/\.html$/, ".rfc.xml")
-          output(isodoc_node, outname, :rfc, options) unless @done_rfc
+          rfcname = inname.sub(/\.xml$/, ".rfc.xml")
+          output(isodoc_node, inname, rfcname, :rfc, options) unless @done_rfc
 
+          outname ||= inname.sub(/\.xml$/, ".html")
           system("xml2rfc --html #{rfcname} -o #{outname}")
 
         else

data/lib/metanorma/ietf/version.rb

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

data/metanorma-ietf.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.0.0"
+  spec.add_dependency "isodoc", "~> 1.1.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.0.13
+  version: 2.1.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
   requirement: !ruby/object:Gem::Requirement
@@ -269,6 +269,7 @@ files:
 - lib/isodoc/ietf/section.rb
 - lib/isodoc/ietf/table.rb
 - lib/isodoc/ietf/terms.rb
+- lib/isodoc/ietf/xref.rb
 - lib/metanorma-ietf.rb
 - lib/metanorma/ietf.rb
 - lib/metanorma/ietf/processor.rb
@@ -281,7 +282,7 @@ homepage: https://github.com/metanorma/metanorma-ietf
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -296,9 +297,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: metanorma-ietf lets you write IETF documents, such as Internet-Drafts and
   RFCs, in AsciiDoc.