metanorma-nist 1.2.8 → 1.2.13

data/lib/asciidoctor/nist/isodoc.rng

@@ -55,6 +55,13 @@
             <param name="pattern">\i\c*|\c+#\c+</param>
           </data>
         </attribute>
+        <optional>
+          <attribute name="to">
+            <data type="string">
+              <param name="pattern">\i\c*|\c+#\c+</param>
+            </data>
+          </attribute>
+        </optional>
         <optional>
           <attribute name="type">
             <ref name="ReferenceFormat"/>
@@ -246,6 +253,12 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="width"/>
+        </optional>
+        <optional>
+          <ref name="colgroup"/>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -764,6 +777,21 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="colgroup">
+    <element name="colgroup">
+      <oneOrMore>
+        <ref name="col"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="col">
+    <element name="col">
+      <attribute name="width"/>
+    </element>
+  </define>
+  <define name="BibItemType" combine="choice">
+    <value>internal</value>
+  </define>
   <define name="TextElement" combine="choice">
     <ref name="concept"/>
   </define>
@@ -784,6 +812,8 @@
       <ref name="requirement"/>
       <ref name="recommendation"/>
       <ref name="permission"/>
+      <ref name="imagemap"/>
+      <ref name="svgmap"/>
     </choice>
   </define>
   <define name="bibliography">
@@ -814,6 +844,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -869,9 +902,11 @@
       <element name="code">
         <text/>
       </element>
-      <element name="text">
-        <text/>
-      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
     </element>
   </define>
   <define name="standard-document">
@@ -1041,6 +1076,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1094,6 +1132,9 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1196,6 +1237,9 @@
       <optional>
         <attribute name="type"/>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1524,6 +1568,7 @@
           <value>add</value>
           <value>modify</value>
           <value>delete</value>
+          <value>replace</value>
         </choice>
       </attribute>
       <optional>
@@ -1554,6 +1599,11 @@
       </optional>
       <optional>
         <element name="newcontent">
+          <optional>
+            <attribute name="id">
+              <data type="ID"/>
+            </attribute>
+          </optional>
           <zeroOrMore>
             <ref name="BasicBlock"/>
           </zeroOrMore>
@@ -1587,4 +1637,65 @@
       <text/>
     </element>
   </define>
+  <define name="imagemap">
+    <element name="imagemap">
+      <ref name="figure"/>
+      <zeroOrMore>
+        <element name="area">
+          <attribute name="type">
+            <choice>
+              <value>rect</value>
+              <value>circle</value>
+              <value>ellipse</value>
+              <value>poly</value>
+            </choice>
+          </attribute>
+          <choice>
+            <ref name="xref"/>
+            <ref name="hyperlink"/>
+            <ref name="eref"/>
+          </choice>
+          <oneOrMore>
+            <element name="coords">
+              <attribute name="x">
+                <data type="float"/>
+              </attribute>
+              <attribute name="y">
+                <data type="float"/>
+              </attribute>
+            </element>
+          </oneOrMore>
+          <optional>
+            <element name="radius">
+              <attribute name="x">
+                <data type="float"/>
+              </attribute>
+              <optional>
+                <attribute name="y">
+                  <data type="float"/>
+                </attribute>
+              </optional>
+            </element>
+          </optional>
+        </element>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="svgmap">
+    <element name="svgmap">
+      <ref name="figure"/>
+      <zeroOrMore>
+        <element name="target">
+          <attribute name="href">
+            <data type="anyURI"/>
+          </attribute>
+          <choice>
+            <ref name="xref"/>
+            <ref name="hyperlink"/>
+            <ref name="eref"/>
+          </choice>
+        </element>
+      </zeroOrMore>
+    </element>
+  </define>
 </grammar>

data/lib/asciidoctor/nist/nist_intro.xml

@@ -6,21 +6,21 @@
     <p>
     {%- if substage == "retired" or substage == "withdrawn" -%}
     {%- if unpublished -%}
-    {%- if substage == "retired" %}{{draft-retired-boilerplate}}{% else %}{{draft-withdrawn-boilerplate}}{% endif -%}  
+    {%- if substage == "retired" %}{{labels["draft-retired-boilerplate"]}}{% else %}{{labels["draft-withdrawn-boilerplate"]}}{% endif -%}  
     {%- else -%}
-    {%- if withdrawal_pending %}{{ withdrawal-pending-boilerplate}}{% else %}{{ publication-withdrawn-boilerplate }}{% endif -%}
+    {%- if withdrawal_pending %}{{ labels["withdrawal-pending-boilerplate"]}}{% else %}{{ labels["publication-withdrawn-boilerplate"] }}{% endif -%}
     {%- endif -%}
     {%- else -%}
     {%- if status == "Internal Draft" -%}
-    {{- draft-internal-boilerplate -}}
+    {{- labels["draft-internal-boilerplate"] -}}
     {%- elsif status == "Work-in-Progress Draft" -%}
-    {{- draft-wip-boilerplate -}}
+    {{- labels["draft-wip-boilerplate"] -}}
     {%- elsif status == "Preliminary Draft" -%}
-    {{- draft-prelim-boilerplate -}}
+    {{- labels["draft-prelim-boilerplate"] -}}
     {%- elsif status == "Public Draft" -%}
-    {{- draft-public-boilerplate -}}
+    {{- labels["draft-public-boilerplate"] -}}
     {%- elsif status == "Approval Draft" -%}
-    {{- draft-public-boilerplate -}}
+    {{- labels["draft-public-boilerplate"] -}}
     {%- endif -%}
     {%- endif -%}
   </p>
@@ -78,8 +78,8 @@ CODEN: NSPUE2</p>
   <p align="center"><strong>Comments on this publication may be submitted to:</strong></p>
 
 <p align="center">National Institute of Standards and Technology <br/>
-  Attn: {{ nist_division }} <br/>
-  {{ nist_division_address }} <br/>
+  Attn: {{ labels["nist_division"] }} <br/>
+  {{ labels["nist_division_address"] }} <br/>
   {% if email %}
   Email: <link target="mailto:{{ email }}"/>
   {% endif %}</p>

data/lib/asciidoctor/nist/nist_intro_cswp.xml

@@ -6,21 +6,21 @@
     <p>
     {%- if substage == "retired" or substage == "withdrawn" -%}
     {%- if unpublished -%}
-    {%- if substage == "retired" %}{{draft-retired-boilerplate}}{% else %}{{draft-withdrawn-boilerplate}}{% endif -%}
+    {%- if substage == "retired" %}{{labels["draft-retired-boilerplate"]}}{% else %}{{labels["draft-withdrawn-boilerplate"]}}{% endif -%}
     {%- else -%}
-    {%- if withdrawal_pending %}{{ withdrawal-pending-boilerplate}}{% else %}{{ publication-withdrawn-boilerplate }}{% endif -%}
+    {%- if withdrawal_pending %}{{ labels["withdrawal-pending-boilerplate"]}}{% else %}{{ labels["publication-withdrawn-boilerplate"] }}{% endif -%}
     {%- endif -%}
     {%- else -%}
     {%- if status == "Internal Draft" -%}
-    {{- draft-internal-boilerplate -}}
+    {{- labels["draft-internal-boilerplate"] -}}
     {%- elsif status == "Work-in-Progress Draft" -%}
-    {{- draft-wip-boilerplate -}}
+    {{- labels["draft-wip-boilerplate"] -}}
     {%- elsif status == "Preliminary Draft" -%}
-    {{- draft-prelim-boilerplate -}}
+    {{- labels["draft-prelim-boilerplate"] -}}
     {%- elsif status == "Public Draft" -%}
-    {{- draft-public-boilerplate -}}
+    {{- labels["draft-public-boilerplate"] -}}
     {%- elsif status == "Approval Draft" -%}
-    {{- draft-public-boilerplate -}}
+    {{- labels["draft-public-boilerplate"] -}}
     {%- endif -%}
     {%- endif -%}
   </p>
@@ -62,8 +62,8 @@
   <p align="center"><strong>Comments on this publication may be submitted to:</strong></p>
 
 <p align="center">National Institute of Standards and Technology <br/>
-  Attn: {{ nist_division }} <br/>
-  {{ nist_division_address }} <br/>
+  Attn: {{ labels["nist_division"] }} <br/>
+  {{ labels["nist_division_address"] }} <br/>
   {% if email %}
   Email: <link target="mailto:{{ email }}"/>
   {% endif %}</p>

data/lib/asciidoctor/nist/validate.rb

@@ -48,18 +48,29 @@ module Asciidoctor
       end
 
       def series_validate(xmldoc)
-        series = xmldoc&.at("//bibdata/series/title")&.text or return
+        series = xmldoc&.at("//bibdata/series[@type = 'main']/title")&.text or return
+        recognised_series_validate(series)
+        subseries_validate(series, xmldoc)
+      end
+
+      def recognised_series_validate(series)
         found = false
         SERIES.each { |_, v| found = true if v == series }
-        found or
-          @log.add("Document Attributes", nil, 
-                   "#{series} is not a recognised series")
+        found or @log.add("Document Attributes", nil, "#{series} is not a recognised series")
+      end
+
+      def subseries_validate(series, xmldoc)
+        subseries = xmldoc&.at("//bibdata/series[@type = 'secondary']")
+        csts = series == "NIST Cybersecurity Technical Specification"
+        subseries && !csts and
+          @log.add("Document Attributes", nil, "Subseries are not permitted on the series #{series}")
+        !subseries && csts and
+          @log.add("Document Attributes", nil, "Subseries are required on the series #{series}")
       end
 
       def validate(doc)
         content_validate(doc)
-        schema_validate(formattedstr_strip(doc.dup),
-                        File.join(File.dirname(__FILE__), "nist.rng"))
+        schema_validate(formattedstr_strip(doc.dup), File.join(File.dirname(__FILE__), "nist.rng"))
       end
 
       def introduction_validate(doc)

data/lib/isodoc/nist/base_convert.rb

@@ -113,7 +113,7 @@ module IsoDoc
         end
       end
 
-      def middle_clause
+      def middle_clause(_docxml)
         "//clause[parent::sections] | //terms[parent::sections]"
       end
 
@@ -175,8 +175,7 @@ module IsoDoc
 
       def modification_parse(node, out)
         out << @i18n.modified
-        node.at(ns("./p[text()[normalize-space() != '']]")) and
-          out << " &mdash; "
+        node.at(ns("./p[text()[normalize-space() != '']]")) and out << " &mdash; "
         node.at(ns("./p")).children.each { |n| parse(n, out) }
       end
 

data/lib/isodoc/nist/html/header_cswp.html

@@ -65,8 +65,7 @@ href="../{{ filename }}.html">
 
 <p class=MsoHeaderCxSpFirst style='tab-stops:center 234.0pt right 468.0pt'><span
 lang=EN-US style='font-size:10.0pt;font-family:"Arial",sans-serif;font-variant:
-small-caps;color:#244061;mso-themecolor:accent1;mso-themeshade:128'>NIST
-Cybersecurity White Paper<span style='mso-tab-count:2'>                                                                           </span></span><!--[if supportFields]><span
+small-caps;color:#244061;mso-themecolor:accent1;mso-themeshade:128'>{{ series }}<span style='mso-tab-count:2'>                                                                           </span></span><!--[if supportFields]><span
 lang=EN-US style='font-size:10.0pt;font-family:"Arial",sans-serif;font-variant:
 small-caps;color:#244061;mso-themecolor:accent1;mso-themeshade:128'><span
 style='mso-element:field-begin'></span> DOCPROPERTY<span
@@ -199,7 +198,7 @@ _Hlk10701209'></span></a><w:Sdt SdtDocPart="t" DocPartType="Watermarks"
 style='mso-bookmark:_Hlk10701209'><span lang=EN-US style='font-size:10.0pt;
 font-family:"Arial",sans-serif;font-variant:small-caps;color:white;mso-themecolor:
 background1;background:#244061;mso-shading-themecolor:accent1;mso-shading-themeshade:
-128'>NIST Cybersecurity White Paper {% if draft_prefix %}(DRAFT){% endif %}</span></span></span><span
+128'>{{ series }} {% if draft_prefix %}(DRAFT){% endif %}</span></span></span><span
 style='mso-bookmark:_Hlk10701208'><span style='mso-bookmark:_Hlk10701209'><span
 class=MsoCommentReference><span lang=EN-US style='font-size:10.0pt;font-family:
 "Arial",sans-serif;font-variant:small-caps;color:white;mso-color-alt:windowtext'><span

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

@@ -86,7 +86,7 @@
       {% if unpublished %}
       <div class="coverpage-warning">
         <!--
-        <p>{% if substage == "retired" %}{{draft-retired-boilerplate}}{% else %}{{draft-withdrawn-boilerplate}}{% endif %}</p>
+        <p>{% if substage == "retired" %}{{labels["draft-retired-boilerplate"]}}{% else %}{{labels["draft-withdrawn-boilerplate"]}}{% endif %}</p>
         -->
         <div class="authority6"/>
 
@@ -105,9 +105,9 @@
       <div class="coverpage-warning">
         <!--
         {% if withdrawal_pending %}
-        <p>{{ withdrawal-pending-boilerplate}}</p>
+        <p>{{ labels["withdrawal-pending-boilerplate"]}}</p>
         {% else %}
-        <p>{{ publication-withdrawn-boilerplate }}</p>
+        <p>{{ labels["publication-withdrawn-boilerplate"] }}</p>
         {% endif %}
         -->
         <div class="authority6"/>
@@ -172,12 +172,14 @@
       {% endif %}
       </div>
 
+      {% if doi %}
       <div class="download-info">
 
         This publication is available free of charge from: <br>
         <a href="{{doi}}">{{ doi }}</a>
 
       </div>
+      {% endif %}
       {% endunless %}       
 
       {% endif %}          

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

@@ -59,9 +59,9 @@ AABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAkwUAAAAA
     style='mso-bidi-font-weight:normal'><span lang="EN-US">Warning Notice<o:p></o:p></span></b></p>
     <p class="Default"><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'><o:p>&#xa0;</o:p></span></p>
     {% if substage == "retired" %}
-    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{draft-retired-boilerplate}}<o:p></o:p></span></p>
+    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{labels["draft-retired-boilerplate"]}}<o:p></o:p></span></p>
     {% else %}
-    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{draft-withdrawn-boilerplate}}<o:p></o:p></span></p>
+    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{labels["draft-withdrawn-boilerplate"]}}<o:p></o:p></span></p>
     {% endif %}
       -->
       <div class="authority6"/>
@@ -375,7 +375,7 @@ AABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAkwUAAAAA
     <p class="Default" align="center" style='text-align:center;font-size:12.0pt;'><b
     style='mso-bidi-font-weight:normal'><span lang="EN-US">Warning Notice<o:p></o:p></span></b></p>
     <p class="Default"><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'><o:p>&#xa0;</o:p></span></p>
-    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{ withdrawal-pending-boilerplate}}<o:p></o:p></span></p>
+    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{ labels["withdrawal-pending-boilerplate"]}}<o:p></o:p></span></p>
         -->
     <p class="Default" align="center" style='text-align:center'><span lang="EN-US"
     style='mso-fareast-font-family:"Times New Roman"'><o:p>&#xa0;</o:p></span></p>
@@ -593,7 +593,7 @@ style='width:477.0pt;margin-left:-5.25pt;border-collapse:collapse;border:none;ms
   color:black;mso-themecolor:text1'><o:p>&#xa0;</o:p></span></p>
   <p class="Default"><span lang="EN-US" style='font-size:11.0pt;font-family:"Calibri",sans-serif;
   mso-ascii-theme-font:major-latin;mso-fareast-font-family:"Times New Roman";
-  mso-hansi-theme-font:major-latin;mso-bidi-font-family:"Times New Roman"'>{{publication-withdrawn-boilerplate}}<o:p></o:p></span></p>
+  mso-hansi-theme-font:major-latin;mso-bidi-font-family:"Times New Roman"'>{{labels["publication-withdrawn-boilerplate"]}}<o:p></o:p></span></p>
     -->
     <div class="withdrawn">
       <div class="authority6"/>
@@ -1111,13 +1111,13 @@ style='font-size:14.0pt;color:black;mso-themecolor:text1'>&#xa0;</span></p>
     style='font-size:14.0pt'>&#xa0;</span></p>
     <p class="Default" align="left" style='text-align:justify;text-justify:inter-ideograph'><span lang="EN-US"
     style='font-size:12.0pt'>{% if status == "Internal Draft" %}
-    {{draft-internal-boilerplate}}
+    {{labels["draft-internal-boilerplate"]}}
     {% elsif status == "Work-in-Progress Draft" %}
-    {{draft-wip-boilerplate}}
+    {{labels["draft-wip-boilerplate"]}}
     {% elsif status == "Preliminary Draft" %}
-    {{draft-prelim-boilerplate}}
+    {{labels["draft-prelim-boilerplate"]}}
     {% elsif status == "Public Draft" %}
-    {{draft-public-boilerplate}}
+    {{labels["draft-public-boilerplate"]}}
     {% else %}
     {{status}}
     {% endif %}</span></p>

data/lib/isodoc/nist/html/word_nist_titlepage_cswp.html

@@ -62,7 +62,9 @@ mso-themeshade:128'>{{ issueddate_MMMddyyyy }}</span></p>
 
 <p class="MsoNormal">&#xa0;</p>
 
+{% if doi %}
 <p class="MsoNormal"><span
 style='color:#244061;mso-themecolor:accent1;mso-themeshade:128'>This
 publication is available free of charge from:<br/>
 {{ doi }}</span></p>
+{% endif %}

data/lib/isodoc/nist/html_convert.rb

@@ -21,14 +21,12 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
-                     '"Libre Baskerville",serif'),
-                     headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-                                  '"Libre Baskerville",serif'),
-                                  monospacefont: '"Space Mono",monospace',
-                                  normalfontsize: "14px",
-                                  footnotefontsize: "0.9em",
-                                  monospacefontsize: "0.8em",
+          bodyfont: '"Libre Baskerville",serif',
+          headerfont: '"Libre Baskerville",serif',
+          monospacefont: '"Space Mono",monospace',
+          normalfontsize: "14px",
+          footnotefontsize: "0.9em",
+          monospacefontsize: "0.8em",
         }
       end