metanorma-nist 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e605d8d42f719740cb4c9de5c9cc7cecfe0e71566067ece25d619f1ce1fb095a
-  data.tar.gz: 78ca48431b9d32a30ae5cf8de2ed6b88e364e3c468b4c1fa64db89155a0e675c
+  metadata.gz: 53bb2d233e8d14f8dea275aec0532f9c6d91e2248f7f1128b89850f666201d50
+  data.tar.gz: 3c39f1c061185dbf87e0ef8c66d477effa41e3b7694fd7bf1bf4ad57112746fe
 SHA512:
-  metadata.gz: 67bc90cf9c955322fc823240df276d139fb1fcdd08b318c509f003945dcad9684bdd093bc39e49a1a70940c200dd11c288234bfb0231a9aa4af1af5a1aaa6a68
-  data.tar.gz: a3e78549156b699cd83fae721ce4d218de9205779453f16af6fa4b45e285a4306dc936439e49aa63f9f983e24b3bfe827f0550ff00be78c54f4443f4e845037d
+  metadata.gz: 6a64e2d06c7cb26477e6dd86df42e64b1b3800858429c2c1fe42ed6a3f73d709114bb81d80b9b94845fa9a7c3c15ef40685620d67c3f019ea2ed9d0f9a4b508e
+  data.tar.gz: 239c4c3d89d8a6031e06e726f390b00eaebcf2d0fe9bbf3a7609e6a6cc0cd3af4b89db345b915680a67b6eb5115e41cff8789403e39cb35abe7954051dccf245

data/lib/asciidoctor/nist/reqt.rng

@@ -87,7 +87,7 @@
     </element>
   </define>
   <define name="reqinherit">
-    <element name="subject">
+    <element name="inherit">
       <text/>
     </element>
   </define>

data/lib/isodoc/nist/base_convert.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require_relative "metadata"
+require_relative "xrefs"
 require "fileutils"
 
 module IsoDoc
@@ -60,10 +61,6 @@ module IsoDoc
         end
       end
 
-      def i18n_init(lang, script)
-        super
-      end
-
       def fileloc(loc)
         File.join(File.dirname(__FILE__), loc)
       end
@@ -156,29 +153,29 @@ module IsoDoc
       end
 
       def errata_head(t)
-          t.thead do |h|
-            h.tr do |tr|
-              %w(Date Type Change Pages).each do |hdr|
-                tr.th hdr
-              end
+        t.thead do |h|
+          h.tr do |tr|
+            %w(Date Type Change Pages).each do |hdr|
+              tr.th hdr
             end
           end
+        end
       end
 
       def errata_body(t, node)
-          t.tbody do |b|
-            node.xpath(ns("./row")).each do |row|
-              b.tr do |tr|
-                %w{date type change pages}.each do |hdr|
-                  tr.td do |td|
-                    row&.at(ns("./#{hdr}"))&.children.each do |n|
-                      parse(n, td)
-                    end
+        t.tbody do |b|
+          node.xpath(ns("./row")).each do |row|
+            b.tr do |tr|
+              %w{date type change pages}.each do |hdr|
+                tr.td do |td|
+                  row&.at(ns("./#{hdr}"))&.children.each do |n|
+                    parse(n, td)
                   end
                 end
               end
             end
           end
+        end
       end
 
       MIDDLE_CLAUSE = "//clause[parent::sections] | "\
@@ -200,50 +197,6 @@ module IsoDoc
         super
       end
 
-      SECTIONS_XPATH =
-        "//foreword | //introduction | //reviewnote | //executivesummary | //annex | "\
-        "//sections/clause | //bibliography/references | "\
-        "//bibliography/clause".freeze
-
-      def initial_anchor_names(d)
-        d.xpath("//xmlns:boilerplate/child::* | //xmlns:preface/child::*").each do |c|
-          preface_names(c)
-        end
-        @in_execsummary = true
-        hierarchical_asset_names(d.xpath("//xmlns:executivesummary"), "ES")
-        @in_execsummary = false
-        clause_names(d, 0)
-        middle_section_asset_names(d)
-        termnote_anchor_names(d)
-        termexample_anchor_names(d)
-      end
-
-      def back_anchor_names(docxml)
-        docxml.xpath(ns("//annex")).each_with_index do |c, i|
-          annex_names(c, (65 + i).chr.to_s)
-        end
-        docxml.xpath(ns("//bibliography/clause | "\
-                        "//bibliography/references")).each do |b|
-          preface_names(b)
-        end
-        docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-          reference_names(ref)
-        end
-      end
-
-      def middle_section_asset_names(d)
-        middle_sections = "//xmlns:preface/child::*[not(self::xmlns:executivesummary)] | "\
-          "//xmlns:sections/child::*"
-        sequential_asset_names(d.xpath(middle_sections))
-      end
-
-      def clause_names(docxml, sect_num)
-        q = "//xmlns:sections/child::*"
-        docxml.xpath(q).each_with_index do |c, i|
-          section_names(c, (i + sect_num), 1)
-        end
-      end
-
       def get_linkend(node)
         link = anchor_linkend(node, docid_l10n(node["target"] || "[#{node['citeas']}]"))
         link += eref_localities(node.xpath(ns("./locality")), link)
@@ -264,47 +217,6 @@ module IsoDoc
         super.merge(y)
       end
 
-      def annex_name_lbl(clause, num)
-        l10n("<b>#{@annex_lbl} #{num}</b>")
-      end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{anchor(annex['id'], :label)} &mdash; "
-          t.b do |b|
-            if @bibliographycount == 1 && annex.at(ns("./references"))
-              b << "References"
-            else
-              name&.children&.each { |c2| parse(c2, b) }
-            end
-          end
-        end
-      end
-
-      def hiersep
-        "-"
-      end
-
-      def annex_names(clause, num)
-        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), type: "clause",
-                                   xref: "#{@annex_lbl} #{num}", level: 1 }
-        clause.xpath(ns("./clause")).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", 2)
-        end
-        clause.xpath(ns("./terms | ./term | ./references")).each_with_index do |c, i|
-          annex_names1(c, "#{num}", 1)
-        end
-        hierarchical_asset_names(clause, num)
-      end
-
-      def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
-                                   level: level, type: "clause" }
-        clause.xpath(ns("./clause | ./terms | ./term | ./references")).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", level + 1)
-        end
-      end
-
       def terms_parse(node, out)
         out.div **attr_code(id: node["id"]) do |div|
           node.at(ns("./title")) and
@@ -334,7 +246,7 @@ module IsoDoc
         "organization[abbreviation = 'NIST' or xmlns:name = 'NIST']".freeze
 
       # we are taking the ref number/code out as prefix to reference
-      def noniso_bibitem(list, b, ordinal, bibliography)
+      def nonstd_bibitem(list, b, ordinal, bibliography)
         list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
           if !b.at(ns("./formattedref"))
             nist_reference_format(b, r)
@@ -344,18 +256,22 @@ module IsoDoc
         end
       end
 
+      def std_bibitem_entry(list, b, ordinal, biblio)
+        nonstd_bibitem(list, b, ordinal, biblio)
+      end
+
       def reference_format(b, r)
-        code = iso_bibitem_ref_code(b)
-        if /^\[\d+\]$/.match(code)
-          r << "#{code} "
+        code = bibitem_ref_code(b)
+        if /^\d+$/.match(code)
+          r << "[#{code}] "
           insert_tab(r, 1)
         end
         reference_format1(b, r)
-        r << " [#{code}] " unless /^\[\d+\]$/.match(code)
+        r << " [#{code}] " unless /^\d+$/.match(code)
       end
 
       def reference_format1(b, r)
-                if ftitle = b.at(ns("./formattedref"))
+        if ftitle = b.at(ns("./formattedref"))
           ftitle&.children&.each { |n| parse(n, r) }
         else
           title = b.at(ns("./title[@language = '#{@language}']")) || b.at(ns("./title"))
@@ -367,7 +283,7 @@ module IsoDoc
 
       def omit_docid_prefix(prefix)
         return true if prefix.nil? || prefix.empty?
-        return ["ISO", "IEC", "NIST"].include? prefix
+        super || prefix == "NIST"
       end
 
       def nist_reference_format(b, r)

data/lib/isodoc/nist/html_convert.rb

@@ -52,13 +52,25 @@ module IsoDoc
       end
 
       def toclevel
-        <<~HEAD.freeze
-    function toclevel() { var i; var text = "";
-      for(i = 1; i <= #{@htmlToClevels}; i++) {
-        if (i > 1) { text += ","; } text += "h" + i + ":not(:empty):not(.TermNum):not(.AbstractTitle):not(.IntroTitle):not(.ForewordTitle)"; }
-      return text;}
-        HEAD
+        ret = toclevel_classes.map { |l| "#{l}:not(:empty):not(.TermNum):not(.noTOC):not(.AbstractTitle):not(.IntroTitle):not(.ForewordTitle)" }
+      <<~HEAD.freeze
+    function toclevel() { return "#{ret.join(',')}";}
+      HEAD
+    end
+
+      def html_toc(docxml)
+      idx = docxml.at("//div[@id = 'toc']") or return docxml
+      toc = "<ul>"
+      path = toclevel_classes.map do |l|
+        "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')][not(text())][not(@class = 'AbstractTitle')][not(@class = 'IntroTitle')][not(@class = 'ForewordTitle')]"
+      end
+      docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
+        h["id"] ||= "toc#{tocidx}"
+        toc += html_toc_entry(h.name, h)
       end
+      idx.children = "#{toc}</ul>"
+      docxml
+    end
 
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }

data/lib/isodoc/nist/xrefs.rb

@@ -0,0 +1,106 @@
+require "isodoc"
+require_relative "metadata"
+require "fileutils"
+
+module IsoDoc
+  module NIST
+    module BaseConvert
+      SECTIONS_XPATH =
+        "//foreword | //introduction | //reviewnote | //executivesummary | //annex | "\
+        "//sections/clause | //bibliography/references | "\
+        "//bibliography/clause".freeze
+
+      def initial_anchor_names(d)
+        d.xpath("//xmlns:boilerplate/child::* | //xmlns:preface/child::*").each do |c|
+          preface_names(c)
+        end
+        @in_execsummary = true
+        hierarchical_asset_names(d.xpath("//xmlns:executivesummary"), "ES")
+        @in_execsummary = false
+        clause_names(d, 0)
+        middle_section_asset_names(d)
+        termnote_anchor_names(d)
+        termexample_anchor_names(d)
+      end
+
+      def back_anchor_names(docxml)
+        docxml.xpath(ns("//annex")).each_with_index do |c, i|
+          annex_names(c, (65 + i).chr.to_s)
+        end
+        docxml.xpath(ns("//bibliography/clause | "\
+                        "//bibliography/references")).each do |b|
+          preface_names(b)
+        end
+        docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
+          reference_names(ref)
+        end
+      end
+
+      def middle_section_asset_names(d)
+        middle_sections = "//xmlns:preface/child::*[not(self::xmlns:executivesummary)] | "\
+          "//xmlns:sections/child::*"
+        sequential_asset_names(d.xpath(middle_sections))
+      end
+
+      def clause_names(docxml, sect_num)
+        q = "//xmlns:sections/child::*"
+        docxml.xpath(q).each_with_index do |c, i|
+          section_names(c, (i + sect_num), 1)
+        end
+      end
+
+      def annex_name_lbl(clause, num)
+        l10n("<b>#{@annex_lbl} #{num}</b>")
+      end
+
+      def annex_name(annex, name, div)
+        div.h1 **{ class: "Annex" } do |t|
+          t << "#{anchor(annex['id'], :label)} &mdash; "
+          t.b do |b|
+            if @bibliographycount == 1 && annex.at(ns("./references"))
+              b << "References"
+            else
+              name&.children&.each { |c2| parse(c2, b) }
+            end
+          end
+        end
+      end
+
+      def hiersep
+        "-"
+      end
+
+      def annex_names(clause, num)
+        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), type: "clause",
+                                   xref: "#{@annex_lbl} #{num}", level: 1 }
+        clause.xpath(ns("./clause")).each_with_index do |c, i|
+          annex_names1(c, "#{num}.#{i + 1}", 2)
+        end
+        clause.xpath(ns("./terms | ./term | ./references")).each_with_index do |c, i|
+          annex_names1(c, "#{num}", 1)
+        end
+        hierarchical_asset_names(clause, num)
+      end
+
+      def annex_names1(clause, num, level)
+        @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
+                                   level: level, type: "clause" }
+        clause.xpath(ns("./clause | ./terms | ./term | ./references")).each_with_index do |c, i|
+          annex_names1(c, "#{num}.#{i + 1}", level + 1)
+        end
+      end
+
+      def terms_parse(node, out)
+        out.div **attr_code(id: node["id"]) do |div|
+          node.at(ns("./title")) and
+            clause_parse_title(node, div, node.at(ns("./title")), out)
+          term_defs_boilerplate(div, node.xpath(ns(".//termdocsource")),
+                                node.at(ns(".//term")), node.at(ns("./p")))
+          node.elements.each do |e|
+            parse(e, div) unless %w{title source}.include? e.name
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "0.1.5"
+    VERSION = "0.2.0"
   end
 end

data/metanorma-nist.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "tzinfo-data" # we need this for windows only
 
-  spec.add_dependency "metanorma-standoc", "~> 1.2.0"
-  spec.add_dependency "isodoc", "~> 0.10.0"
-  spec.add_dependency "relaton-nist", "~> 0.3.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.3.0"
+  spec.add_dependency "isodoc", "~> 1.0.0"
+  #spec.add_dependency "relaton-nist", "~> 0.3.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -86,42 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: relaton-nist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -330,6 +316,7 @@ files:
 - lib/isodoc/nist/pdf_convert.rb
 - lib/isodoc/nist/render.rb
 - lib/isodoc/nist/word_convert.rb
+- lib/isodoc/nist/xrefs.rb
 - lib/metanorma-nist.rb
 - lib/metanorma/nist.rb
 - lib/metanorma/nist/processor.rb