metanorma-nist 1.2.10 → 1.2.15

data/lib/isodoc/nist/pdf_convert.rb

@@ -14,7 +14,11 @@ module IsoDoc
 
       def pdf_stylesheet(docxml)
         series =  docxml&.at(ns("//bibdata/series/abbreviation"))&.text
-        series == "NIST CSWP" ?  "nist.cswp.xsl" : "nist.sp.xsl"
+        case series
+        when "NIST CSWP" then "nist.cswp.xsl" 
+        when "NIST CSTS" then "nist.csts.xsl" 
+        else "nist.sp.xsl"
+        end
       end
     end
   end

data/lib/isodoc/nist/word_convert.rb

@@ -37,10 +37,8 @@ module IsoDoc
       end
 
       def default_fonts(options)
-        { bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
-                     '"Times New Roman",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-                                  '"Arial",sans-serif'),
+        { bodyfont: '"Times New Roman",serif',
+          headerfont: '"Arial",sans-serif',
           monospacefont: '"Courier New",monospace',
           normalfontsize: "12.0pt",
           footnotefontsize: "10.0pt",

data/lib/isodoc/nist/xref.rb

@@ -4,6 +4,9 @@ require "fileutils"
 
 module IsoDoc
   module NIST
+    class Counter < IsoDoc::XrefGen::Counter
+    end
+
     class Xref < IsoDoc::Xref
       SECTIONS_XPATH =
         "//foreword | //introduction | //reviewnote | //executivesummary | //annex | "\
@@ -17,15 +20,18 @@ module IsoDoc
         @in_execsummary = true
         hierarchical_asset_names(d.xpath("//xmlns:executivesummary"), "ES")
         @in_execsummary = false
-        clause_names(d, 0)
+        c = Counter.new
+        clause_names(d, c)
         middle_section_asset_names(d)
         termnote_anchor_names(d)
         termexample_anchor_names(d)
       end
 
       def back_anchor_names(docxml)
-        docxml.xpath(ns("//annex")).each_with_index do |c, i|
-          annex_names(c, (65 + i).chr.to_s)
+        i = Counter.new("@")
+        docxml.xpath(ns("//annex")).each do |c|
+          i.increment(c)
+          annex_names(c, i.print)
         end
         docxml.xpath(ns("//bibliography/clause | "\
                         "//bibliography/references")).each do |b|
@@ -44,8 +50,8 @@ module IsoDoc
 
       def clause_names(docxml, sect_num)
         q = "//xmlns:sections/child::*"
-        docxml.xpath(q).each_with_index do |c, i|
-          section_names(c, (i + sect_num), 1)
+        docxml.xpath(q).each do |c|
+          section_names(c, sect_num, 1)
         end
       end
 

data/lib/metanorma/nist/processor.rb

@@ -24,8 +24,6 @@ module Metanorma
           "Cambria" => nil,
           "Courier" => nil,
           "Courier New" => nil,
-          "SimSun" => nil,
-          "SimHei" => nil,
           "STIX Two Math" => nil,
           "Times New Roman" => nil,
         }

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.2.10"
+    VERSION = "1.2.15"
   end
 end

data/metanorma-nist.gemspec

@@ -30,8 +30,8 @@ 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.7.0"
-  spec.add_dependency "isodoc", "~> 1.4.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.8.2"
+  spec.add_dependency "isodoc", "~> 1.5.0"
   #spec.add_dependency "relaton-nist", "~> 0.3.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
@@ -39,9 +39,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "= 0.54.0"
+  spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.15
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     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: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -210,16 +210,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -259,6 +259,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
+- ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
@@ -317,6 +318,7 @@ files:
 - lib/isodoc/nist/init.rb
 - lib/isodoc/nist/metadata.rb
 - lib/isodoc/nist/metadata_id.rb
+- lib/isodoc/nist/nist.csts.xsl
 - lib/isodoc/nist/nist.cswp.xsl
 - lib/isodoc/nist/nist.sp.xsl
 - lib/isodoc/nist/pdf_convert.rb
@@ -353,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Metanorma NIST gem.