metanorma-nist 0.2.3 → 0.2.4

data/lib/isodoc/nist/html_convert.rb

@@ -93,6 +93,7 @@ module IsoDoc
         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"
       end

data/lib/isodoc/nist/metadata.rb

@@ -151,9 +151,12 @@ module IsoDoc
         ixml.xpath(ns("//bibdata/date")).each do |d|
           val = Common::date_range(d)
           next if val == "XXX"
-          set("#{d['type']}date_monthyear".to_sym, daterange_proc(val, :monthyr))
-          set("#{d['type']}date_mmddyyyy".to_sym, daterange_proc(val, :mmddyyyy))
-          set("#{d['type']}date_MMMddyyyy".to_sym, daterange_proc(val, :MMMddyyyy))
+          set("#{d['type']}date_monthyear".to_sym,
+              daterange_proc(val, :monthyr))
+          set("#{d['type']}date_mmddyyyy".to_sym,
+              daterange_proc(val, :mmddyyyy))
+          set("#{d['type']}date_MMMddyyyy".to_sym,
+              daterange_proc(val, :MMMddyyyy))
         end
         withdrawal_pending(ixml)
         most_recent_date(ixml)
@@ -193,6 +196,9 @@ module IsoDoc
       def series(ixml, _out)
         series = ixml.at(ns("//bibdata/series[@type = 'main']/title"))&.text
         set(:series, series) if series
+        seriesabbr =
+          ixml.at(ns("//bibdata/series[@type = 'main']/abbreviation"))&.text
+        set(:seriesabbr, seriesabbr) if seriesabbr
         subseries = ixml.at(ns("//bibdata/series[@type = 'secondary']/"\
                                "title"))&.text
         set(:subseries, subseries) if subseries
@@ -275,7 +281,8 @@ module IsoDoc
           set(:superseding_uri, uri)
         superseding_titles(ixml, d)
         authors = d.xpath(ns("./contributor[role/@type = 'author']/person"))
-        authors = ixml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person")) if authors.empty?
+        authors.empty? and authors =
+          ixml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person"))
         set(:superseding_authors, extract_person_names(authors))
       end
 
@@ -283,10 +290,13 @@ module IsoDoc
         title = d.at(ns("./title[@type = 'main']"))&.text
         if title
           set(:superseding_title, d.at(ns("./title[@type = 'main']"))&.text)
-          set(:superseding_subtitle, d.at(ns("./title[@type = 'subtitle']"))&.text)
+          set(:superseding_subtitle,
+              d.at(ns("./title[@type = 'subtitle']"))&.text)
         else
-          set(:superseding_title, ixml.at(ns("//bibdata/title[@type = 'main']"))&.text)
-          set(:superseding_subtitle, ixml.at(ns("//bibdata/title[@type = 'subtitle']"))&.text)
+          set(:superseding_title,
+              ixml.at(ns("//bibdata/title[@type = 'main']"))&.text)
+          set(:superseding_subtitle,
+              ixml.at(ns("//bibdata/title[@type = 'subtitle']"))&.text)
         end
       end
 
@@ -328,7 +338,8 @@ module IsoDoc
           set(:additional_note, note)
         note = xml.at(ns("//bibdata/note[@type = 'withdrawal-note']"))&.text and
           set(:withdrawal_note, note)
-        note = xml.at(ns("//bibdata/note[@type = 'withdrawal-announcement-link']"))&.text and
+        note = xml.at(ns("//bibdata/note[@type = "\
+                         "'withdrawal-announcement-link']"))&.text and
           set(:withdrawal_announcement_link, note)
       end
     end

data/lib/isodoc/nist/pdf_convert.rb

@@ -93,6 +93,7 @@ module IsoDoc
         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"
       end

data/lib/isodoc/nist/word_convert.rb

@@ -16,10 +16,21 @@ module IsoDoc
       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"), "#{@localdir}/logo.png"
+        @series =  docxml&.at(ns("//bibdata/series/abbreviation"))&.text
+        @bibliographycount =
+          docxml.xpath(ns("//bibliography/references | //annex/references | "\
+                          "//bibliography/clause/references")).size
+        FileUtils.cp html_doc_path(@series == "NIST CSWP" ? "logo_cswp.png" :
+                                   "logo.png"), "#{@localdir}/logo.png"
         FileUtils.cp html_doc_path("deptofcommerce.png"),
           "#{@localdir}/deptofcommerce.png"
+        if @series == "NIST CSWP"
+          @wordstylesheet_name = html_doc_path("wordstyle_cswp.scss")
+          @standardstylesheet_name = html_doc_path("nist_cswp.scss")
+          @wordcoverpage = html_doc_path("word_nist_titlepage_cswp.html")
+          @wordintropage = html_doc_path("word_nist_intro_cswp.html")
+          @header = html_doc_path("header_cswp.html")
+        end
         super
       end
 
@@ -27,9 +38,9 @@ module IsoDoc
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
                      '"Times New Roman",serif'),
-                     headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
                                   '"Arial",sans-serif'),
-                                  monospacefont: '"Courier New",monospace'
+          monospacefont: '"Courier New",monospace'
         }
       end
 
@@ -74,11 +85,15 @@ module IsoDoc
 
       def authority_cleanup(docxml)
         insert = docxml.at("//div[@class = 'WordSection2']")
-        auth = docxml&.at("//div[@class = 'authority']")&.remove || return
-        insert.children.first.add_previous_sibling(auth)
+        if @series != "NIST CSWP"
+          auth = docxml&.at("//div[@class = 'authority']")&.remove || return
+          insert.children.first.add_previous_sibling(auth)
+        end
         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"
       end
@@ -89,7 +104,7 @@ module IsoDoc
         requirement_cleanup(docxml)
         h1_cleanup(docxml)
         word_annex_cleanup(docxml) # need it earlier
-        word_preface_cleanup(docxml) # need it earlier, since early ToC insertion
+        word_preface_cleanup(docxml) # ditto, since early ToC insertion
         toc_insert(docxml, @wordToClevels)
       end
 
@@ -267,7 +282,8 @@ module IsoDoc
       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"
+          next unless prev and prev.name == "table" and
+            prev["class"] == "terms_dl"
           d.children.each { |n| prev.add_child(n.remove) }
           d.remove
         end

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -271,15 +271,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".hound.yml"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
 - README.adoc
 - Rakefile
-- appveyor.yml
 - bin/console
 - bin/rspec
 - bin/setup
@@ -294,22 +295,30 @@ files:
 - lib/asciidoctor/nist/isostandard.rng
 - lib/asciidoctor/nist/nist.rng
 - lib/asciidoctor/nist/nist_intro.xml
+- lib/asciidoctor/nist/nist_intro_cswp.xml
 - lib/asciidoctor/nist/reqt.rng
 - lib/asciidoctor/nist/validate.rb
 - lib/isodoc/nist/base_convert.rb
+- lib/isodoc/nist/html/_coverpage.scss
 - lib/isodoc/nist/html/commerce-logo-color.png
 - lib/isodoc/nist/html/deptofcommerce.png
 - lib/isodoc/nist/html/header.html
+- 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.scss
 - lib/isodoc/nist/html/logo.png
+- lib/isodoc/nist/html/logo_cswp.png
 - 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
+- lib/isodoc/nist/html/word_nist_titlepage_cswp.html
 - lib/isodoc/nist/html/wordstyle.scss
+- lib/isodoc/nist/html/wordstyle_cswp.scss
 - lib/isodoc/nist/html_convert.rb
 - lib/isodoc/nist/i18n-en.yaml
 - lib/isodoc/nist/metadata.rb

data/.travis.yml

@@ -1,22 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-language: ruby
-cache: bundler
-os:
-- linux
-- osx
-rvm:
-- 2.6
-- 2.5
-- 2.4
-- ruby-head
-before_install: 
-- nvm install 8
-- npm install -g puppeteer
-- npm install
-- gem install bundler -v "~> 2"
-- bundle update
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-

data/appveyor.yml

@@ -1,37 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-version: '{build}'
-
-cache:
-  - vendor/bundle
-
-environment:
-  matrix:
-    - RUBY_VERSION: 26
-    - RUBY_VERSION: 25
-    - RUBY_VERSION: 24
-    - RUBY_VERSION: _trunk
-
-matrix:
-  allow_failures:
-    - RUBY_VERSION: _trunk
-
-install:
-  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
-  - refreshenv
-
-build_script:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - set GIT_TERMINAL_PROMPT=0
-  - gem install bundler -v "~> 2"
-  - bundle config --local path vendor/bundle
-  - bundle update
-  - bundle install
-
-before_test:
-  - ruby -v
-  - gem -v
-  - bundle -v
-
-test_script:
-  - bundle exec rake