metanorma-nist 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9be11fbdb11ce260e1671031d3c1d3f463d0cfbc049b32dd36d362eeae5163bd
-  data.tar.gz: 346ed9adb971cb651e22b84f335ed6c1a75ec9f3ac4793300972375afe86d634
+  metadata.gz: f758b64420197c62c491fb933d62fe0dde91fec5d9955d83e830a474160bfed0
+  data.tar.gz: 5b37fe1074ed0d62720af6e88dd08ffca4cb0c1f6eb1aeb256653e53c56c632e
 SHA512:
-  metadata.gz: 5a4b107d57c4a7ba95ad1f57c7fa25626819836cd312ed2693fc1da97b67e636613549ff4631ffc76ae7e5f8c51b8578eaa764f7ba38fba496261606d397c6fa
-  data.tar.gz: 3a022940e4cbad44ac9f1f400697f03815a87c131a1c7d9d651c2ef6ece75ba768dc9dc8e2fc2c1ea008918c99904a2972678bcab4f799b5c108aebeab0f2aa2
+  metadata.gz: 3e4d2b04a0ded879553796a90c5a88ca0b7537020b5b59c0b94823c504e0c8594ac35d5fa299efd454014b8a25c1a891b10c5e0a11847224e83e7f693780b264
+  data.tar.gz: 62c4a654c0d35e6e39104be8627d260650e2392e1ce3b61871747ccced61c38cd38a83d05e37073d82c7de320eeeb9b52096fa4ec7bcfaa00f38bf1c57d77af1

data/README.adoc

@@ -341,6 +341,12 @@ One or more NIST document that this NIST document standard supersedes; the super
 document may still remain in effect. Comma delimited.
 Format is document identifier, e.g. _SP 800-53A Rev. 1_
 
+NOTE: The distinction between `obsoletes` and `supersedes` is the withdrawal date of the
+original document (`obsoleted-date`); that means that the distinction is predictable given that external information.
+The distinction between `obsoleted-by` and `superseded-by`, in the same way, is made by
+the withdrawal date of the current document. Relaton does not differentiate between the two relations
+for that reason.
+
 `:superseded-by`::
 One or more corresponding NIST document that this NIST document standard is superseded by;
 this document may still remain in effect. Comma delimited.

data/lib/asciidoctor/nist/biblio.rng

@@ -49,11 +49,17 @@
   </define>
   <define name="stage">
     <element name="stage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
   <define name="substage">
     <element name="substage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -452,9 +458,14 @@
     <attribute name="bibitemid">
       <data type="IDREF"/>
     </attribute>
-    <zeroOrMore>
-      <ref name="locality"/>
-    </zeroOrMore>
+    <choice>
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="localityStack"/>
+      </zeroOrMore>
+    </choice>
     <optional>
       <ref name="date"/>
     </optional>
@@ -469,6 +480,25 @@
       <ref name="BibItemLocality"/>
     </element>
   </define>
+  <define name="localityStack">
+    <element name="localityStack">
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="sourceLocality">
+    <element name="sourceLocality">
+      <ref name="BibItemLocality"/>
+    </element>
+  </define>
+  <define name="sourceLocalityStack">
+    <element name="sourceLocalityStack">
+      <zeroOrMore>
+        <ref name="sourceLocality"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemLocality">
     <attribute name="type">
       <ref name="LocalityType"/>
@@ -1028,12 +1058,30 @@
       <attribute name="type">
         <ref name="DocRelationType"/>
       </attribute>
+      <optional>
+        <element name="description">
+          <ref name="FormattedString"/>
+        </element>
+      </optional>
       <element name="bibitem">
         <ref name="BibliographicItem"/>
       </element>
-      <zeroOrMore>
-        <ref name="locality"/>
-      </zeroOrMore>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
+      <choice>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="sourceLocalityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="version">

data/lib/asciidoctor/nist/front.rb

@@ -144,15 +144,21 @@ module Asciidoctor
       end
 
       def relaton_relations
-        super + %w(obsoletes obsoleted-by supersedes superseded-by)
+        super + %w(obsoletes obsoleted-by)
       end
 
-      def metadata_getrelation(node, xml, type)
-        if type == "obsoleted-by" and node.attr("superseding-status")
+      def relaton_relation_descriptions
+        super.merge({
+          "supersedes" => "obsoletes",
+          "superseded-by" => "obsoleted-by",
+        })
+      end
+
+      def metadata_getrelation(node, xml, type, desc = nil)
+        if type == "obsoleted-by" and desc.nil? and node.attr("superseding-status")
           metadata_superseding_doc(node, xml)
-        else
-          super
         end
+        super
       end
 
       def metadata_superseding_doc(node, xml)

data/lib/isodoc/nist/base_convert.rb

@@ -177,8 +177,8 @@ module IsoDoc
 
       def get_linkend(node)
         link = anchor_linkend(node, docid_l10n(node["target"] || wrap_brackets(node['citeas'])))
-        link += eref_localities(node.xpath(ns("./locality")), link)
-        contents = node.children.select { |c| c.name != "locality" }
+        link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link)
+        contents = node.children.select { |c| %w{locality localityStack}.include? c.name }
         return link if contents.nil? || contents.empty?
         Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
         # so not <origin bibitemid="ISO7301" citeas="ISO 7301">

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

@@ -105,9 +105,12 @@ span.nistvariable {
 }
 
 .document-type-band {
-  @include docBand(
-    $fontFamily: "'Source Sans Pro', sans-serif",
-    $order: 2, $textLength: 150, $offset: 180px, $color: #7ba812);
+  @include docBand($fontFamily: "'Source Sans Pro', sans-serif",
+    $order: 2, $offset: 180px, $color: #7ba812);
+
+  .document-type {
+    top: 20px;
+  }
 }
 
 #governance-band p.document-type {

data/lib/isodoc/nist/html/word_nist_titlepage.html

@@ -845,7 +845,7 @@ style='width:477.0pt;margin-left:-5.25pt;border-collapse:collapse;border:none;ms
   padding:0cm 5.4pt 0cm 5.4pt'>
   <p class="Default"><span lang="EN-US" style='font-size:11.0pt;font-family:"Calibri",sans-serif;
   mso-ascii-theme-font:major-latin;mso-hansi-theme-font:major-latin;mso-bidi-font-family:
-  "Times New Roman";color:black;mso-themecolor:text1'>{{ superseding_published_date }}<o:p></o:p></span></p>
+  "Times New Roman";color:black;mso-themecolor:text1'>{{ superseding_issued_date }}<o:p></o:p></span></p>
   </td>
  </tr>
  <tr style='mso-yfti-irow:13'>

data/lib/isodoc/nist/metadata.rb

@@ -147,7 +147,8 @@ module IsoDoc
 
       def relations1(ixml, type)
         ret = []
-        ixml.xpath(ns("//bibdata/relation[@type = '#{type}']")).each do |x|
+        ixml.xpath(ns("//bibdata/relation[@type = '#{type}'][not(xmlns:description)] | "\
+                      "//bibdata/relation[description = '#{type}']")).each do |x|
           id = x&.at(ns(".//docidentifier"))&.text and ret << id
         end
         ret

data/lib/isodoc/nist/render.rb

@@ -134,7 +134,7 @@ module Iso690Render
     "book"
   end
 
-  def self.extent1(type, from, to)
+  def self.extent2(type, from, to)
     ret = ""
     case type 
     when "page" then type = to ? "pp." : "p."
@@ -146,15 +146,31 @@ module Iso690Render
     ret
   end
 
-  def self.extent(localities)
+  def self.extent1(localities)
     ret = []
     localities.each do |l|
-      ret << extent1(l["type"] || "page", 
+      ret << extent2(l["type"] || "page", 
                      l.at("./referenceFrom"), l.at("./referenceTo"))
     end
     ret.join(", ")
   end
 
+  def self.extent(localities)
+    ret = []
+    ret1 = ""
+    localities.each do |l|
+      if %w(localityStack).include? l.name
+        ret << ret1
+        ret1 = ""
+        ret << extent1(l.children)
+      else
+        ret1 += extent1([l])
+      end
+    end
+    ret << ret1
+    ret.reject { |c| c.empty? }.join("; ")
+  end
+
   def self.draft(doc)
     return nil unless is_nist(doc)
     dr = doc&.at("./status/stage")&.text
@@ -228,8 +244,7 @@ module Iso690Render
     ret += wrap(accessLocation(doc), " At: ", ".")
     if container 
       ret += wrap(parse(container.at("./bibitem"), true), " In: ", "")
-      locality = container.xpath("./locality")
-      locality.empty? and locality = doc.xpath("./extent")
+      locality = doc.xpath("./extent")
       ret += wrap(extent(locality))
     else
       ret += wrap(extent(doc.xpath("./extent")))

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

metadata

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