metanorma-nist 1.2.1 → 1.2.6

data/lib/isodoc/nist/render.rb

@@ -4,10 +4,6 @@ require_relative "render_contributors"
 require_relative "render_dates"
 
 module Iso690Render
-=begin
-  Out of scope: Provenance (differentiating elements by @source in rendering)
-=end
-
   def self.render(bib, embedded = false)
     docxml = Nokogiri::XML(bib)
     docxml.remove_namespaces!

data/lib/isodoc/nist/render_contributors.rb

@@ -37,7 +37,7 @@ module Iso690Render
     completename = person.at("./name/completename")
     return completename.text if completename
     surname = person.at("./name/surname")
-    initials = person.xpath("./name/initials")
+    initials = person.xpath("./name/initial")
     forenames = person.xpath("./name/forename")
     #given = []
     #forenames.each { |x| given << x.text }

data/lib/isodoc/nist/section.rb

@@ -1,6 +1,18 @@
 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
         out.div **attr_code(id: f["id"]) do |s|
@@ -11,13 +23,13 @@ module IsoDoc
       end
 
       FRONT_CLAUSE = "//*[parent::preface][not(local-name() = 'abstract' or "\
-        "local-name() = 'foreword') or @type = 'keyword']".freeze
+        "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
@@ -37,12 +49,6 @@ module IsoDoc
         end
       end
 
-      def middle(isoxml, out)
-        clause isoxml, out
-        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|
@@ -53,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

@@ -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,8 +66,10 @@ 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
           boilerplate docxml, div2
           preface docxml, div2
           div2.p { |p| p << "&nbsp;" } # placeholder
@@ -71,6 +77,24 @@ 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|
@@ -125,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)
@@ -165,6 +190,22 @@ 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

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.2.1"
+    VERSION = "1.2.6"
   end
 end

data/metanorma-nist.gemspec

@@ -30,7 +30,7 @@ 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.5.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
   spec.add_dependency "isodoc", "~> 1.2.0"
   #spec.add_dependency "relaton-nist", "~> 0.3.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -257,9 +257,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".hound.yml"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md

data/.github/workflows/macos.yml

@@ -1,38 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,56 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-    tags:
-      - '*'
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake
-      - name: Trigger repositories
-        if: matrix.ruby == '2.6'
-        env:
-          GH_USERNAME: metanorma-ci
-          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-        run: |
-          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
-          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          CLIENT_PAYLOAD=$(cat <<EOF
-          "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
-          EOF
-          )
-          for repo in $REPOS
-          do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
-          done

data/.github/workflows/windows.yml

@@ -1,40 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/ubuntu.yml
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake