metanorma-nist 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '058ea96daf6a2940d6a1b2b2ddb8464f13a62389c006cfcf423dfa57d5d33c11'
-  data.tar.gz: 47dd1e6208cdf299e9b2146dfe92f0003a66e7b0ca6f169c50dd9a1792627c48
+  metadata.gz: d9b324dd09a8d49e7d0f962d8f526c39770127b56a4dc9b2eedd3e34f5003eec
+  data.tar.gz: c41f9cf011e6042a7658a173340d0ec8b83375c3d924a6485c2e382f57e49efb
 SHA512:
-  metadata.gz: 423c8ba7e534b31b3176e22234937d58a3ae2599e45f0bb476822c05752d4fd9b407df989bba48c19be262c28fcb80fe67df4e107b8632f50fb80ffc9803b8b8
-  data.tar.gz: 9ed5d3661a6804ac4c75a58a2b17effe96115e066d7179bc376a539f097e6249383c1baeed5c26ad4bfddac500142e78741abf8c8030de1ecb69f11c339301a0
+  metadata.gz: 8f87e8f12899a69732ed0830a76166ad2d1147717d5430949631f5c246cd14557ab5add686da89cea525abd7370b7ad0b32b3b955cc834f118c6b44c90dfe5ad
+  data.tar.gz: 750b3102e74993362d5225d23bbf874c30ddf4941810ca4e0faf4dc67577975e721195c1a889b83ab849bc25e32fd4a5a75e7ba634f61e34115cab51ac6b3a49

data/lib/asciidoctor/nist/basicdoc.rng

@@ -194,6 +194,14 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
+      <optional>
+        <attribute name="inequality">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <ref name="stem"/>
       <optional>
         <ref name="dl"/>
@@ -247,6 +255,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <attribute name="lang"/>
       </optional>
@@ -291,9 +302,15 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="summary"/>
+      </optional>
       <optional>
         <attribute name="uri">
           <data type="anyURI"/>
@@ -423,6 +440,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <oneOrMore>
         <choice>
           <ref name="formula"/>
@@ -486,6 +506,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <ref name="source"/>
       </optional>
@@ -497,6 +520,8 @@
       </optional>
       <choice>
         <ref name="image"/>
+        <ref name="video"/>
+        <ref name="audio"/>
         <ref name="pre"/>
         <zeroOrMore>
           <ref name="figure"/>
@@ -792,7 +817,7 @@
     </element>
   </define>
   <define name="video">
-    <element name="image">
+    <element name="video">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -833,7 +858,7 @@
     </element>
   </define>
   <define name="audio">
-    <element name="image">
+    <element name="audio">
       <attribute name="id">
         <data type="ID"/>
       </attribute>

data/lib/asciidoctor/nist/cleanup.rb

@@ -165,9 +165,16 @@ module Asciidoctor
       end
 
       # if numeric citation, order by appearance. if alphanumeric, sort alphabetically
+      # if identifier, zero-pad numeric component for NIST ids
       def sort_biblio_key(bib)
         if metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text&.gsub(%r{[\[\]]}, "")
           key = /^\[\d+\]$/.match(metaid) ? ( @citation_order[metaid] % "09%d" ) : metaid
+        elsif metaid = bib&.at("./docidentifier[@type = 'NIST']")&.text
+          key = metaid.sub(/-(\d+)/) {|m| sprintf "-%09d", ($1.to_i) }
+        else
+          metaid = bib&.at("./docidentifier[not(@type = 'DOI' or "\
+                           "@type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN')]")&.text
+          key = metaid.sub(/-(\d+)/) {|m| sprintf "-%09d", ($1.to_i) }
         end
         title = bib&.at("./title[@type = 'main']")&.text ||
           bib&.at("./title")&.text || bib&.at("./formattedref")&.text

data/lib/asciidoctor/nist/converter.rb

@@ -138,7 +138,7 @@ module Asciidoctor
         unless node.attr("nodoc") || !node.attr("docfile")
           filename = node.attr("docfile").gsub(/\.adoc/, ".xml").
             gsub(%r{^.*/}, "")
-          File.open(filename, "w") { |f| f.write(ret) }
+          File.open(filename, "w:UTF-8") { |f| f.write(ret) }
           html_converter(node).convert filename unless node.attr("nodoc")
           word_converter(node).convert filename unless node.attr("nodoc")
           pdf_converter(node).convert filename unless node.attr("nodoc")

data/lib/asciidoctor/nist/nist_intro.xml

@@ -24,7 +24,7 @@ CODEN: NSPUE2</p>
 
 <p>There may be references in this publication to other publications currently under development by NIST in accordance with its assigned statutory responsibilities. The information in this publication, including concepts and methodologies, may be used by Federal agencies even before the completion of such companion publications. Thus, until each publication is completed, current requirements, guidelines, and procedures, where they exist, remain operative. For planning and transition purposes, Federal agencies may wish to closely follow the development of these new publications by NIST.</p>
 
-<p>Organizations are encouraged to review all draft publications during public comment periods and provide feedback to NIST. Many NIST cybersecurity publications, other than the ones noted above, are available at <link target="https://csrc.nist.gov/publications"/>
+<p>Organizations are encouraged to review all draft publications during public comment periods and provide feedback to NIST. Many NIST cybersecurity publications, other than the ones noted above, are available at <link target="https://csrc.nist.gov/publications" alt="NIST Computer Security Division publications"/>
 </clause>
 </legal-statement>
 

data/lib/asciidoctor/nist/reqt.rng

@@ -30,6 +30,9 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="subsequence"/>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>

data/lib/isodoc/nist/html_convert.rb

@@ -169,7 +169,7 @@ module IsoDoc
       def term_cleanup(docxml)
         docxml.xpath("//table[@class = 'terms_dl']").each do |d|
           prev = d.previous_element
-          next unless 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/isodoc/nist/render.rb

@@ -241,8 +241,9 @@ module Iso690Render
 
   def self.extent1(type, from, to)
     ret = ""
-    if type == "page"
-      type = to ? "pp." : "p"
+    case type 
+    when "page" then type = to ? "pp." : "p."
+    when "volume" then type = to ? "Vols." : "Vol."
     end
     ret += "#{type} "
     ret += from.text if from

data/lib/isodoc/nist/word_convert.rb

@@ -267,7 +267,7 @@ module IsoDoc
       def term_cleanup(docxml)
         docxml.xpath("//table[@class = 'terms_dl']").each do |d|
           prev = d.previous_element
-          next unless 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.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor