metanorma-nist 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 390fa7e0d2b9f5159246cb5334ac5aa765da260f7e01305806f011e90bb0e357
-  data.tar.gz: 3e571e05d0a8885bf9c857fbd3a9a0f588eb114a47a1f7e2f70e1fa76dd15653
+  metadata.gz: b8e3c01189bd62c59abdcbfe31e635349af13c69dca5220de06ab1a51601150f
+  data.tar.gz: 8acf2313cff799fa0d3330750a81f6a8e35e622ea79a39b5a2083103442350b7
 SHA512:
-  metadata.gz: 929748797649b3913451079a7f6ea48f975eb35aa395cf7ac26077a9a662c8785e2923cf51aa3b17651323235eb14b72331f7b2c3637796b5bf203e46f51079d
-  data.tar.gz: 2e29269159b3938c08f7c3ea1c3db30de91a648afb2e11713ebe171823b25a91c9aeee0469f5c8e8d0eafd9b17fe066f52b2eafcaff89c9033cf682ba20148a3
+  metadata.gz: 9cf4551a8ee0f527594bfd616d36cffb92db834d4944281cf05c28d7a01cb54562e954b737533d5d8345e420a598397595e2fb19ed9976ec6e6fb0ebe12b36e0
+  data.tar.gz: 961b310f562d9aae9069e4220e5d5fce64736b39293aa706dd31bfbd7e99b1200ef95fe66c0de0feb9f860576a67c8d060791432c7e2e76f586c4d5c1bd6cb5b

data/lib/asciidoctor/nist/cleanup.rb

@@ -57,10 +57,10 @@ module Asciidoctor
       end
 
       def move_sections_into_preface(x, preface)
-        abstract = x.at("//abstract") and preface.add_child abstract.remove
         foreword = x.at("//foreword") and preface.add_child foreword.remove
         intro = x.at("//introduction") and preface.add_child intro.remove
         move_clauses_into_preface(x, preface)
+        intro = x.at("//acknowledgements") and preface.add_child intro.remove
         callforpatentclaims(x, preface)
       end
 
@@ -89,11 +89,10 @@ module Asciidoctor
       def make_preface(x, s)
         preface = s.add_previous_sibling("<preface/>").first
         move_sections_into_preface(x, preface)
+        make_abstract(x, s)
         summ = x.at("//executivesummary") and preface.add_child summ.remove
-        #end
       end
 
-
       # handle NIST references separately
       # doc identifier format, NIST: NIST SP 800-87-1 {Vol./Volume 8}|
       # {Rev./Revision 8}|(Month YYYY)
@@ -129,8 +128,7 @@ module Asciidoctor
 
       TERM_CLAUSE = "//sections/terms | "\
         "//sections/clause[descendant::terms] | "\
-        "//annex/terms | "\
-        "//annex[descendant::terms] ".freeze
+        "//annex[descendant::terms]".freeze
 
       def sort_biblio(bib)
         @citation_order = {}

data/lib/asciidoctor/nist/converter.rb

@@ -115,7 +115,6 @@ module Asciidoctor
 
       def clause_parse(attrs, xml, node)
         role = node.role || node.attr("style")
-        attrs[:preface] = true if role == "preface"
         attrs[:executivesummary] = true if role == "executive-summary"
         super
       end
@@ -164,6 +163,8 @@ module Asciidoctor
             else
               clause_parse(a, xml, node)
             end
+            when "acknowledgements"
+            acknowledgements_parse(a, xml, node)
           else
             if @term_def 
               term_def_subclause_parse(a, xml, node)

data/lib/isodoc/nist/base_convert.rb

@@ -37,7 +37,7 @@ module IsoDoc
           patent = ["Call for Patent Claims", "Patent Disclosure Notice"].include? title&.text
           out.div **attr_code(id: c["id"]) do |s|
             page_break(s) if patent
-            clause_name(anchor(c['id'], :label), title&.content, s,
+            clause_name(anchor(c['id'], :label), title, s,
                         class: (c.name == "executivesummary") ? "NormalTitle" :
                         "IntroTitle")
             c.elements.reject { |c1| c1.name == "title" }.each do |c1|

data/lib/isodoc/nist/xrefs.rb

@@ -7,8 +7,8 @@ module IsoDoc
     module BaseConvert
       SECTIONS_XPATH =
         "//foreword | //introduction | //reviewnote | //executivesummary | //annex | "\
-        "//sections/clause | //bibliography/references | "\
-        "//bibliography/clause".freeze
+        "//sections/clause | //bibliography/references | //acknowledgements | "\
+        "//bibliography/clause | //preface/clause".freeze
 
       def initial_anchor_names(d)
         d.xpath("//xmlns:boilerplate/child::* | //xmlns:preface/child::*").each do |c|

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities