metanorma-nist 0.0.4 → 0.0.5

data/lib/isodoc/nist/word_convert.rb

@@ -13,7 +13,8 @@ module IsoDoc
         super
       end
 
-            def convert1(docxml, filename, dir)
+      def convert1(docxml, filename, dir)
+        @bibliographycount = docxml.xpath(ns("//bibliography/references | //annex/references | //bibliography/clause/references")).size
         FileUtils.cp html_doc_path("logo.png"), "#{@localdir}/logo.png"
         FileUtils.cp html_doc_path("deptofcommerce.png"),
           "#{@localdir}/deptofcommerce.png"
@@ -24,9 +25,9 @@ module IsoDoc
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
                      '"Times New Roman",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-                       '"Arial",sans-serif'),
-          monospacefont: '"Courier New",monospace'
+                     headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                                  '"Arial",sans-serif'),
+                                  monospacefont: '"Courier New",monospace'
         }
       end
 
@@ -221,7 +222,11 @@ module IsoDoc
           out.div do |div|
             #div.p **{ class: "h1Annex" } do |h1|
             div.h1 do |h1|
-              f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
+              if @bibliographycount == 1
+                h1 << "References"
+              else
+                f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
+              end
             end
             f.elements.reject do |e|
               ["reference", "title", "bibitem"].include? e.name
@@ -459,6 +464,8 @@ module IsoDoc
 
       def info(isoxml, out)
         @meta.keywords isoxml, out
+        @meta.series isoxml, out
+        @meta.commentperiod isoxml, out
         super
       end
 
@@ -491,7 +498,7 @@ module IsoDoc
         end
       end
 
-            def middle_section_asset_names(d)
+      def middle_section_asset_names(d)
         middle_sections =
           "//xmlns:preface/child::* | //xmlns:sections/child::*"
         sequential_asset_names(d.xpath(middle_sections))
@@ -593,7 +600,11 @@ module IsoDoc
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]} &mdash; "
           t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
+            if @bibliographycount == 1 && annex.at(ns("./references"))
+              b << "References"
+            else
+              name&.children&.each { |c2| parse(c2, b) }
+            end
           end
         end
       end
@@ -602,7 +613,71 @@ module IsoDoc
         "-"
       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 | ./terms | ./term | ./references")).each_with_index do |c, i|
+          annex_names1(c, "#{num}.#{i + 1}", 2)
+        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
+
+      def termdef_parse(node, out)
+        pref = node.at(ns("./preferred"))
+        out.table **{ class: "terms_dl" } do |dl|
+          dl.tr do |tr|
+            tr.td **{ valign: "top", align: "left" } do |dt|
+              pref.children.each { |n| parse(n, dt) }
+            end
+            set_termdomain("")
+            tr.td **{ valign: "top" } do |dd|
+              node.children.each { |n| parse(n, dd) unless n.name == "preferred" }
+            end
+          end
+        end
+      end
 
+      def term_cleanup(docxml)
+        docxml.xpath("//table[@class = 'terms_dl']").each do |d|
+          prev = d.previous_element
+          next unless prev.name == "table" and prev["class"] == "terms_dl"
+          d.children.each { |n| prev.add_child(n.remove) }
+          d.remove
+        end
+        docxml
+      end
+
+      def bibliography_parse(node, out)
+        title = node&.at(ns("./title"))&.text || ""
+        out.div do |div|
+          node.parent.name == "annex" or
+            div.h2 title, **{ class: "Section3" }
+          node.elements.reject do |e|
+            ["reference", "title", "bibitem"].include? e.name
+          end.each { |e| parse(e, div) }
+          biblio_list(node, div, true)
+        end
+      end
     end
   end
 end

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/metanorma-nist.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
     Metanorma NIST gem.
   DESCRIPTION
 
-  spec.homepage      = "https://github.com/riboseinc/metanorma-nist"
+  spec.homepage      = "https://github.com/metanorma/metanorma-nist"
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "metanorma-standoc", "~> 1.1.0"
   spec.add_dependency "isodoc", "~> 0.9.0"
+  spec.add_dependency "twitter_cldr"
 
   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.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: twitter_cldr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +265,7 @@ files:
 - LICENSE
 - README.adoc
 - Rakefile
+- appveyor.yml
 - bin/console
 - bin/rspec
 - bin/setup
@@ -261,6 +276,7 @@ files:
 - lib/asciidoctor/nist/isodoc.rng
 - lib/asciidoctor/nist/isostandard.rng
 - lib/asciidoctor/nist/nist.rng
+- lib/asciidoctor/nist/reqt.rng
 - lib/isodoc/nist/html/commerce-logo-color.png
 - lib/isodoc/nist/html/deptofcommerce.png
 - lib/isodoc/nist/html/header.html
@@ -284,7 +300,7 @@ files:
 - lib/metanorma/nist/processor.rb
 - lib/metanorma/nist/version.rb
 - metanorma-nist.gemspec
-homepage: https://github.com/riboseinc/metanorma-nist
+homepage: https://github.com/metanorma/metanorma-nist
 licenses:
 - BSD-2-Clause
 metadata: {}