metanorma-nist 1.0.7 → 1.1.1

data/lib/isodoc/nist/pdf_convert.rb

@@ -7,26 +7,15 @@ module IsoDoc
   module NIST
     # A {Converter} implementation that generates PDF HTML output, and a
     # document schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::PdfConvert
+    class PdfConvert < IsoDoc::XslfoPdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
       end
 
-      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"))
+      def pdf_stylesheet(docxml)
+        series =  docxml&.at(ns("//bibdata/series/abbreviation"))&.text
+        series == "NIST CSWP" ?  "nist.cswp.xsl" : "nist.sp.xsl"
       end
     end
   end

data/lib/isodoc/nist/presentation_xml_convert.rb

@@ -0,0 +1,10 @@
+require_relative "base_convert"
+require "isodoc"
+
+module IsoDoc
+  module NIST
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+    end
+  end
+end
+

data/lib/isodoc/nist/refs.rb

@@ -21,14 +21,13 @@ module IsoDoc
       end
 
       def reference_format(b, r)
-        id = bibitem_ref_code(b)
-        code = render_identifier(id)
-        if id["type"] == "metanorma"
-          r << "[#{code}] "
+        code = render_identifier(bibitem_ref_code(b))
+        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,15 +41,64 @@ 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"
       end
 
       def nist_reference_format(b, r)
+        code = render_identifier(bibitem_ref_code(b))
+        if code[0]
+          r << "#{code[0]} "
+          insert_tab(r, 1)
+        end
         bibitem = b.dup.to_xml
         r.parent.add_child ::Iso690Render.render(bibitem, true)
       end
+
+      def bibliography_parse(node, out)
+        title = node&.at(ns("./title"))&.text || ""
+        out.div do |div|
+          unless suppress_biblio_title(node)
+            @xrefs.anchor(node['id'], :label, false) and
+              clause_parse_title(node, div, node.at(ns("./title")), out) or
+              div.h2 title, **{ class: "Section3" }
+          end
+          biblio_list(node, div, true)
+        end
+      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 then h1 << "References"
+              else
+                f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
+              end
+            end
+            biblio_list(f, div, false)
+          end
+        end
+      end
+
+      def suppress_biblio_title(node)
+        return false unless node.parent.name == "annex"
+        return false if node.parent.xpath("./references | ./clause | "\
+                                          "./terms | ./definitions").size > 1
+        title1 = node&.at(ns("./title"))&.text
+        return true unless title1
+        title2 = node&.parent&.at(ns("./title"))&.text
+        title1&.casecmp(title2) == 0
+      end
     end
   end
 end

data/lib/isodoc/nist/section.rb

@@ -0,0 +1,56 @@
+module IsoDoc
+  module NIST
+    module BaseConvert
+      def abstract(isoxml, out)
+        f = isoxml.at(ns("//preface/abstract")) || return
+        #page_break(out)
+        out.div **attr_code(id: f["id"]) do |s|
+          clause_name(nil, @abstract_lbl, s, class: "AbstractTitle")
+          f.elements.each { |e| parse(e, s) unless e.name == "title" }
+        end
+      end
+
+       # All "[preface]" sections should have class "IntroTitle" to prevent
+      # page breaks, but for the Exec Summary
+      def preface(isoxml, out)
+        isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
+          next if skip_render(c, isoxml)
+          title = c&.at(ns("./title"))
+          patent = ["Call for Patent Claims",
+                    "Patent Disclosure Notice"].include? title&.text
+          preface1(c, title, patent, out)
+        end
+      end
+
+      def preface1(c, title, patent, out)
+        out.div **attr_code(id: c["id"]) do |s|
+          page_break(s) if patent
+          clause_name(@xrefs.anchor(c['id'], :label), title, s,
+                      class: (c.name == "executivesummary") ? "NormalTitle" :
+                      "IntroTitle")
+          c.elements.reject { |c1| c1.name == "title" }.each do |c1|
+            parse(c1, s)
+          end
+        end
+      end
+
+       def middle(isoxml, out)
+        clause isoxml, out
+        require "byebug"; byebug
+        bibliography isoxml, out
+        annex isoxml, out
+      end
+
+       def foreword(isoxml, out)
+        f = isoxml.at(ns("//foreword")) || return
+        out.div **attr_code(id: f["id"]) do |s|
+          title = f.at(ns("./title"))
+          s.h1(**{ class: "ForewordTitle" }) do |h1|
+            title and title.children.each { |e| parse(e, h1) }
+          end
+          f.elements.each { |e| parse(e, s) unless e.name == "title" }
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/nist/word_convert.rb

@@ -49,10 +49,6 @@ module IsoDoc
           olstyle: "l2" }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
         xml.body **body_attr do |body|
@@ -155,29 +151,6 @@ module IsoDoc
         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.p **{ class: "h1Annex" } do |h1|
-            div.h1 do |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
-            end.each { |e| parse(e, div) }
-            biblio_list(f, div, false)
-          end
-        end
-      end
-
       def keywords(_docxml, out)
         kw = @meta.get[:keywords]
         kw.empty? and return
@@ -189,31 +162,18 @@ module IsoDoc
       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) }
+              term_and_termref_parse(node, dt)
             end
-            set_termdomain("")
             tr.td **{ valign: "top" } do |dd|
-              node.children.each { |n| parse(n, dd) unless n.name == "preferred" }
+              term_rest_parse(node, dd)
             end
           end
         end
       end
 
-      def term_cleanup(docxml)
-        docxml.xpath("//table[@class = 'terms_dl']").each do |d|
-          prev = d.previous_element
-          next unless prev and 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

data/lib/isodoc/nist/word_convert_toc.rb

@@ -35,7 +35,7 @@ module IsoDoc
       <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;TableTitle,1&quot; <span
+        \\h \\z \\t &quot;TableTitle,tabletitle&quot; <span
         style='mso-element:field-separator'></span></span>
       TOC
 
@@ -43,7 +43,7 @@ module IsoDoc
       <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;FigureTitle,1&quot; <span
+        \\h \\z \\t &quot;FigureTitle,figuretitle&quot; <span
         style='mso-element:field-separator'></span></span>
       TOC
 

data/lib/isodoc/nist/{xrefs.rb → xref.rb}

@@ -4,7 +4,7 @@ require "fileutils"
 
 module IsoDoc
   module NIST
-    module BaseConvert
+    class Xref < IsoDoc::Xref
       SECTIONS_XPATH =
         "//foreword | //introduction | //reviewnote | //executivesummary | //annex | "\
         "//sections/clause | //bibliography/references | //acknowledgements | "\
@@ -50,7 +50,7 @@ module IsoDoc
       end
 
       def annex_name_lbl(clause, num)
-        l10n("<b>#{@annex_lbl} #{num}</b>")
+        l10n("<b>#{@labels['annex']} #{num}</b>")
       end
 
       def annex_name(annex, name, div)

data/lib/metanorma-nist.rb

@@ -3,7 +3,9 @@ require_relative "asciidoctor/nist/converter"
 require_relative "isodoc/nist/html_convert"
 require_relative "isodoc/nist/pdf_convert"
 require_relative "isodoc/nist/word_convert"
+require_relative "isodoc/nist/presentation_xml_convert"
 require_relative "isodoc/nist/render"
+require_relative "isodoc/nist/xref"
 require_relative "metanorma/nist/version"
 
 if defined? Metanorma

data/lib/metanorma/nist/processor.rb

@@ -4,7 +4,11 @@ module Metanorma
   module NIST
     class Processor < Metanorma::Processor
       def self.fonts_used
-        ["Times New Roman", "Arial", "Courier New"]
+        {
+          html: ["Times New Roman", "Arial", "Courier New"],
+          doc: ["Times New Roman", "Arial", "Courier New"],
+          pdf: ["Times New Roman", "Arial", "Courier New"],
+        }
       end
 
       def initialize
@@ -25,18 +29,16 @@ module Metanorma
         "Metanorma::NIST #{Metanorma::NIST::VERSION}"
       end
 
-      def input_to_isodoc(file, filename)
-        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
-      end
-
-      def output(isodoc_node, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options={})
         case format
         when :html
-          IsoDoc::NIST::HtmlConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::NIST::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::NIST::WordConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::NIST::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::NIST::PdfConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::NIST::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :presentation
+          IsoDoc::NIST::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.0.7"
+    VERSION = "1.1.1"
   end
 end

data/metanorma-nist.gemspec

@@ -27,10 +27,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "twitter_cldr"
+  spec.add_dependency "iso-639"
   spec.add_dependency "tzinfo-data" # we need this for windows only
 
-  spec.add_dependency "metanorma-standoc", "~> 1.3.0"
-  spec.add_dependency "isodoc", "~> 1.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
+  spec.add_dependency "isodoc", "~> 1.1.0"
   #spec.add_dependency "relaton-nist", "~> 0.3.0"
 
   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: 1.0.7
+  version: 1.1.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: iso-639
+  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: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     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: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +285,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
@@ -285,13 +298,15 @@ files:
 - lib/isodoc/nist/nist.cswp.xsl
 - lib/isodoc/nist/nist.sp.xsl
 - lib/isodoc/nist/pdf_convert.rb
+- lib/isodoc/nist/presentation_xml_convert.rb
 - lib/isodoc/nist/refs.rb
 - lib/isodoc/nist/render.rb
 - lib/isodoc/nist/render_contributors.rb
 - lib/isodoc/nist/render_dates.rb
+- lib/isodoc/nist/section.rb
 - lib/isodoc/nist/word_convert.rb
 - lib/isodoc/nist/word_convert_toc.rb
-- lib/isodoc/nist/xrefs.rb
+- lib/isodoc/nist/xref.rb
 - lib/metanorma-nist.rb
 - lib/metanorma/nist.rb
 - lib/metanorma/nist/processor.rb
@@ -301,7 +316,7 @@ homepage: https://github.com/metanorma/metanorma-nist
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -316,9 +331,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 NIST gem.
 test_files: []