metanorma-nist 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75fb9c059ae72c09ccc3d401bb440d5763ec93d1dcb4cba42e93e7f981fd79a4
-  data.tar.gz: 067a9a1a8ea310fc7948c3423bbd693fd5a5e63ff03b7dab5fe50dcd605f2150
+  metadata.gz: 06e9acdd4c6462c4631f0a098a7751a03d1bb9ba277966b09c83210b1575ff01
+  data.tar.gz: 8f0b1995cc43710b39feda4d04ebf5f4a2f5e53309095bb6705df1a40de56d09
 SHA512:
-  metadata.gz: 678c8b927d107d784d1fddaabeb650f0e03b74b558e1ef4c75f8f959a94d96f00414ea76d4db8666f3ff502ffdfa349db9ca728fffa01a01d78a5a21ea86a8c2
-  data.tar.gz: 26f7b3f77ea5226a601b4dee47d4c7c6b62d3967e0840c713b0e2521d6cfc5da37b30b3398bf51001b403302cdb94acb5381c6f7140f9b57f5dda53ff7e6cc2e
+  metadata.gz: bd0d74a632520a62213e4ab8137baeb8c19237563d198b7313f891519bfb3eee0cd5dd2f122f1cfbb6f2918c0ec20bbbe623b99e11f2070332084f65d3d73e1e
+  data.tar.gz: 6f0705059fe77b479e54f180c63d576db9c229f6ab6a466a36ee6b42431a5b8e2edd56bc8395d00532afc02b8ed631cc8c9ee49a21239f9ad1215408e3f79ed2

data/lib/asciidoctor/nist/converter.rb

@@ -146,7 +146,8 @@ module Asciidoctor
 
       def clause_parse(attrs, xml, node)
         attrs[:preface] = true if node.attr("style") == "preface"
-        attrs[:executivesummary] = true if node.attr("style") == "executive-summary"
+        attrs[:executivesummary] = true if node.attr("style") ==
+          "executive-summary"
         super
       end
 
@@ -233,6 +234,19 @@ module Asciidoctor
         end
       end
 
+      NIST_PREFIX_REFS = "SP|FIPS"
+
+      def refitem(xml, item, node)
+        item.sub!(Regexp.new("^(<ref[^>]+>)\\[(#{NIST_PREFIX_REFS}) "),
+                  "\\1[NIST \\2 ")
+        super
+      end
+      
+      def fetch_ref(xml, code, year, **opts)
+        code.sub!(Regexp.new("^(#{NIST_PREFIX_REFS}) "), "NIST \\1 ")
+        super
+      end
+
       def html_converter(node)
         IsoDoc::NIST::HtmlConvert.new(html_extract_attributes(node))
       end

data/lib/isodoc/nist/base_convert.rb

@@ -345,7 +345,17 @@ module IsoDoc
       end
 
       def reference_format(b, r)
-        if ftitle = b.at(ns("./formattedref"))
+        code = iso_bibitem_ref_code(b)
+        if /^\[\d+\]$/.match(code)
+          r << "#{code} "
+          insert_tab(r, 1)
+        end
+        reference_format1(b, r)
+        r << " [#{code}] " unless /^\[\d+\]$/.match(code)
+      end
+
+      def reference_format1(b, r)
+                if ftitle = b.at(ns("./formattedref"))
           ftitle&.children&.each { |n| parse(n, r) }
         else
           title = b.at(ns("./title[@language = '#{@language}']")) || b.at(ns("./title"))
@@ -353,7 +363,6 @@ module IsoDoc
             title&.children&.each { |n| parse(n, i) }
           end
         end
-        r << "[#{iso_bibitem_ref_code(b)}] "
       end
 
       def omit_docid_prefix(prefix)

data/lib/isodoc/nist/html/htmlstyle.scss

@@ -234,7 +234,7 @@ table {
     list-style: none;
 }
 
-#toc li {
+#toc li a {
     padding: 5px 10px;
     font-size: 14px;
 }
@@ -246,6 +246,7 @@ table {
 }
 
 #toc a:hover {
+    box-shadow: none;
     color: white;
 }
 
@@ -1012,9 +1013,11 @@ h2 p {
     margin-bottom: 150px;
   }
 
+  /*
   .coverpage-title .title-second {
     display: none;
   }
+  */
 
   .coverpage-stage-block {
     font-family: 'Source Sans Pro', sans-serif;

data/lib/isodoc/nist/html/scripts.html

@@ -66,6 +66,7 @@ $('#toggle').on('click', function(){
 !function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function e(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64}function t(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}function i(){if(null===document.head.querySelector("style.anchorjs")){var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createTextNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"], style'))?document.head.appendChild(e):document.head.insertBefore(e,A),e.sheet.insertRule(" .anchorjs-link {   opacity: 0;   text-decoration: none;   -webkit-font-smoothing: antialiased;   -moz-osx-font-smoothing: grayscale; }",e.sheet.cssRules.length),e.sheet.insertRule(" *:hover > .anchorjs-link, .anchorjs-link:focus  {   opacity: 1; }",e.sheet.cssRules.length),e.sheet.insertRule(" [data-anchorjs-icon]::after {   content: attr(data-anchorjs-icon); }",e.sheet.cssRules.length),e.sheet.insertRule(' @font-face {   font-family: "anchorjs-icons";   src: url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype"); }',e.sheet.cssRules.length)}}this.options=A||{},this.elements=[],e(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var n,o,s,a,r,c,h,l,u,d,f,p=[];if(e(this.options),"touch"===(f=this.options.visible)&&(f=this.isTouchDevice()?"always":"hover"),A||(A="h2, h3, h4, h5, h6"),0===(n=t(A)).length)return this;for(i(),o=document.querySelectorAll("[id]"),s=[].map.call(o,function(A){return A.id}),r=0;r<n.length;r++)if(this.hasAnchorJSLink(n[r]))p.push(r);else{if(n[r].hasAttribute("id"))a=n[r].getAttribute("id");else if(n[r].hasAttribute("data-anchor-id"))a=n[r].getAttribute("data-anchor-id");else{u=l=this.urlify(n[r].textContent),h=0;do{void 0!==c&&(u=l+"-"+h),c=s.indexOf(u),h+=1}while(-1!==c);c=void 0,s.push(u),n[r].setAttribute("id",u),a=u}a.replace(/-/g," "),(d=document.createElement("a")).className="anchorjs-link "+this.options.class,d.href="#"+a,d.setAttribute("aria-label",this.options.ariaLabel),d.setAttribute("data-anchorjs-icon",this.options.icon),"always"===f&&(d.style.opacity="1"),""===this.options.icon&&(d.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(d.style.lineHeight="inherit")),"left"===this.options.placement?(d.style.position="absolute",d.style.marginLeft="-1em",d.style.paddingRight="0.5em",n[r].insertBefore(d,n[r].firstChild)):(d.style.paddingLeft="0.375em",n[r].appendChild(d))}for(r=0;r<p.length;r++)n.splice(p[r]-r,1);return this.elements=this.elements.concat(n),this},this.remove=function(A){for(var e,i,n=t(A),o=0;o<n.length;o++)(i=n[o].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(n[o]))&&this.elements.splice(e,1),n[o].removeChild(i));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){var t=/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\]/g;return this.options.truncate||e(this.options),A.trim().replace(/\'/gi,"").replace(t,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&(" "+A.firstChild.className+" ").indexOf(" anchorjs-link ")>-1,t=A.lastChild&&(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ")>-1;return e||t||!1}}});  </script>
 
   <script>
+/*
   $(document).ready(function() {
           $('[id^=toc]').each(function ()
           {
@@ -74,6 +75,7 @@ $('#toggle').on('click', function(){
              currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
           });
 });
+*/
   anchors.options = {
   placement: 'left'
 };

data/lib/isodoc/nist/html/scripts.pdf.html

@@ -58,6 +58,7 @@ $('#toggle').on('click', function(){
     </script>
 
   <script>
+/*
   $(document).ready(function() {
           $('[id^=toc]').each(function ()
           {
@@ -66,5 +67,6 @@ $('#toggle').on('click', function(){
              currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
           });
 });
+*/
 </script>
 

data/lib/isodoc/nist/render.rb

@@ -12,12 +12,14 @@ module Iso690Render
     parse(docxml.root, embedded)
   end
 
+=begin
   def self.multiplenames_and(names)
     return "" if names.length == 0
     return names[0] if names.length == 1
     return "#{names[0]} and #{names[1]}" if names.length == 2
     names[0..-2].join(", ") + " and #{names[-1]}"
   end
+=end
 
   def self.multiplenames(names)
     names.join(", ")
@@ -33,7 +35,7 @@ module Iso690Render
     elsif initials.empty?
       given.map{ |m| m.text[0] }.join("")
     else
-      initials.map{ |m| m.text }.join("")
+      initials.map{ |m| m.text[0] }.join("")
     end
   end
 
@@ -66,7 +68,7 @@ module Iso690Render
 
   def self.contributorRole(contributors)
     return "" unless contributors.length > 0
-    if contributors[0]["role"] == "editor"
+    if contributors[0]&.at("role/@type")&.text == "editor"
       return contributors.length > 1 ? " (Eds.)" : "(Ed.)"
     end
     ""
@@ -97,17 +99,20 @@ module Iso690Render
     doc&.at("./medium")&.text
   end
 
+=begin
   def self.edition(doc)
     x = doc.at("./edition")
     return "" unless x
     return x.text unless /^\d+$/.match x.text
     x.text.to_i.localize.to_rbnf_s("SpelloutRules", "spellout-ordinal")
   end
+=end
 
   def self.is_nist(doc)
     publisher = doc&.at("./contributor[role/@type = 'publisher']/organization/name")&.text
     abbr = doc&.at("./contributor[role/@type = 'publisher']/organization/abbreviation")&.text
-    publisher == "NIST" || abbr == "NIST"
+    publisher == "NIST" || abbr == "NIST" ||
+      publisher == "National Institute of Standards and Technology"
   end
 
   def self.placepub(doc)
@@ -132,7 +137,7 @@ module Iso690Render
     from = date&.at("./from")&.text
     to = date&.at("./to")&.text
     return MMMddyyyy(on) if on
-    return "#{MMMddyyyy(from)}–#{MMMMddyyyy(to)}" if from
+    return "#{MMMddyyyy(from)}–#{MMMddyyyy(to)}" if from
     nil
   end
 
@@ -142,7 +147,7 @@ module Iso690Render
     if pub
       ret = pub
       ret += " (updated #{updated})" if updated
-      return pub
+      return ret
     end
     pub = date1(doc&.at("./date[@type = 'circulated']")) and
       return pub
@@ -254,6 +259,7 @@ module Iso690Render
     ret.join(", ")
   end
 
+=begin
   def self.monthyr(isodate)
     return nil if isodate.nil?
     arr = isodate.split("-")
@@ -268,21 +274,26 @@ module Iso690Render
   def self.mmddyyyy(isodate)
     return nil if isodate.nil?
     arr = isodate.split("-")
-    date = if arr.size == 2
+    date = if arr.size == 1 and (/^\d+$/.match isodate)
+             Date.new(*arr.map(&:to_i)).strftime("%Y")
+      elsif arr.size == 2
       Date.new(*arr.map(&:to_i)).strftime("%m-%Y")
     else
       Date.parse(isodate).strftime("%m-%d-%Y")
     end
   end
+=end
 
   def self.MMMddyyyy(isodate)
     return nil if isodate.nil?
     arr = isodate.split("-")
-    date = if arr.size == 2
-      Date.new(*arr.map(&:to_i)).strftime("%B, %Y")
-    else
-      Date.parse(isodate).strftime("%B %d, %Y")
-    end
+    date = if arr.size == 1 and (/^\d+$/.match isodate)
+             Date.new(*arr.map(&:to_i)).strftime("%Y")
+           elsif arr.size == 2
+             Date.new(*arr.map(&:to_i)).strftime("%B %Y")
+           else
+             Date.parse(isodate).strftime("%B %d, %Y")
+           end
   end
 
   def self.draft(doc)
@@ -319,11 +330,14 @@ module Iso690Render
 
   def self.parse(doc, embedded = false)
     ret = ""
+    f = doc.at("./formattedref") and 
+      return embedded ? f.children.to_xml : "<p>#{f.children.to_xml}</p>"
+
     type = type(doc)
     container = doc.at("./relation[@type='includedIn']")
-    if container && date(doc) && !date(container)
-      container("./bibitem") << 
-      ( doc.at("./date[@type = 'issued']").remove || doc.at("./date[@type = 'circulated']").remove )
+    if container && !date(doc) && date(container&.at("./bibitem"))
+      doc << 
+      ( container&.at("./bibitem/date[@type = 'issued' or @type = 'published' or @type = 'circulated']")&.remove )
     end
     ser = series_title(doc)
     dr = draft(doc)
@@ -338,7 +352,7 @@ module Iso690Render
     if dr
       mdy = MMMddyyyy(date(doc)) and ret += wrap(mdy, " (", ")")
     else
-    yr = year(date(doc)) and ret += wrap(yr, " (", ")")
+      yr = year(date(doc)) and ret += wrap(yr, " (", ")")
     end
     ret += included(type) ? wrap(title(doc)) : wrap(title(doc), " <I>", "</I>.")
     ret += wrap(medium(doc), " [", "].")
@@ -349,13 +363,13 @@ module Iso690Render
       ret += " Draft (#{dr})"
     end
     ret += wrap(series(doc, type), " ", "")
-    ret += "," if series(doc, type) && date(doc)
+    ret += "," if !series(doc, type).empty? && date(doc)
     ret += wrap(date(doc))
     ret += wrap(standardidentifier(doc)) unless is_nist(doc)
     ret += wrap(uri(doc))
-    ret += wrap(accessLocation(doc), "At: ", ".")
+    ret += wrap(accessLocation(doc), " At: ", ".")
     if container 
-      ret += wrap(parse(container.at("./bibitem").to_xml, true), " In:", "")
+      ret += wrap(parse(container.at("./bibitem"), true), " In: ", "")
       locality = container.xpath("./locality")
       locality.empty? and locality = doc.xpath("./extent")
       ret += wrap(extent(locality))

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -354,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Metanorma NIST gem.