metanorma-nist 1.1.1 → 1.2.2

data/lib/isodoc/nist/pdf_convert.rb

@@ -1,5 +1,4 @@
 require "isodoc"
-require_relative "metadata"
 require "fileutils"
 require_relative "base_convert"
 

data/lib/isodoc/nist/presentation_xml_convert.rb

@@ -1,9 +1,79 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
   module NIST
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def convert1(docxml, filename, dir)
+        info docxml, nil
+        insert_preface_sections(docxml)
+        super
+      end
+
+      def insert_preface_sections(docxml)
+        insert_keywords(docxml)
+      end
+
+      def wrap_brackets(txt)
+        return txt if /^\[.*\]$/.match txt
+        "[#{txt}]"
+      end
+
+      def get_linkend(node)
+        contents = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
+        return unless contents.empty?
+        link = anchor_linkend(node, docid_l10n(node["target"] ||
+                                               wrap_brackets(node['citeas'])))
+        link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
+                                link)
+        non_locality_elems(node).each { |n| n.remove }
+        node.add_child(link)
+      end
+
+      def annex1(f)
+        lbl = @xrefs.anchor(f['id'], :label)
+        if t = f.at(ns("./title"))
+          t.children = "<strong>#{t.children.to_xml}</strong>"
+        end
+        prefix_name(f, " &mdash; ", lbl, "title")
+        t = f.at(ns("./title"))
+        t["xref"] = lbl.gsub(/<[^>]+>/, "")
+      end
+
+      def keyword_clause(kw)
+        <<~END
+        <clause id="_#{UUIDTools::UUID.random_create}" type="keyword">
+        <title>#{@i18n.keywords}</title>
+        #{@i18n.keywords_intro}
+        <p>#{@i18n.l10n(kw.join("; "))}</p></clause>
+        END
+      end
+
+      def insert_keywords(docxml)
+        kw = @meta.get[:keywords]
+        kw.empty? and return
+        if abstract = docxml.at(ns("//preface/abstract"))
+          abstract.next = keyword_clause(kw)
+        elsif foreword = docxml.at(ns("//preface/foreword"))
+          foreword.next = keyword_clause(kw)
+        else
+          preface_init_insert_pt(docxml)&.children&.first&.
+            add_previous_sibling(keyword_clause(kw))
+        end
+      end
+
+      def preface_init_insert_pt(docxml)
+        docxml.at(ns("//preface")) ||
+          docxml.at(ns("//sections")).
+          add_previous_sibling("<preface> </preface>").first
+      end
+
+      def clause1(f)
+        return if f.name == "references" && suppress_biblio_title(f)
+        super
+      end
+
+      include Init
     end
   end
 end

data/lib/isodoc/nist/refs.rb

@@ -34,7 +34,7 @@ module IsoDoc
         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"))
+          title = b.at(ns("./title[@language = '#{@lang}']")) || b.at(ns("./title"))
           r.i do |i|
             title&.children&.each { |n| parse(n, i) }
           end
@@ -66,9 +66,7 @@ module IsoDoc
         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" }
+              clause_parse_title(node, div, node.at(ns("./title")), out)
           end
           biblio_list(node, div, true)
         end
@@ -80,25 +78,12 @@ module IsoDoc
         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/render.rb

@@ -212,7 +212,8 @@ module Iso690Render
     container = doc.at("./relation[@type='includedIn']")
     if container && !date(doc) && date(container&.at("./bibitem"))
       doc << 
-      ( container&.at("./bibitem/date[@type = 'issued' or @type = 'published' or @type = 'circulated']")&.remove )
+      ( container&.at("./bibitem/date[@type = 'issued' or @type = 'published' or "\
+                      "@type = 'circulated']")&.remove )
     end
     ser = series_title(doc)
     dr = draft(doc)

data/lib/isodoc/nist/render_dates.rb

@@ -27,31 +27,6 @@ module Iso690Render
     date.sub(/^(\d\d\d\d).*$/, "\\1")
   end
 
-=begin
-  def self.monthyr(isodate)
-    return nil if isodate.nil?
-    arr = isodate.split("-")
-    date = if arr.size == 2
-      DateTime.new(*arr.map(&:to_i))
-    else
-      DateTime.parse(isodate)
-    end
-    date.localize(:en).to_additional_s("yMMMM")
-  end
-
-  def self.mmddyyyy(isodate)
-    return nil if isodate.nil?
-    arr = isodate.split("-")
-    date = if arr.size == 1 and (/^\d+$/.match isodate)
-             Date.new(*arr.map(&:to_i)).strftime("%Y")
-      elsif arr.size == 2
-      Date.new(*arr.map(&:to_i)).strftime("%m-%Y")
-    else
-      Date.parse(isodate).strftime("%m-%d-%Y")
-    end
-  end
-=end
-
   def self.MMMddyyyy(isodate)
     return nil if isodate.nil?
     return isodate if isodate == "--"

data/lib/isodoc/nist/section.rb

@@ -1,20 +1,35 @@
 module IsoDoc
   module NIST
     module BaseConvert
+      def keywords(docxml, out)
+        f = docxml.at(ns("//preface/clause[@type = 'keyword']")) || return
+        preface1(f, f&.at(ns("./title")), false, out)
+      end
+
+      def skip_render(c, isoxml)
+        return false unless c.name == "reviewernote"
+        status = isoxml&.at(ns("//bibdata/status/stage"))&.text
+        return true if status.nil?
+        /^final/.match status
+      end
+
       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")
+          clause_name(nil, f.at(ns("./title")) || @i18n.abstract, 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
+      FRONT_CLAUSE = "//*[parent::preface][not(local-name() = 'abstract' or "\
+        "local-name() = 'foreword' or @type = 'keyword')]".freeze
+
+      # 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)
+          next if skip_render(c, isoxml) || !is_clause?(c.name)
           title = c&.at(ns("./title"))
           patent = ["Call for Patent Claims",
                     "Patent Disclosure Notice"].include? title&.text
@@ -25,7 +40,7 @@ module IsoDoc
       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,
+          clause_name(nil, title, s,
                       class: (c.name == "executivesummary") ? "NormalTitle" :
                       "IntroTitle")
           c.elements.reject { |c1| c1.name == "title" }.each do |c1|
@@ -34,14 +49,7 @@ module IsoDoc
         end
       end
 
-       def middle(isoxml, out)
-        clause isoxml, out
-        require "byebug"; byebug
-        bibliography isoxml, out
-        annex isoxml, out
-      end
-
-       def foreword(isoxml, out)
+      def foreword(isoxml, out)
         f = isoxml.at(ns("//foreword")) || return
         out.div **attr_code(id: f["id"]) do |s|
           title = f.at(ns("./title"))
@@ -51,6 +59,11 @@ module IsoDoc
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
+
+      def is_clause?(name)
+        return true if %w(reviewernote executivesummary).include? name
+        super
+      end
     end
   end
 end

data/lib/isodoc/nist/word_convert.rb

@@ -1,8 +1,8 @@
 require "isodoc"
 require_relative "metadata"
 require "fileutils"
-require "sassc"
 require_relative "base_convert"
+require_relative "init"
 require_relative "word_convert_toc"
 
 module IsoDoc
@@ -14,6 +14,10 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
+        @wordToClevels = options[:doctoclevels].to_i
+        @wordToClevels = 3 if @wordToClevels.zero?
+        @htmlToClevels = options[:htmltoclevels].to_i
+        @htmlToClevels = 3 if @htmlToClevels.zero?
       end
 
       def convert1(docxml, filename, dir)
@@ -62,6 +66,7 @@ module IsoDoc
         body.div **{ class: "WordSection2" } do |div2|
           @prefacenum = 0
           info docxml, div2
+          preface_block docxml, div2
           foreword docxml, div2
           abstract docxml, div2
           keywords docxml, div2
@@ -72,12 +77,32 @@ module IsoDoc
         section_break(body)
       end
 
+      def toWord(result, filename, dir, header)
+        result = populate_template(result, :word)
+        result = from_xhtml(word_cleanup(to_xhtml(result)))
+        unless @landscapestyle.nil? || @landscapestyle.empty?
+          @wordstylesheet&.open
+          @wordstylesheet&.write(@landscapestyle)
+          @wordstylesheet&.close
+        end
+        Html2Doc.process(result, filename: filename,
+                         stylesheet: @wordstylesheet&.path,
+                         header_file: header&.path, dir: dir,
+                         asciimathdelims: [@openmathdelim, @closemathdelim],
+                         liststyles: { ul: @ulstyle, ol: @olstyle,
+                                       steps: "l4" })
+        header&.unlink
+        @wordstylesheet&.unlink
+      end
+
       def authority_cleanup(docxml)
-        docxml.xpath("//div[@class = 'authority']//h1 | //div[@class = 'authority']//h2").each do |h|
-          h.name = p
+        docxml&.xpath("//div[@class = 'authority']//h1 | "\
+                      "//div[@class = 'authority']//h2")&.each do |h|
+          h.name = "p"
           h["class"] = "IntroTitle"
         end
-        dest1 = docxml.xpath("//div[@class = 'authority6' and not(@id = 'authority6')]")
+        dest1 = docxml.xpath("//div[@class = 'authority6' and "\
+                             "not(@id = 'authority6')]")
         auth1 = docxml&.at("//div[@id = 'authority6']")&.remove
         dest1 and auth1 and dest1.each { |d| d.replace(auth1) }
         insert = docxml.at("//div[@class = 'WordSection2']")
@@ -124,6 +149,7 @@ module IsoDoc
       end
 
       def word_annex_cleanup(docxml)
+        word_annex_cleanup1(docxml, 1)
         word_annex_cleanup1(docxml, 2)
         word_annex_cleanup1(docxml, 3)
         word_annex_cleanup1(docxml, 4)
@@ -151,16 +177,6 @@ module IsoDoc
         docxml
       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
-
       def termdef_parse(node, out)
         out.table **{ class: "terms_dl" } do |dl|
           dl.tr do |tr|
@@ -174,7 +190,24 @@ module IsoDoc
         end
       end
 
+      def glossary_parse(node, out)
+        out.table  **attr_code(id: node["id"], class: "terms_dl") do |t|
+          node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
+            t.tr do |v|
+              v.td **attr_code(id: dt["id"], valign: "top", align: "left") do |term|
+                dt_parse(dt, term)
+              end
+              v.td  **attr_code(id: dd["id"], valign: "top") do |listitem|
+                dd.children.each { |n| parse(n, listitem) }
+              end
+            end
+          end
+        end
+        node.elements.reject { |n| dt_dd? n }.each { |n| parse(n, out) }
+      end
+
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/nist/xref.rb

@@ -50,35 +50,12 @@ module IsoDoc
       end
 
       def annex_name_lbl(clause, num)
-        l10n("<b>#{@labels['annex']} #{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
+        l10n("<strong>#{@labels['annex']} #{num}</strong>")
       end
 
       def hiersep
         "-"
       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)
-          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 = "1.1.1"
+    VERSION = "1.2.2"
   end
 end

data/metanorma-nist.gemspec

@@ -30,11 +30,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "iso-639"
   spec.add_dependency "tzinfo-data" # we need this for windows only
 
-  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
   #spec.add_dependency "relaton-nist", "~> 0.3.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.1'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -272,6 +286,7 @@ files:
 - lib/asciidoctor/nist/validate.rb
 - lib/isodoc/nist/base_convert.rb
 - lib/isodoc/nist/common.xsl
+- lib/isodoc/nist/html/_coverpage.css
 - lib/isodoc/nist/html/_coverpage.scss
 - lib/isodoc/nist/html/commerce-logo-color.png
 - lib/isodoc/nist/html/deptofcommerce.png
@@ -279,20 +294,27 @@ files:
 - lib/isodoc/nist/html/header_cswp.html
 - lib/isodoc/nist/html/html_nist_intro.html
 - lib/isodoc/nist/html/html_nist_titlepage.html
+- lib/isodoc/nist/html/htmlstyle.css
 - lib/isodoc/nist/html/htmlstyle.scss
 - lib/isodoc/nist/html/logo.png
 - lib/isodoc/nist/html/logo_cswp.png
+- lib/isodoc/nist/html/nist.css
 - lib/isodoc/nist/html/nist.scss
+- lib/isodoc/nist/html/nist_cswp.css
 - lib/isodoc/nist/html/nist_cswp.scss
 - lib/isodoc/nist/html/scripts.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
 - lib/isodoc/nist/html/word_nist_titlepage_cswp.html
+- lib/isodoc/nist/html/wordstyle.css
 - lib/isodoc/nist/html/wordstyle.scss
+- lib/isodoc/nist/html/wordstyle_cswp.css
 - lib/isodoc/nist/html/wordstyle_cswp.scss
 - lib/isodoc/nist/html_convert.rb
 - lib/isodoc/nist/i18n-en.yaml
+- lib/isodoc/nist/i18n.rb
+- lib/isodoc/nist/init.rb
 - lib/isodoc/nist/metadata.rb
 - lib/isodoc/nist/metadata_id.rb
 - lib/isodoc/nist/nist.cswp.xsl