metanorma-nist 1.0.5 → 1.0.6

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/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-05-01 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
@@ -281,6 +282,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