metanorma-nist 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 479ffc86d11ce177921f465e151fb8fa57f20e946234b079879523f2de275e68
-  data.tar.gz: 681de2826b7931bab707e701dc85fc6ed090c860c3c20e5105c86fbe57c837f0
+  metadata.gz: 30193344892f68ba4a979316250fe4e6268cdbbe1ae476b48169f34d5ebcfcf6
+  data.tar.gz: 5a2165e97b94d197e9e5247b7fdb21bdc33c38041da812824f5298452f6a0512
 SHA512:
-  metadata.gz: 9cd443581973f965269c74a3b4b185014513cda9733135a117db5e3775b201d5ccaa146c587ff7694166f9bc09f2af59b833f650bb0d8019e9950eff84384d72
-  data.tar.gz: 73566c4935a4778599499eec7f88bf2d82ca4317420f6e8dc5a6b8594cd9b9103ed52bf8f1f9f75f2c25cba9438cf4d55384fe151b4bbad2b3a5330801e4d8b7
+  metadata.gz: 1fb5c7754d436c24af54b760c3cbb9b8561ada612d8aa022c709b651eb8bf8f16fc43d4f2fc7efb65de9743c0167a85f86fc58816f9b3b8b250da380e4f98fd4
+  data.tar.gz: d0ed65e3f7cb8cf0abd6e9235522faaf2e4fc14d2d0d77b8b51a678719d081caa02403de3b9b7b37f52e1f33f1395440006fe14b33278900bf8311f2e1d0079d

data/README.adoc

@@ -124,13 +124,13 @@ Where these preexisting metanorma attributes correspond to attributes already us
 by NIST in their Asciidoctor template, they are treated as synonyms of the Metanorma
 attributes.
 
-The attributes relevant to OGC documents include:
+The attributes relevant to NIST documents include:
 
 `:edition:`:: The document version; e.g. `2.0`.
 
 `:revdate:`:: The date the document was last updated.
 
-`:copyright-year:`: The year which will be claimed as when the copyright for
+`:copyright-year:`:: The year which will be claimed as when the copyright for
 the document was issued.
 
 `:title:`:: The main component of the English title of the document
@@ -203,6 +203,15 @@ The following document attributes are specific to this document class:
 
 `:doc-email:`:: Email contact for document
 
+`:call-for-patent-claims:`:: Include the Call for Patent Claims in document drafts, 
+and the Patent Disclosure Notice in finalised documents.
+
+`:commitment-to-licence:`:: Indicate in the Patent Disclosure Notice that
+notice and commitment to license have been received.
+
+`:patent-contact:`:: Contact for the Call for Patent Claims or Patent Disclosure Notice.
+If not supplied, `:doc-email:` is used.
+
 == Asciidoctor features specific to NIST
 
 The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]

data/lib/asciidoctor/nist/biblio.rng

@@ -18,6 +18,21 @@
   of this.
 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!--
+    https://www.myintervals.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
+    iso8601date = xsd:string { pattern = "([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?" }
+    Somewhat dumbed down for XSD regex:
+  -->
+  <define name="ISO8601DateTime">
+    <data type="string">
+      <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24:?00)([\.,]\d+)?)?((:?)[0-5]\d([.,]\d+)?)?([zZ]|([\+\-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?</param>
+    </data>
+  </define>
+  <define name="ISO8601Date">
+    <data type="string">
+      <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
+    </data>
+  </define>
   <define name="status">
     <element name="status">
       <ref name="LocalizedString"/>
@@ -375,10 +390,7 @@
   </define>
   <define name="date">
     <element name="date">
-      <choice>
-        <data type="gYear"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="locality">
@@ -561,10 +573,7 @@
   </define>
   <define name="fetched">
     <element name="fetched">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validity">
@@ -582,26 +591,17 @@
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -632,10 +632,7 @@
       <attribute name="text"/>
     </optional>
     <optional>
-      <choice>
-        <data type="gYear"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601Date"/>
     </optional>
   </define>
   <define name="bdate">
@@ -660,25 +657,16 @@
       <choice>
         <group>
           <element name="from">
-            <choice>
-              <data type="gYear"/>
-              <data type="date"/>
-            </choice>
+            <ref name="ISO8601Date"/>
           </element>
           <optional>
             <element name="to">
-              <choice>
-                <data type="gYear"/>
-                <data type="date"/>
-              </choice>
+              <ref name="ISO8601Date"/>
             </element>
           </optional>
         </group>
         <element name="on">
-          <choice>
-            <data type="gYear"/>
-            <data type="date"/>
-          </choice>
+          <ref name="ISO8601Date"/>
         </element>
       </choice>
     </element>
@@ -791,20 +779,12 @@
   </define>
   <define name="seriesfrom">
     <element name="from">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-        <data type="gYear"/>
-      </choice>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="seriesto">
     <element name="to">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-        <data type="gYear"/>
-      </choice>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="seriesnumber">
@@ -899,7 +879,7 @@
   </define>
   <define name="revision-date">
     <element name="revision-date">
-      <data type="date"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="draft">
@@ -922,10 +902,12 @@
   <define name="AnyElement">
     <element>
       <anyName/>
-      <choice>
-        <text/>
-        <ref name="AnyElement"/>
-      </choice>
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
 </grammar>

data/lib/asciidoctor/nist/converter.rb

@@ -27,8 +27,8 @@ module Asciidoctor
       def pseudocode_example(node)
         noko do |xml|
           xml.figure **{id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node), 
-                         type: "pseudocode"} do |ex|
-                        figure_title(node, ex)
+                        type: "pseudocode"} do |ex|
+            figure_title(node, ex)
             wrap_in_para(node, ex)
           end
         end.join("\n")
@@ -88,15 +88,15 @@ module Asciidoctor
         end
       end
 
-            def dlist(node)
-              return glossary(node) if node.attr("style") == "glossary"
-              super
-            end
+      def dlist(node)
+        return glossary(node) if node.attr("style") == "glossary"
+        super
+      end
 
-            def glossary(node)
+      def glossary(node)
         noko do |xml|
           xml.dl **{id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node),
-                         type: "glossary"} do |xml_dl|
+                    type: "glossary"} do |xml_dl|
             node.items.each do |terms, dd|
               dt(terms, xml_dl)
               dd(dd, xml_dl)
@@ -156,6 +156,13 @@ module Asciidoctor
         d
       end
 
+      def init(node)
+        @callforpatentclaims = node.attr("call-for-patent-claims")
+        @commitmenttolicence = node.attr("commitment-to-licence")
+        @patentcontact = node.attr("patent-contact")
+        super
+      end
+
       def document(node)
         init(node)
         ret1 = makexml(node)
@@ -198,10 +205,74 @@ module Asciidoctor
           c.name = "executivesummary" if c&.at("./title")&.text.downcase == "executive summary"
           preface.add_child c.remove
         end
+        callforpatentclaims(x, preface)
+      end
+
+      CALL_FOR_PATENT_CLAIMS = <<~END.freeze
+      <clause><title>Call for Patent Claims</title>
+      <p>This public review includes a call for information on essential patent claims (claims whose use would be required for compliance with the guidance or requirements in this Information Technology Laboratory (ITL) draft publication). Such guidance and/or requirements may be directly stated in this ITL Publication or by reference to another publication. This call also includes disclosure, where known, of the existence of pending U.S. or foreign patent applications relating to this ITL draft publication and of any relevant unexpired U.S. or foreign patents.</p>
+
+<p>ITL may require from the patent holder, or a party authorized to make assurances on its behalf, in written or electronic form, either:</p>
+
+<ol><li><p>assurance in the form of a general disclaimer to the effect that such party does not hold and does not currently intend holding any essential patent claim(s); or</p></li>
+
+<li><p>assurance that a license to such essential patent claim(s) will be made available to applicants desiring to utilize the license for the purpose of complying with the guidance or requirements in this ITL draft publication either:</p>
+
+	<ol><li><p>under reasonable terms and conditions that are demonstrably free of any unfair discrimination; or</p></li>
+
+        <li><p>without compensation and under reasonable terms and conditions that are demonstrably free of any unfair discrimination.</p></li></ol>
+</li></ol>
+
+<p>Such assurance shall indicate that the patent holder (or third party authorized to make assurances on its behalf) will include in any documents transferring ownership of patents subject to the assurance, provisions sufficient to ensure that the commitments in the assurance are binding on the transferee, and that the transferee will similarly include appropriate provisions in the event of future transfers with the goal of binding each successor-in-interest.</p>
+
+<p>The assurance shall also indicate that it is intended to be binding on successors-in-interest regardless of whether such provisions are included in the relevant transfer documents.</p>
+
+<p>Such statements should be addressed to: ITL-POINT-OF_CONTACT.</p>
+</clause>
+      END
+
+      PATENT_DISCLOSURE_NOTICE1 = <<~END.freeze
+            <clause><title>Patent Disclosure Notice</title>
+      <p>NOTICE: The Information Technology Laboratory (ITL) has requested that holders of patent claims whose use may be required for compliance with the guidance or requirements of this publication disclose such patent claims to ITL. However, holders of patents are not obligated to respond to ITL calls for patents and ITL has not undertaken a patent search in order to identify which, if any, patents may apply to this publication. </p>
+<p>Following the ITL call for the identification of patent claims whose use may be required for compliance with the guidance or requirements of this publication, notice of one or more such claims has been received. </p>
+<p>By publication, no position is taken by ITL with respect to the validity or scope of any patent claim or of any rights in connection therewith. The known patent holder(s) has (have), however, provided to NIST a letter of assurance stating either (1) a general disclaimer to the effect that it does (they do) not hold and does (do) not currently intend holding any essential patent claim(s), or (2) that it (they) will negotiate royalty-free or royalty-bearing licenses with other parties on a demonstrably nondiscriminatory basis with reasonable terms and conditions. </p>
+<p>Details may be obtained from ITL-POINT-OF_CONTACT. </p>
+<p>No representation is made or implied that this is the only license that may be required to avoid patent infringement in the use of this publication. </p>
+</clause>
+      END
+
+      PATENT_DISCLOSURE_NOTICE2 = <<~END.freeze
+            <clause><title>Patent Disclosure Notice</title>
+      <p>NOTICE: ITL has requested that holders of patent claims whose use may be required for compliance with the guidance or requirements of this publication disclose such patent claims to ITL. However, holders of patents are not obligated to respond to ITL calls for patents and ITL has not undertaken a patent search in order to identify which, if any, patents may apply to this publication.</p>
+<p>As of the date of publication and following call(s) for the identification of patent claims whose use may be required for compliance with the guidance or requirements of this publication, no such patent claims have been identified to ITL.</p>
+<p>No representation is made or implied by ITL that licenses are not required to avoid patent infringement in the use of this publication.</p>
+</clause>
+      END
+
+      def callforpatentclaims(x, preface)
+        if @callforpatentclaims
+          docemail = x&.at("//uri[@type = 'email']")&.text || "???"
+          docnumber = x&.at("//docnumber")&.text || "???"
+          status = x&.at("//bibdata/status")&.text 
+          published = status.nil? || status == "published"
+          preface.add_child patent_text(published, docemail, docnumber)
+        end
+      end
+
+      def patent_text(published, docemail, docnumber)
+        patent = (!published ? CALL_FOR_PATENT_CLAIMS :
+                  (@commitmenttolicence ? PATENT_DISCLOSURE_NOTICE1 :
+                   PATENT_DISCLOSURE_NOTICE2)).clone
+        patent.gsub(/ITL-POINT-OF_CONTACT/, published ?
+                    (@patentcontact || docemail) :
+                    (@patentcontact ||
+                     "#{docemail}, with the Subject: #{docnumber} "\
+                     "Call for Patent Claims"))
       end
 
       def make_preface(x, s)
-        if x.at("//foreword | //introduction | //abstract | //preface")
+        if x.at("//foreword | //introduction | //abstract | //preface") ||
+            @callforpatentclaims
           preface = s.add_previous_sibling("<preface/>").first
           move_sections_into_preface(x, preface)
           summ = x.at("//executivesummary") and preface.add_child summ.remove
@@ -243,7 +314,7 @@ module Asciidoctor
           else
             if @term_def then term_def_subclause_parse(a, xml, node)
             elsif @biblio then bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "bibliography" && node.level == 1
+            elsif node.attr("style") == "bibliography"
               bibliography_parse(a, xml, node)
             elsif node.attr("style") == "abstract"
               abstract_parse(a, xml, node)
@@ -255,6 +326,18 @@ module Asciidoctor
           end
         end.join("\n")
       end
+
+      def section_validate(doc)
+        super
+        f = doc.xpath("//references[not(parent::clause)]/title | //clause[descendant::references][not(parent::clause)]/title")
+        names = f.map { |s| s&.text }
+        return if names.empty?
+        return if names == ["References"]
+        return if names == ["Bibliography"]
+        return if names == ["References", "Bibliography"]
+        warn "Reference clauses #{names.join(', ')} do not follow expected pattern in NIST"
+      end
+
       def html_converter(node)
         IsoDoc::NIST::HtmlConvert.new(html_extract_attributes(node))
       end

data/lib/asciidoctor/nist/front.rb

@@ -62,7 +62,8 @@ module Asciidoctor
       end
 
       def metadata_copyright(node, xml)
-        from = node.attr("copyright-year") || node.attr("copyrightyear") || Date.today.year
+        from = node.attr("copyright-year") || node.attr("copyrightyear") ||
+          Date.today.year
         xml.copyright do |c|
           c.from from
           c.owner do |owner|

data/lib/asciidoctor/nist/isodoc.rng

@@ -927,7 +927,12 @@
           <value>AsciiMath</value>
         </choice>
       </attribute>
-      <text/>
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="annotation">

data/lib/asciidoctor/nist/isostandard.rng

@@ -250,24 +250,17 @@
         <choice>
           <group>
             <element name="from">
-              <choice>
-                <data type="gYear"/>
-                <data type="date"/>
-              </choice>
+              <ref name="ISO8601Date"/>
             </element>
             <optional>
               <element name="to">
-                <choice>
-                  <data type="gYear"/>
-                  <data type="date"/>
-                </choice>
+                <ref name="ISO8601Date"/>
               </element>
             </optional>
           </group>
           <element name="on">
             <choice>
-              <data type="gYear"/>
-              <data type="date"/>
+              <ref name="ISO8601Date"/>
               <value>--</value>
             </choice>
           </element>

data/lib/isodoc/nist/html/html_nist_titlepage.html

@@ -1,142 +1,142 @@
 <div class="document-stage-band" id='{{ status | downcase | replace: " ", "-" }}-band'>
-    <p class="document-stage">{{ status }}</p>
+  <p class="document-stage">{{ status }}</p>
 </div>
 
 <div class="document-type-band" id='{{ doctype | downcase | replace: " ", "-" }}-band'>
-    <p class="document-type">NIST {{ doctype }}</p>
+  <p class="document-type">NIST {{ doctype }}</p>
 </div>
 
 
 
-  <div id='toggle'> <span>&#x2022;</span> </div>
+<div id='toggle'> <span>&#x2022;</span> </div>
 
-  <header>
+<header>
 
-<!--<div class="WordSection1">-->
+  <!--<div class="WordSection1">-->
   <div class="coverpage">
     <div class="wrapper-top">
 
-              <div class="rule-2"></div>
+      <div class="rule-2"></div>
 
-  <div class="coverpage-doc-identity">
-    <div class="doc-number">
-      <div>{{ docnumber }}</div>
-      {% if edition %} <div> Revision {{ edition }}</div> {% endif %}
-      <div> {{ draftinfo }}</div>
-    </div>
+      <div class="coverpage-doc-identity">
+        <div class="doc-number">
+          <div>{{ docnumber }}</div>
+          {% if edition %} <div> Revision {{ edition }}</div> {% endif %}
+          <div> {{ draftinfo }}</div>
+        </div>
 
-    <div class="coverpage-title">
-      <span class="title-first">{{ doctitle }}</span>
-      {% if docsubtitle %}
-      <br/><span class="title-second">{{ docsubtitle }}</span>
-      {% endif %}
-    </div>
-  </div>
+        <div class="coverpage-title">
+          <span class="title-first">{{ doctitle }}</span>
+          {% if docsubtitle %}
+          <br/><span class="title-second">{{ docsubtitle }}</span>
+          {% endif %}
+        </div>
+      </div>
 
-  <div class="coverpage-logo">
-    <span>National Institute of Standards and Technology {{ docyear }}</span>
-  </div>
+      <div class="coverpage-logo">
+        <span>National Institute of Standards and Technology {{ docyear }}</span>
+      </div>
 
-  <div class="coverpage-tc-name">
-    <span>{{ tc }}</span>
-  </div>
+      <div class="coverpage-tc-name">
+        <span>{{ tc }}</span>
+      </div>
 
-  <div class="rule-thick"></div>
+      <div class="rule-thick"></div>
 
-  <div class="authors-container">
-    {% for affiliation in authors_affiliations %}
-    {% for author in affiliation[1] %}
-<div class="author">{{ author }}</div>
-{% endfor %} 
-<div class="affiliation">{{affiliation[0]}}</div>
-{% endfor %} 
-    </div>
+      <div class="authors-container">
+        {% for affiliation in authors_affiliations %}
+        {% for author in affiliation[1] %}
+        <div class="author">{{ author }}</div>
+        {% endfor %} 
+        <div class="affiliation">{{affiliation[0]}}</div>
+        {% endfor %} 
+      </div>
 
-    <div class="download-info">
+      <div class="download-info">
 
-This publication is available free of charge from: <br>
-<a href="{{url}}">{{ url }}</a>
+        This publication is available free of charge from: <br>
+        <a href="{{url}}">{{ url }}</a>
 
-<div class="category">{{ tc }}</div>
+        <div class="category">{{ tc }}</div>
 
-    </div>
+      </div>
 
-  </div>
+    </div>
   </div>
 
-    <div class="logo-wrapper">
+  <div class="logo-wrapper">
 
     <img id="NIST-logo" src="logo.png">
     <img id="commerce-logo" src="commerce-logo-color.png">
   </div>
 
   <div class="logo-info">
-      <p>U.S. Department of Commerce</p>
-      <p><i>Wilbur L. Ross, Jr., Secretary</i></p>
+    <p>U.S. Department of Commerce</p>
+    <p><i>Wilbur L. Ross, Jr., Secretary</i></p>
   </div>
 
   <div class="logo-info">
-      <p>National Institute of Standards and Technology</p>
-      <p><i>Walter Copan, NIST Director and Under Secretary of Commerce for Standards and Technology </i></p>
+    <p>National Institute of Standards and Technology</p>
+    <p><i>Walter Copan, NIST Director and Under Secretary of Commerce for Standards and Technology </i></p>
   </div>
 
   <div class="WordSection11">
-  <div class="coverpage-stage-block">
-    <span class="coverpage-stage" id="{{ doctype | downcase | replace: ' ', '-' }}">{{ doctype }}</span>
-  </div>
-
-  <div class="coverpage-stage-block">
-    <span class="coverpage-maturity" id="{{ status }}">{{ status }}</span>
-
-</div>
-
+    <div class="coverpage-stage-block">
+      <span class="coverpage-stage" id="{{ doctype | downcase | replace: ' ', '-' }}">{{ doctype }}</span>
+    </div>
 
-{% if unpublished %}
-  <div class="coverpage-warning">
-    <span class="title">Warning for Drafts</span>
+    <div class="coverpage-stage-block">
+      <span class="coverpage-maturity" id="{{ status }}">{{ status }}</span>
 
-    <p class="content">
-    This document is not a NIST Standard. It is distributed for review and
-    comment, and is subject to change without notice and may not be referred to as
-    a Standard. Recipients of this draft are invited to submit, with their
-    comments, notification of any relevant patent rights of which they are aware
-    and to provide supporting documentation.
-    </p>
-  </div>
-{% endif %}
-
-<div class="info-section">
-<div class="copyright">
-
-  <p class="year">
-    &copy; {{ docyear }} NIST.
-  </p>
-
-  <p class="message">
-    All rights reserved. Unless otherwise specified, no part of this
-    publication may be reproduced or utilized otherwise in any form or by any
-    means, electronic or mechanical, including photocopying, or posting on the
-    internet or an intranet, without prior written permission. Permission can
-    be requested from the address below.
-  </p>
-
-  <div class="contact-info">
-  <p class="name">National Institute of Standards and Technology</p>
-  <p class="address">
-  Attn: Computer Security Division, Information Technology Laboratory<br/>
-  100 Bureau Drive (Mail Stop 8930) Gaithersburg, MD 20899-8930<br/>
-  United States of America<br/>
-    <br />
-    <a href="mailto:{{ email }}">{{ email }}</a><br />
-    <a href="www.nist.gov">www.nist.gov</a>
-  </p>
-</div>
+    </div>
 
 
-</div>
+    {% if unpublished %}
+    <div class="coverpage-warning">
+      <span class="title">Warning for Drafts</span>
 
-<div class="rule"></div>
-</div>
+      <p class="content">
+      This document is not a NIST Standard. It is distributed for review and
+      comment, and is subject to change without notice and may not be referred to as
+      a Standard. Recipients of this draft are invited to submit, with their
+      comments, notification of any relevant patent rights of which they are aware
+      and to provide supporting documentation.
+      </p>
+    </div>
+    {% endif %}
+
+    <div class="info-section">
+      <div class="copyright">
+
+        <p class="year">
+        &copy; {{ docyear }} NIST.
+        </p>
+
+        <p class="message">
+        All rights reserved. Unless otherwise specified, no part of this
+        publication may be reproduced or utilized otherwise in any form or by any
+        means, electronic or mechanical, including photocopying, or posting on the
+        internet or an intranet, without prior written permission. Permission can
+        be requested from the address below.
+        </p>
+
+        <div class="contact-info">
+          <p class="name">National Institute of Standards and Technology</p>
+          <p class="address">
+          Attn: Computer Security Division, Information Technology Laboratory<br/>
+          100 Bureau Drive (Mail Stop 8930) Gaithersburg, MD 20899-8930<br/>
+          United States of America<br/>
+          <br />
+          <a href="mailto:{{ email }}">{{ email }}</a><br />
+          <a href="www.nist.gov">www.nist.gov</a>
+          </p>
+        </div>
+
+
+      </div>
+
+      <div class="rule"></div>
+    </div>
   </div>
 
 

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

@@ -632,7 +632,7 @@ p.Biblio, p.NormRef {
     overflow: auto;
 }
 
-.FigureTitle {
+.FigureTitle, .SourceTitle, .AdmonitionTitle {
     font-weight: 700;
     font-size: 1em;
     text-align: center;
@@ -888,10 +888,10 @@ h2 p {
 
 .coverpage-title {
 
-  font-family: 'Libre Baskerville', serif; }
+  font-family: $headerfont; }
 
   .coverpage-title span {
-    font-family: 'Libre Baskerville', serif;
+    font-family: $headerfont;
     font-size: 1.1em;
     line-height: 1;
   }

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

@@ -157,6 +157,44 @@ p.FigureTitle
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.SourceTitle
+        {mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"";
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:6.0pt;
+        margin-left:0cm;
+        text-align:center;
+        line-height:12.0pt;
+        page-break-before:avoid;
+        mso-pagination:widow-orphan;
+        tab-stops:20.15pt;
+        font-size:11.0pt;
+        font-weight:bold;
+        font-family:$bodyfont;
+        mso-fareast-font-family:$bodyfont;
+        mso-bidi-font-family:$bodyfont;
+        mso-ansi-language:EN-GB;}
+p.AdmonitionTitle
+        {mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"";
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:6.0pt;
+        margin-left:0cm;
+        text-align:center;
+        line-height:12.0pt;
+        page-break-after:avoid;
+        mso-pagination:widow-orphan;
+        tab-stops:20.15pt;
+        font-size:11.0pt;
+        font-weight:bold;
+        font-family:$bodyfont;
+        mso-fareast-font-family:$bodyfont;
+        mso-bidi-font-family:$bodyfont;
+        mso-ansi-language:EN-GB;}
 p.TableTitle
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -527,33 +565,51 @@ p.QuoteAttribution
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;
         }
-p.Admonition, li.Admonition, div.Admonition
+div.Admonition {
+  mso-style-priority:99;
+        mso-pagination:widow-orphan;
+        padding:18.0pt 12.0pt 18.0pt 12.0pt;
+        margin-left:14.2pt;
+        margin-right:14.2pt;
+        border:none;
+        mso-element:para-border-div;
+        border:solid windowtext 1.0pt;
+        mso-border-alt:solid windowtext .5pt;
+        mso-padding-alt:7.0pt 4.0pt 7.0pt 4.0pt;
+        font-size:11.0pt;
+        font-family:$headerfont;
+        background-color: #dddddd;
+        mso-ascii-font-family:$headerfont;
+        mso-ascii-theme-font:minor-latin;
+        mso-fareast-font-family:$headerfont;
+        mso-fareast-theme-font:minor-fareast;
+        mso-hansi-font-family:$headerfont;
+        mso-hansi-theme-font:minor-latin;
+        mso-bidi-font-family:$headerfont;
+        mso-bidi-theme-font:minor-bidi;
+        mso-ansi-language:EN-AU;
+}
+p.Admonition, li.Admonition
 	{mso-style-priority:99;
-	margin-top:0cm;
-	margin-right:57.6pt;
-	margin-bottom:0cm;
-	margin-left:57.6pt;
-	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
+        padding:0cm;
+        padding:18.0pt 12.0pt 18.0pt 12.0pt;
 	border:none;
-	mso-border-alt:solid #4472C4 .25pt;
-	mso-border-themecolor:accent1;
-	padding:0cm;
-	mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
-	font-size:12.0pt;
-	font-family:$bodyfont;
-	mso-ascii-font-family:$bodyfont;
+	mso-border-alt:solid .25pt;
+	mso-padding-alt:7.0pt 4.0pt 7.0pt 4.0pt;
+	font-size:11.0pt;
+	font-family:$headerfont;
+        background-color: #dddddd;
+	mso-ascii-font-family:$headerfont;
 	mso-ascii-theme-font:minor-latin;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:$headerfont;
 	mso-fareast-theme-font:minor-fareast;
-	mso-hansi-font-family:$bodyfont;
+	mso-hansi-font-family:$headerfont;
 	mso-hansi-theme-font:minor-latin;
-	mso-bidi-font-family:$bodyfont;
+	mso-bidi-font-family:$headerfont;
 	mso-bidi-theme-font:minor-bidi;
-	color:#4472C4;
-	mso-themecolor:accent1;
 	mso-ansi-language:EN-AU;
-	font-style:italic;}
+      }
 p.Code, li.Code, div.Code
 	{mso-style-name:Code;
 	mso-style-priority:16;

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

@@ -709,6 +709,7 @@ p.TOCTitle, li.TOCTitle, div.TOCTitle
 	margin-bottom:12.0pt;
 	margin-left:0in;
 	text-align:center;
+        page-break-after:avoid;
 	mso-pagination:none;
 	mso-hyphenate:none;
 	mso-layout-grid-align:none;

data/lib/isodoc/nist/html_convert.rb

@@ -91,7 +91,7 @@ module IsoDoc
         end
       end
 
-            def bibliography(isoxml, out)
+      def bibliography(isoxml, out)
         f = isoxml.at(ns("//bibliography/clause | //bibliography/references")) || return
         page_break(out)
         isoxml.xpath(ns("//bibliography/clause | //bibliography/references")).each do |f|
@@ -314,8 +314,8 @@ module IsoDoc
       def middle(isoxml, out)
         middle_title(out)
         clause isoxml, out
-        annex isoxml, out
         bibliography isoxml, out
+        annex isoxml, out
       end
 
       def info(isoxml, out)
@@ -352,6 +352,7 @@ module IsoDoc
         end
       end
 
+=begin
       def prefaceprefix(nodes)
         i = 0
         nodes.each do |n|
@@ -375,6 +376,42 @@ module IsoDoc
           hierarchical_asset_names(s, @anchors[s["id"]][:label])
         end
       end
+=end
+
+      def middle_section_asset_names(d)
+        middle_sections = 
+          "//xmlns:preface/child::* | //xmlns:sections/child::*"
+        sequential_asset_names(d.xpath(middle_sections))
+      end
+
+      def sequential_asset_names(clause)
+        super
+        sequential_permission_names(clause)
+        sequential_requirement_names(clause)
+        sequential_recommendation_names(clause)
+      end
+
+      def sequential_permission_names(clause)
+        clause.xpath(ns(".//permission")).each_with_index do |t, i|
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] = anchor_struct(i + 1, t, "Permission", "permission")
+        end
+      end
+
+      def sequential_requirement_names(clause)
+        clause.xpath(ns(".//requirement")).each_with_index do |t, i|
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] = anchor_struct(i + 1, t, "Requirement", "requirement")
+        end
+      end
+
+      def sequential_recommendation_names(clause)
+        clause.xpath(ns(".//recommendation")).each_with_index do |t, i|
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] = anchor_struct(i + 1, t, "Recommendation", "recommendation")
+        end
+      end
+
 
       def hierarchical_asset_names(clause, num)
         super

data/lib/isodoc/nist/pdf_convert.rb

@@ -12,10 +12,10 @@ module IsoDoc
         super
               end
       def convert1(docxml, filename, dir)
-        FileUtils.cp html_doc_path('logo.png'), "logo.png"
-        FileUtils.cp html_doc_path('commerce-logo-color.png'), "commerce-logo-color.png"
-        @files_to_delete << "logo.png"
-        @files_to_delete << "commerce-logo-color.png"
+        FileUtils.cp html_doc_path('logo.png'), File.join(@localdir, "logo.png")
+        FileUtils.cp html_doc_path('commerce-logo-color.png'), File.join(@localdir, "commerce-logo-color.png")
+        @files_to_delete << File.join(@localdir, "logo.png")
+        @files_to_delete << File.join(@localdir, "commerce-logo-color.png")
         super
       end
 
@@ -295,8 +295,8 @@ module IsoDoc
       def middle(isoxml, out)
         middle_title(out)
         clause isoxml, out
-        annex isoxml, out
         bibliography isoxml, out
+        annex isoxml, out
       end
 
       def bibliography(isoxml, out)
@@ -349,28 +349,37 @@ module IsoDoc
         end
       end
 
+            def middle_section_asset_names(d)
+        middle_sections =
+          "//xmlns:preface/child::* | //xmlns:sections/child::*"
+        sequential_asset_names(d.xpath(middle_sections))
+      end
 
-      def prefaceprefix(nodes)
-        i = 0
-        nodes.each do |n|
-          case n.name
-          when "executivesummary" then @anchors[n["id"]][:prefix] = "ES"
-          when "abstract" then @anchors[n["id"]][:prefix] = "ABS"
-          when "reviewernote" then @anchors[n["id"]][:prefix] = "NTR"
-          else
-            @anchors[n["id"]][:prefix] = "PR" + i.to_s
-            i += 1
-          end
+      def sequential_asset_names(clause)
+        super
+        sequential_permission_names(clause)
+        sequential_requirement_names(clause)
+        sequential_recommendation_names(clause)
+      end
+
+      def sequential_permission_names(clause)
+        clause.xpath(ns(".//permission")).each_with_index do |t, i|
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] = anchor_struct(i + 1, t, "Permission", "permission")
         end
       end
 
-      def middle_section_asset_names(d)
-        prefaceprefix(d.xpath("//xmlns:preface/child::*"))
-        d.xpath("//xmlns:preface/child::*").each do |s|
-          hierarchical_asset_names(s, @anchors[s["id"]][:prefix])
+      def sequential_requirement_names(clause)
+        clause.xpath(ns(".//requirement")).each_with_index do |t, i|
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] = anchor_struct(i + 1, t, "Requirement", "requirement")
         end
-        d.xpath("//xmlns:sections/child::*").each do |s|
-          hierarchical_asset_names(s, @anchors[s["id"]][:label])
+      end
+
+      def sequential_recommendation_names(clause)
+        clause.xpath(ns(".//recommendation")).each_with_index do |t, i|
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] = anchor_struct(i + 1, t, "Recommendation", "recommendation")
         end
       end
 

data/lib/isodoc/nist/word_convert.rb

@@ -219,7 +219,8 @@ module IsoDoc
         isoxml.xpath(ns("//bibliography/clause | "\
                         "//bibliography/references")).each do |f|
           out.div do |div|
-            div.p **{ class: "h1Annex" } do |h1|
+            #div.p **{ class: "h1Annex" } do |h1|
+            div.h1 do |h1|
               f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
             end
             f.elements.reject do |e|
@@ -243,7 +244,8 @@ module IsoDoc
       def keywords(_docxml, out)
         kw = @meta.get[:keywords]
         kw.empty? and return
-        out.div **{ class: "Section3" } do |div|
+        #out.div **{ class: "Section3" } do |div|
+        out.div do |div|
           clause_name(nil, "Keywords", div,  class: "IntroTitle")
           div.p kw.sort.join("; ")
         end
@@ -259,10 +261,12 @@ module IsoDoc
         isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
           foreword(isoxml, out) and next if c.name == "foreword"
           next if skip_render(c, isoxml)
+          title = c&.at(ns("./title"))
+          patent = ["Call for Patent Claims", "Patent Disclosure Notice"].include? title&.text
           out.div **attr_code(id: c["id"]) do |s|
-            clause_name(get_anchors[c['id']][:label],
-                        c&.at(ns("./title"))&.content, s, 
-                        class: c.name == "executivesummary" ? "NormalTitle" :
+            page_break(s) if patent
+            clause_name(get_anchors[c['id']][:label], title&.content, s, 
+                        class: (c.name == "executivesummary") ? "NormalTitle" :
                         "IntroTitle")
             c.elements.reject { |c1| c1.name == "title" }.each do |c1|
               parse(c1, s)
@@ -449,8 +453,8 @@ module IsoDoc
         # NIST documents don't repeat the title
         # middle_title(out)
         clause isoxml, out
-        annex isoxml, out
         bibliography isoxml, out
+        annex isoxml, out
       end
 
       def info(isoxml, out)
@@ -487,31 +491,41 @@ module IsoDoc
         end
       end
 
+            def middle_section_asset_names(d)
+        middle_sections =
+          "//xmlns:preface/child::* | //xmlns:sections/child::*"
+        sequential_asset_names(d.xpath(middle_sections))
+      end
 
-      def prefaceprefix(nodes)
-        i = 0
-        nodes.each do |n|
-          case n.name
-          when "executivesummary" then @anchors[n["id"]][:prefix] = "ES"
-          when "abstract" then @anchors[n["id"]][:prefix] = "ABS"
-          when "reviewernote" then @anchors[n["id"]][:prefix] = "NTR"
-          else
-            @anchors[n["id"]][:prefix] = "PR" + i.to_s
-            i += 1
-          end
+      def sequential_asset_names(clause)
+        super
+        sequential_permission_names(clause)
+        sequential_requirement_names(clause)
+        sequential_recommendation_names(clause)
+      end
+
+      def sequential_permission_names(clause)
+        clause.xpath(ns(".//permission")).each_with_index do |t, i|
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] = anchor_struct(i + 1, t, "Permission", "permission")
         end
       end
 
-      def middle_section_asset_names(d)
-        prefaceprefix(d.xpath("//xmlns:preface/child::*"))
-        d.xpath("//xmlns:preface/child::*").each do |s|
-          hierarchical_asset_names(s, @anchors[s["id"]][:prefix])
+      def sequential_requirement_names(clause)
+        clause.xpath(ns(".//requirement")).each_with_index do |t, i|
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] = anchor_struct(i + 1, t, "Requirement", "requirement")
         end
-        d.xpath("//xmlns:sections/child::*").each do |s|
-          hierarchical_asset_names(s, @anchors[s["id"]][:label])
+      end
+
+      def sequential_recommendation_names(clause)
+        clause.xpath(ns(".//recommendation")).each_with_index do |t, i|
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] = anchor_struct(i + 1, t, "Recommendation", "recommendation")
         end
       end
 
+
       def hierarchical_asset_names(clause, num)
         super
         hierarchical_permission_names(clause, num)

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor