metanorma-nist 1.0.3 → 1.0.8

data/lib/isodoc/nist/pdf_convert.rb

@@ -13,154 +13,21 @@ module IsoDoc
         super
       end
 
-      def convert1(docxml, filename, dir)
-        @bibliographycount = docxml.xpath(ns("//bibliography/references | //annex/references | //bibliography/clause/references")).size
-        #FileUtils.cp html_doc_path('logo.png'), File.join(@localdir, "logo.png")
-        #FileUtils.cp html_doc_path('commerce-logo-color.png'), File.join(@localdir, "commerce-logo-color.png")
-        #@files_to_delete << File.join(@localdir, "logo.png")
-        #@files_to_delete << File.join(@localdir, "commerce-logo-color.png")
-        super
-      end
-
-      def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Libre Baskerville",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Libre Baskerville",serif'),
-          monospacefont: '"Space Mono",monospace'
-        }
-      end
-
-      def default_file_locations(_options)
-        {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: html_doc_path("html_nist_titlepage.html"),
-          htmlintropage: html_doc_path("html_nist_intro.html"),
-          scripts_pdf: html_doc_path("scripts.pdf.html"),
-        }
-      end
-
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      def googlefonts
-        <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,600,600i" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet" />
-    <link href="https://fonts.googleapis.com/css?family=Libre+Baskerville:400,400i,700,700i" rel="stylesheet">
-        HEAD
-      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
-      end
-
-      def make_body(xml, docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
-        xml.body **body_attr do |body|
-          make_body1(body, docxml)
-          make_body2(body, docxml)
-          make_body3(body, docxml)
-        end
-      end
-
-      def html_toc(docxml)
-        docxml
-      end
-
-      def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
-          foreword docxml, div3
-          abstract docxml, div3
-          keywords docxml, div3
-          boilerplate docxml, div3
-          preface docxml, div3
-          middle docxml, div3
-          footnotes div3
-          comments div3
+      def convert(filename, file = nil, debug = false)
+        file = File.read(filename, encoding: "utf-8") if file.nil?
+        docxml, outname_html, dir = convert_init(file, filename, debug)
+        @series =  docxml&.at(ns("//bibdata/series/abbreviation"))&.text
+        /\.xml$/.match(filename) or
+          filename = Tempfile.open([outname_html, ".xml"], encoding: "utf-8") do |f|
+          f.write file
+          f.path
         end
+        FileUtils.rm_rf dir
+        ::Metanorma::Output::XslfoPdf.new.convert(
+          filename, outname_html + ".pdf",
+          File.join(@libdir, @series == "NIST CSWP" ?
+                    "nist.cswp.xsl" : "nist.sp.xsl"))
       end
-
-      def authority_cleanup(docxml)
-        dest = docxml.at("//div[@id = 'authority']") || return
-        auth = docxml.at("//div[@class = 'authority']") || return
-        auth.xpath(".//h1 | .//h2").each { |h| h["class"] = "IntroTitle" }
-        dest1 = docxml.xpath("//div[@class = 'authority6']")
-        auth1 = docxml&.at("//div[@id = 'authority6']")&.remove
-        dest1 and auth1 and dest1.each { |d| d.replace(auth1) }
-        dest.replace(auth.remove)
-        a = docxml.at("//div[@id = 'authority1']") and a["class"] = "authority1"
-        a = docxml.at("//div[@id = 'authority2']") and a["class"] = "authority2"
-        a = docxml.at("//div[@id = 'authority3']") and a["class"] = "authority3"
-        a = docxml.at("//div[@id = 'authority3a']") and a["class"] = "authority3"
-        a = docxml.at("//div[@id = 'authority4']") and a["class"] = "authority4"
-        a = docxml.at("//div[@id = 'authority5']") and a["class"] = "authority5"
-        a = docxml.at("//div[@id = 'authority6']") and a["class"] = "authority6"
-      end
-
-      def cleanup(docxml)
-        super
-        term_cleanup(docxml)
-        requirement_cleanup(docxml)
-      end
-
-      def bibliography(isoxml, out)
-        f = isoxml.at(ns("//bibliography/clause | //bibliography/references")) || return
-        page_break(out)
-        isoxml.xpath(ns("//bibliography/clause | //bibliography/references")).each do |f|
-          out.div do |div|
-            div.h1 **{ class: "Section3" } do |h1|
-              if @bibliographycount == 1
-                h1 << "References"
-              else
-                f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
-              end
-            end
-            biblio_list(f, div, false)
-          end
-        end
-      end
-
-      def keywords(_docxml, out)
-        kw = @meta.get[:keywords]
-        kw.empty? and return
-        out.div **{ class: "Section3" } do |div|
-          out.div do |div|
-            clause_name(nil, "Keywords", div,  class: "IntroTitle")
-            div.p kw.sort.join("; ")
-          end
-        end
-      end
-
-      def termdef_parse(node, out)
-        pref = node.at(ns("./preferred"))
-        out.dl **{ class: "terms_dl" } do |dl|
-          dl.dt do |dt|
-            pref.children.each { |n| parse(n, dt) }
-          end
-          set_termdomain("")
-          dl.dd do |dd|
-            node.children.each { |n| parse(n, dd) unless n.name == "preferred" }
-          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
-
-      include BaseConvert
     end
   end
 end

data/lib/isodoc/nist/refs.rb

@@ -23,12 +23,12 @@ module IsoDoc
       def reference_format(b, r)
         id = bibitem_ref_code(b)
         code = render_identifier(id)
-        if id["type"] == "metanorma"
-          r << "[#{code}] "
+        if code[0]
+          r << "#{code[0]} "
           insert_tab(r, 1)
         end
         reference_format1(b, r)
-        r << " [#{code}] " unless id["type"] == "metanorma"
+        r << " [#{code[1]}] " if code[1]
       end
 
       def reference_format1(b, r)
@@ -42,6 +42,12 @@ module IsoDoc
         end
       end
 
+      def bracket_if_num(x)
+        return nil if x.nil?
+        x = x.text.sub(/^\[/, "").sub(/\]$/, "")
+        "[#{x}]"
+      end
+
       def omit_docid_prefix(prefix)
         return true if prefix.nil? || prefix.empty?
         super || prefix == "NIST"

data/lib/isodoc/nist/render.rb

@@ -93,7 +93,7 @@ module Iso690Render
   def self.standardidentifier(doc)
     ret = []
     doc.xpath("./docidentifier").each do |id|
-      next if %w(nist-mr nist-long).include? id["type"]
+      next if %w(nist-mr nist-long metanorma rfc-anchor).include? id["type"]
       ret << standardidentifier1(id)
     end
     ret.join(". ")
@@ -134,7 +134,7 @@ module Iso690Render
     "book"
   end
 
-  def self.extent1(type, from, to)
+  def self.extent2(type, from, to)
     ret = ""
     case type 
     when "page" then type = to ? "pp." : "p."
@@ -146,15 +146,31 @@ module Iso690Render
     ret
   end
 
-  def self.extent(localities)
+  def self.extent1(localities)
     ret = []
     localities.each do |l|
-      ret << extent1(l["type"] || "page", 
+      ret << extent2(l["type"] || "page", 
                      l.at("./referenceFrom"), l.at("./referenceTo"))
     end
     ret.join(", ")
   end
 
+  def self.extent(localities)
+    ret = []
+    ret1 = ""
+    localities.each do |l|
+      if %w(localityStack).include? l.name
+        ret << ret1
+        ret1 = ""
+        ret << extent1(l.children)
+      else
+        ret1 += extent1([l])
+      end
+    end
+    ret << ret1
+    ret.reject { |c| c.empty? }.join("; ")
+  end
+
   def self.draft(doc)
     return nil unless is_nist(doc)
     dr = doc&.at("./status/stage")&.text
@@ -207,7 +223,6 @@ module Iso690Render
     else
       ret += embedded ? wrap(creatornames(doc), "", "") : wrap(creatornames(doc), "", "")
     end
-
     if dr
       mdy = MMMddyyyy(date(doc)) and ret += wrap(mdy, " (", ")")
     else
@@ -229,8 +244,7 @@ module Iso690Render
     ret += wrap(accessLocation(doc), " At: ", ".")
     if container 
       ret += wrap(parse(container.at("./bibitem"), true), " In: ", "")
-      locality = container.xpath("./locality")
-      locality.empty? and locality = doc.xpath("./extent")
+      locality = doc.xpath("./extent")
       ret += wrap(extent(locality))
     else
       ret += wrap(extent(doc.xpath("./extent")))

data/lib/isodoc/nist/render_dates.rb

@@ -54,6 +54,7 @@ module Iso690Render
 
   def self.MMMddyyyy(isodate)
     return nil if isodate.nil?
+    return isodate if isodate == "--"
     arr = isodate.split("-")
     date = if arr.size == 1 and (/^\d+$/.match isodate)
              Date.new(*arr.map(&:to_i)).strftime("%Y")

data/lib/isodoc/nist/xrefs.rb

@@ -70,26 +70,6 @@ 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")).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

data/lib/metanorma/nist/processor.rb

@@ -3,6 +3,13 @@ require "metanorma/processor"
 module Metanorma
   module NIST
     class Processor < Metanorma::Processor
+      def self.fonts_used
+        {
+          html: ["Times New Roman", "Arial", "Courier New"],
+          doc: ["Times New Roman", "Arial", "Courier New"],
+          pdf: ["Times New Roman", "Arial", "Courier New"],
+        }
+      end
 
       def initialize
         @short = :nist

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.0.3"
+    VERSION = "1.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -257,6 +257,7 @@ files:
 - lib/asciidoctor/nist/reqt.rng
 - lib/asciidoctor/nist/validate.rb
 - lib/isodoc/nist/base_convert.rb
+- lib/isodoc/nist/common.xsl
 - lib/isodoc/nist/html/_coverpage.scss
 - lib/isodoc/nist/html/commerce-logo-color.png
 - lib/isodoc/nist/html/deptofcommerce.png
@@ -270,7 +271,6 @@ files:
 - lib/isodoc/nist/html/nist.scss
 - lib/isodoc/nist/html/nist_cswp.scss
 - lib/isodoc/nist/html/scripts.html
-- lib/isodoc/nist/html/scripts.pdf.html
 - lib/isodoc/nist/html/word_nist_intro.html
 - lib/isodoc/nist/html/word_nist_intro_cswp.html
 - lib/isodoc/nist/html/word_nist_titlepage.html
@@ -281,6 +281,8 @@ files:
 - lib/isodoc/nist/i18n-en.yaml
 - lib/isodoc/nist/metadata.rb
 - lib/isodoc/nist/metadata_id.rb
+- lib/isodoc/nist/nist.cswp.xsl
+- lib/isodoc/nist/nist.sp.xsl
 - lib/isodoc/nist/pdf_convert.rb
 - lib/isodoc/nist/refs.rb
 - lib/isodoc/nist/render.rb

data/lib/isodoc/nist/html/scripts.pdf.html

@@ -1,72 +0,0 @@
-  <script>
-    //TOC generation
-      $('#toc').toc({
-          'selectors': toclevel(), //elements to use as headings
-          'container': 'body', //element to find all selectors in
-          'smoothScrolling': true, //enable or disable smooth scrolling on click
-          'prefix': 'toc', //prefix for anchor tags and class names
-          'onHighlight': function(el) {}, //called when a new section is highlighted 
-          'highlightOnScroll': false, //add class to heading that is currently in focus
-          'highlightOffset': 100, //offset to trigger the next headline
-          'anchorName': function(i, heading, prefix) { //custom function for anchor name
-              return prefix+i;
-          },
-          'headerText': function(i, heading, $heading) { //custom function building the header-item text
-              return $heading.text();
-          },
-      'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
-        return $heading[0].tagName.toLowerCase();
-      }
-      });
-      
-  </script>
-
-<script>
-  //TOC toggle animation
-$('#toggle').on('click', function(){
-    if( $('nav').is(':visible') ) {
-        $('nav').animate({ 'left': '-353px' }, 'slow', function(){
-            $('nav').hide();
-        });
-        $('.container').animate({ 'padding-left': '31px' }, 'slow');
-    }
-    else {
-        $('nav').show();
-        $('nav').animate({ 'left': '0px' }, 'slow');
-        $('.container').animate({ 'padding-left': '360px' }, 'slow');
-    }
-});
-</script>
-
-<script>
-    // Scroll to top button
-    window.onscroll = function() {scrollFunction()};
-    
-    function scrollFunction() {
-        if (document.body.scrollTop > 100 || document.documentElement.scrollTop > 100) {
-            document.getElementById("myBtn").style.display = "block";
-        } else {
-            document.getElementById("myBtn").style.display = "none";
-        }
-    }
-    
-    // When the user clicks on the button, scroll to the top of the document
-    function topFunction() {
-        document.body.scrollTop = 0;
-        document.documentElement.scrollTop = 0;
-    }
-    </script>
-
-  <script>
-/*
-  $(document).ready(function() {
-          $('[id^=toc]').each(function ()
-          {
-             var currentToc = $(this);
-       var url = window.location.href;
-             currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
-          });
-});
-*/
-</script>
-