metanorma-nist 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efbc5ed91c60f75c2357b75e8e4b46aff94fbbda2e5ff42b5ae23ccdacee11b8
-  data.tar.gz: e11867a00497daa2adde0df1a6589fa8100e3ede705e9c35aabb06083b5bee95
+  metadata.gz: 479ffc86d11ce177921f465e151fb8fa57f20e946234b079879523f2de275e68
+  data.tar.gz: 681de2826b7931bab707e701dc85fc6ed090c860c3c20e5105c86fbe57c837f0
 SHA512:
-  metadata.gz: b22030c9411714d60f7d5a4331ebdb558801a4054844658179c82ce8df69cb7893d38ba704438df0092407e4708d3b7317ce83221aa82db768f90ba85e994a7f
-  data.tar.gz: c8f098eec3c4b877b86425f06bfc5d82c5b4e0dbd9472a75073ce18389d0ded1936923348d1d51050df38c663f8f3689e4bf72b3be7b5fc06a64d68b6308a825
+  metadata.gz: 9cd443581973f965269c74a3b4b185014513cda9733135a117db5e3775b201d5ccaa146c587ff7694166f9bc09f2af59b833f650bb0d8019e9950eff84384d72
+  data.tar.gz: 73566c4935a4778599499eec7f88bf2d82ca4317420f6e8dc5a6b8594cd9b9103ed52bf8f1f9f75f2c25cba9438cf4d55384fe151b4bbad2b3a5330801e4d8b7

data/README.adoc

@@ -145,8 +145,7 @@ introduced with `=`, is ignored)
 
 `:docnumber:`:: The internal identifier referring to this document.
 
-`:draft:`:: If present, review notes are included in the
-Metanorma XML output; otherwise they are suppressed. The value of
+`:edition:`:: Edition (revision) of the document. The value of
 this attribute will be displayed as part of the heading, prefixed with "Revision".
 
 ////

data/lib/asciidoctor/nist/converter.rb

@@ -138,7 +138,7 @@ module Asciidoctor
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</nist-standard>"
-        result = textcleanup(result.flatten * "\n")
+        result = textcleanup(result)
         ret1 = cleanup(Nokogiri::XML(result))
         validate(ret1)
         ret1.root.add_namespace(nil, EXAMPLE_NAMESPACE)

data/lib/asciidoctor/nist/isodoc.rng

@@ -493,6 +493,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>

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

@@ -21,6 +21,7 @@
   <div class="coverpage-doc-identity">
     <div class="doc-number">
       <div>{{ docnumber }}</div>
+      {% if edition %} <div> Revision {{ edition }}</div> {% endif %}
       <div> {{ draftinfo }}</div>
     </div>
 

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

@@ -590,7 +590,7 @@ ul > li:first-child {
     .rule {
         width: 100%;
         height: 1px;
-        background-color: #000000;
+        background-color: #2677ea;
         margin: 2em 0;
       }
 
@@ -688,6 +688,10 @@ span.nistvariable {
     margin-left:-1.5em;
 }
 
+.example .Sourcecode {
+      background: none;
+}
+
 .pseudocode {
     background-color: #dddddd;
     padding: 1.2em;
@@ -1001,7 +1005,7 @@ h2 p {
   }
 
 
-/*  .copyright .name, .copyright .address {color: #485094;} */
+/*  .copyright .name, .copyright .address {color: #2e81c2;} */
 
 
 

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

@@ -1,4 +1,5 @@
 <p class="ReportNumber"><span lang="EN-US">{{ docnumber_long }}
+  {% if edition %} <br/> Revision {{ edition }} {% endif %}
   {% if draftinfo %}
     <br/>{{ draftinfo }}
     {% endif %}

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

@@ -348,7 +348,7 @@ h1
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-.h1Preface
+.h1Preface, .h1Annex
         {mso-style-priority:1;
         mso-style-unhide:no;
         mso-style-qformat:yes;
@@ -448,7 +448,7 @@ h2
 	font-family:$headerfont;
 	mso-font-kerning:14.0pt;
 	mso-fareast-font-family:$headerfont;
-  color:#000000;
+        color:#000000;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	font-weight:bold;
@@ -477,12 +477,42 @@ h3
 	mso-bidi-font-size:10.0pt;
 	font-family:$headerfont;
 	mso-font-kerning:14.0pt;
-  color:#000000;
+        color:#000000;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	font-weight:bold;
 	mso-bidi-font-weight:normal;}
+.h3Annex
+        {mso-style-priority:3;
+        mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"Heading 1";
+        mso-style-link:"Heading 3 Char";
+        mso-style-next:Normal;
+        mso-margin-top-alt:auto;
+        margin-right:0in;
+        margin-bottom:12.0pt;
+        margin-left:0in;
+        text-align:left;
+        text-indent:0in;
+        mso-pagination:none;
+        page-break-after:avoid;
+        mso-outline-level:3;
+        mso-hyphenate:none;
+        tab-stops:.5in;
+        mso-layout-grid-align:none;
+        font-size:11.0pt;
+        mso-bidi-font-size:10.0pt;
+        font-family:$headerfont;
+        mso-font-kerning:14.0pt;
+        color:#000000;
+        mso-fareast-font-family:$headerfont;
+        mso-ansi-language:EN-GB;
+        mso-fareast-language:JA;
+        font-weight:bold;
+        mso-bidi-font-weight:normal;}
+
 h4
 	{mso-style-priority:4;
 	mso-style-unhide:no;
@@ -507,12 +537,42 @@ h4
 	mso-bidi-font-size:10.0pt;
 	mso-font-kerning:14.0pt;
 	font-family:$headerfont;
-  color:#000000;
+        color:#000000;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	font-weight:bold;
 	mso-bidi-font-weight:normal;}
+.h4Annex
+        {mso-style-priority:4;
+        mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"Heading 3";
+        mso-style-link:"Heading 4 Char";
+        mso-style-next:Normal;
+        mso-margin-top-alt:auto;
+        margin-right:0in;
+        margin-bottom:12.0pt;
+        margin-left:.6in;
+        text-align:left;
+        text-indent:-.6in;
+        mso-pagination:widow-orphan;
+        page-break-after:avoid;
+        mso-outline-level:4;
+        mso-hyphenate:none;
+        tab-stops:list .6in left .75in;
+        mso-layout-grid-align:auto;
+        font-size:11.0pt;
+        mso-bidi-font-size:10.0pt;
+        mso-font-kerning:14.0pt;
+        font-family:$headerfont;
+        color:#000000;
+        mso-fareast-font-family:$headerfont;
+        mso-ansi-language:EN-GB;
+        mso-fareast-language:JA;
+        font-weight:bold;
+        mso-bidi-font-weight:normal;}
+
 h5
 	{mso-style-priority:5;
 	mso-style-unhide:no;
@@ -543,6 +603,37 @@ h5
 	mso-font-kerning:14.0pt;
 	font-weight:bold;
 	mso-bidi-font-weight:normal;}
+.h5Annex
+        {mso-style-priority:5;
+        mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"Heading 4";
+        mso-style-link:"Heading 5 Char";
+        mso-style-next:Normal;
+        mso-margin-top-alt:auto;
+        margin-right:0in;
+        margin-bottom:12.0pt;
+        margin-left:.7in;
+        text-align:left;
+        text-indent:-.7in;
+        mso-pagination:widow-orphan;
+        page-break-after:avoid;
+        mso-outline-level:5;
+        mso-list:l78 level5 lfo4;
+        mso-hyphenate:none;
+        tab-stops:list .7in left .75in;
+        mso-layout-grid-align:auto;
+        font-size:11.0pt;
+        mso-bidi-font-size:10.0pt;
+        font-family:$headerfont;
+        mso-fareast-font-family:$headerfont;
+        color:#000000;
+        mso-ansi-language:EN-GB;
+        mso-fareast-language:JA;
+        mso-font-kerning:14.0pt;
+        font-weight:bold;
+        mso-bidi-font-weight:normal;}
+
 h6
 	{mso-style-priority:6;
 	mso-style-unhide:no;
@@ -569,13 +660,46 @@ h6
 	mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
 	font-size:11.0pt;
 	mso-bidi-font-size:10.0pt;
-  color:white;
+        color:#000000;
 	font-weight:bold;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+.h6Annex
+        {mso-style-priority:6;
+        mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"Heading 5";
+        mso-style-link:"Heading 6 Char";
+        mso-style-next:Normal;
+        margin-top:0in;
+        margin-right:0in;
+        margin-bottom:12.0pt;
+        margin-left:116.1pt;
+        text-align:justify;
+        text-indent:-.8in;
+        mso-pagination:none;
+        page-break-after:avoid;
+        mso-outline-level:6;
+        mso-list:l78 level6 lfo4;
+        mso-hyphenate:none;
+        background:black;
+        mso-layout-grid-align:none;
+        border:none;
+        mso-border-alt:solid windowtext .5pt;
+        padding:0in;
+        mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
+        font-size:11.0pt;
+        mso-bidi-font-size:10.0pt;
+        color:#000000;
+        font-weight:bold;
+        font-family:$headerfont;
+        mso-fareast-font-family:$headerfont;
+        mso-ansi-language:EN-GB;
+        mso-fareast-language:JA;
+        mso-bidi-font-weight:normal;}
 
 p.TOCTitle, li.TOCTitle, div.TOCTitle
 	{mso-style-name:"TOC Title";
@@ -1142,6 +1266,107 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	margin-left:162.0pt;
 	text-indent:-18.0pt;}
 
+p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:18.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel2, li.ListContLevel2, div.ListContLevel2
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:36.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel3, li.ListContLevel3, div.ListContLevel3
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:54.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel4, li.ListContLevel4, div.ListContLevel4
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:72.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel5, li.ListContLevel5, div.ListContLevel5
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:90.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel6, li.ListContLevel6, div.ListContLevel6
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:108.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel7, li.ListContLevel7, div.ListContLevel7
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:126.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel8, li.ListContLevel8, div.ListContLevel8
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:144.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel9, li.ListContLevel9, div.ListContLevel9
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:162.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+
+
 table.MsoNormalTable
 	{mso-style-name:"Table Normal";
 	mso-tstyle-rowband-size:0;

data/lib/isodoc/nist/html_convert.rb

@@ -91,6 +91,24 @@ module IsoDoc
         end
       end
 
+            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|
+          out.div do |div|
+            div.h1 **{ class: "Section3" } do |h1|
+              f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
+            end
+            f.elements.reject do |e|
+              ["reference", "title", "bibitem"].include? e.name
+            end.each { |e| parse(e, div) }
+            biblio_list(f, div, false)
+          end
+        end
+      end
+
+      # common from here on
+
       def abstract(isoxml, out)
         f = isoxml.at(ns("//preface/abstract")) || return
         page_break(out)
@@ -158,7 +176,8 @@ module IsoDoc
       end
 
       def requirement_cleanup(docxml)
-        docxml.xpath("//div[@class = 'recommend'][title]").each do |d|
+        docxml.xpath("//div[@class = 'recommend' or @class = 'require' "\
+                     "or @class = 'permission'][title]").each do |d|
           title = d.at("./title")
           title.name = "b"
           n = title.next_element
@@ -234,7 +253,7 @@ module IsoDoc
 
       def requirement_parse(node, out)
         name = node["type"]
-        out.div **{ class: "recommend" } do |t|
+        out.div **{ class: "require" } do |t|
           t.title { |b| b << "Requirement #{get_anchors[node['id']][:label]}:" }
           node.children.each do |n|
             parse(n, t)
@@ -244,7 +263,7 @@ module IsoDoc
 
       def permission_parse(node, out)
         name = node["type"]
-        out.div **{ class: "recommend" } do |t|
+        out.div **{ class: "permission" } do |t|
           t.title { |b| b << "Permission #{get_anchors[node['id']][:label]}:" }
           node.children.each do |n|
             parse(n, t)
@@ -299,22 +318,6 @@ module IsoDoc
         bibliography isoxml, out
       end
 
-      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|
-          out.div do |div|
-            div.h1 **{ class: "Section3" } do |h1|
-              f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
-            end
-            f.elements.reject do |e|
-              ["reference", "title", "bibitem"].include? e.name
-            end.each { |e| parse(e, div) }
-            biblio_list(f, div, false)
-          end
-        end
-      end
-
       def info(isoxml, out)
         @meta.keywords isoxml, out
         super
@@ -349,7 +352,6 @@ module IsoDoc
         end
       end
 
-
       def prefaceprefix(nodes)
         i = 0
         nodes.each do |n|

data/lib/isodoc/nist/i18n-en.yaml

@@ -1,3 +1,2 @@
 clause: Section
 annex: Appendix
-draft_label: Revision

data/lib/isodoc/nist/pdf_convert.rb

@@ -157,7 +157,8 @@ module IsoDoc
       end
 
       def requirement_cleanup(docxml)
-        docxml.xpath("//div[@class = 'recommend'][title]").each do |d|
+        docxml.xpath("//div[@class = 'recommend' or @class = 'require' or "\
+                     "@class = 'permission'][title]").each do |d|
           title = d.at("./title")
           title.name = "b"
           n = title.next_element
@@ -233,7 +234,7 @@ module IsoDoc
 
       def requirement_parse(node, out)
         name = node["type"]
-        out.div **{ class: "recommend" } do |t|
+        out.div **{ class: "require" } do |t|
           t.title { |b| b << "Requirement #{get_anchors[node['id']][:label]}:" }
           node.children.each do |n|
             parse(n, t)
@@ -243,7 +244,7 @@ module IsoDoc
 
       def permission_parse(node, out)
         name = node["type"]
-        out.div **{ class: "recommend" } do |t|
+        out.div **{ class: "permission" } do |t|
           t.title { |b| b << "Permission #{get_anchors[node['id']][:label]}:" }
           node.children.each do |n|
             parse(n, t)

data/lib/isodoc/nist/word_convert.rb

@@ -15,14 +15,17 @@ module IsoDoc
 
             def convert1(docxml, filename, dir)
         FileUtils.cp html_doc_path("logo.png"), "#{@localdir}/logo.png"
-        FileUtils.cp html_doc_path("deptofcommerce.png"), "#{@localdir}/deptofcommerce.png"
+        FileUtils.cp html_doc_path("deptofcommerce.png"),
+          "#{@localdir}/deptofcommerce.png"
         super
       end
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Times New Roman",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+                     '"Times New Roman",serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                       '"Arial",sans-serif'),
           monospacefont: '"Courier New",monospace'
         }
       end
@@ -69,6 +72,7 @@ module IsoDoc
         term_cleanup(docxml)
         requirement_cleanup(docxml)
         h1_cleanup(docxml)
+        word_annex_cleanup(docxml) # need it earlier
         toc_insert(docxml)
       end
 
@@ -79,14 +83,109 @@ module IsoDoc
         end
       end
 
+      def word_annex_cleanup(docxml)
+        super
+        docxml.xpath("//h1[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = "h1Annex"
+        end
+        docxml.xpath("//h3[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = "h3Annex"
+        end
+        docxml.xpath("//h4[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = "h4Annex"
+        end
+        docxml.xpath("//h5[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = "h5Annex"
+        end
+        docxml.xpath("//h6[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = "h6Annex"
+        end
+      end
+
       def toc_insert(docxml)
-        insertion = docxml.at("//div[h1 = 'Executive Summary']/preceding-sibling::div[h1][1]") ||
-          docxml.at("//div[@class = 'WordSection2']/child::*[last()]")
+        insertion = docxml.at("//div[h1 = 'Executive Summary']/"\
+                              "preceding-sibling::div[h1][1]") ||
+        docxml.at("//div[@class = 'WordSection2']/child::*[last()]")
+        if docxml.at("//p[@class = 'TableTitle']")
+          insertion.next = make_TableWordToC(docxml)
+          insertion.next = %{<p class="TOCTitle">List of Tables</p>}
+        end
+        if docxml.at("//p[@class = 'FigureTitle']")
+          insertion.next = make_FigureWordToC(docxml)
+          insertion.next = %{<p class="TOCTitle">List of Figures</p>}
+        end
+        if docxml.at("//p[@class = 'h1Annex']")
+          insertion.next = make_AppendixWordToC(docxml)
+          insertion.next = %{<p class="TOCTitle">List of Appendices</p>}
+        end
         insertion.next = make_WordToC(docxml)
-        insertion.next = %{<p class="TOCTitle" style="page-break-before: always;">Table of Contents</p>}
+        insertion.next = %{<p class="TOCTitle" style="page-break-before:
+        always;">Table of Contents</p>}
         docxml
       end
 
+      WORD_TOC_APPENDIX_PREFACE1 = <<~TOC.freeze
+      <span lang="EN-GB"><span
+        style='mso-element:field-begin'></span><span
+        style='mso-spacerun:yes'>&#xA0;</span>TOC
+        \\h \\z \\t &quot;h1Annex,1,h2Annex,2,h3Annex,3&quot; <span
+        style='mso-element:field-separator'></span></span>
+      TOC
+
+      WORD_TOC_TABLE_PREFACE1 = <<~TOC.freeze
+      <span lang="EN-GB"><span
+        style='mso-element:field-begin'></span><span
+        style='mso-spacerun:yes'>&#xA0;</span>TOC
+        \\h \\z \\t &quot;TableTitle,1&quot; <span
+        style='mso-element:field-separator'></span></span>
+      TOC
+
+      WORD_TOC_FIGURE_PREFACE1 = <<~TOC.freeze
+      <span lang="EN-GB"><span
+        style='mso-element:field-begin'></span><span
+        style='mso-spacerun:yes'>&#xA0;</span>TOC
+        \\h \\z \\t &quot;FigureTitle,1&quot; <span
+        style='mso-element:field-separator'></span></span>
+      TOC
+
+      def header_strip(h)
+        h = h.to_s.gsub(/<\/?p[^>]*>/, "")
+        super
+      end
+
+      def make_TableWordToC(docxml)
+        toc = ""
+        docxml.xpath("//p[@class = 'TableTitle']").each do |h|
+          toc += word_toc_entry(1, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) +  WORD_TOC_SUFFIX1
+      end
+
+      def make_FigureWordToC(docxml)
+        toc = ""
+        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
+          toc += word_toc_entry(1, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) +  WORD_TOC_SUFFIX1
+      end
+
+      def make_AppendixWordToC(docxml)
+        toc = ""
+        docxml.xpath("//p[@class = 'h1Annex'] | //p[@class = 'h2Annex'] | "\
+                     "p[@class = 'h3Annex']").each do |h|
+          toc += word_toc_entry(h["class"][1].to_i, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{WORD_TOC_APPENDIX_PREFACE1}}) +  WORD_TOC_SUFFIX1
+      end
+
       def make_WordToC(docxml)
         toc = ""
         docxml.xpath("//h1[not(ancestor::*[@class = 'WordSection2'])] |"\
@@ -100,7 +199,8 @@ module IsoDoc
       end
 
       def word_preface_cleanup(docxml)
-        docxml.xpath("//h1[@class = 'AbstractTitle'] | //h1[@class = 'IntroTitle']").each do |h2|
+        docxml.xpath("//h1[@class = 'AbstractTitle'] | "\
+                     "//h1[@class = 'IntroTitle']").each do |h2|
           h2.name = "p"
           h2["class"] = "h1Preface"
         end
@@ -112,6 +212,24 @@ module IsoDoc
         docxml
       end
 
+      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|
+          out.div do |div|
+            div.p **{ class: "h1Annex" } do |h1|
+              f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
+            end
+            f.elements.reject do |e|
+              ["reference", "title", "bibitem"].include? e.name
+            end.each { |e| parse(e, div) }
+            biblio_list(f, div, false)
+          end
+        end
+      end
+
       # Henceforth identical to html
 
       def abstract(isoxml, out)
@@ -131,9 +249,11 @@ module IsoDoc
         end
       end
 
-      FRONT_CLAUSE = "//*[parent::preface][not(local-name() = 'abstract')]".freeze
+      FRONT_CLAUSE = "//*[parent::preface]"\
+        "[not(local-name() = 'abstract')]".freeze
 
-      # All "[preface]" sections should have class "IntroTitle" to prevent page breaks
+      # All "[preface]" sections should have class "IntroTitle" to prevent 
+      # page breaks
       # But for the Exec Summary
       def preface(isoxml, out)
         isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
@@ -142,7 +262,8 @@ module IsoDoc
           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" : "IntroTitle")
+                        class: c.name == "executivesummary" ? "NormalTitle" :
+                        "IntroTitle")
             c.elements.reject { |c1| c1.name == "title" }.each do |c1|
               parse(c1, s)
             end
@@ -183,7 +304,8 @@ module IsoDoc
       end
 
       def requirement_cleanup(docxml)
-        docxml.xpath("//div[@class = 'recommend'][title]").each do |d|
+        docxml.xpath("//div[@class = 'recommend' or @class = 'require' or "\
+                     "@class = 'permission'][title]").each do |d|
           title = d.at("./title")
           title.name = "b"
           n = title.next_element
@@ -254,7 +376,8 @@ module IsoDoc
       def recommendation_parse(node, out)
         name = node["type"]
         out.div **{ class: "recommend" } do |t|
-          t.title { |b| b << "Recommendation #{get_anchors[node['id']][:label]}:" }
+          t.title { |b| b << "Recommendation "\
+                    "#{get_anchors[node['id']][:label]}:" }
           node.children.each do |n|
             parse(n, t)
           end
@@ -263,7 +386,7 @@ module IsoDoc
 
       def requirement_parse(node, out)
         name = node["type"]
-        out.div **{ class: "recommend" } do |t|
+        out.div **{ class: "require" } do |t|
           t.title { |b| b << "Requirement #{get_anchors[node['id']][:label]}:" }
           node.children.each do |n|
             parse(n, t)
@@ -273,7 +396,7 @@ module IsoDoc
 
       def permission_parse(node, out)
         name = node["type"]
-        out.div **{ class: "recommend" } do |t|
+        out.div **{ class: "permission" } do |t|
           t.title { |b| b << "Permission #{get_anchors[node['id']][:label]}:" }
           node.children.each do |n|
             parse(n, t)
@@ -319,7 +442,8 @@ module IsoDoc
         end
       end
 
-      MIDDLE_CLAUSE = "//clause[parent::sections]|//terms[parent::sections]".freeze
+      MIDDLE_CLAUSE = "//clause[parent::sections] | "\
+        "//terms[parent::sections]".freeze
 
       def middle(isoxml, out)
         # NIST documents don't repeat the title
@@ -329,30 +453,14 @@ module IsoDoc
         bibliography isoxml, out
       end
 
-      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|
-          out.div do |div|
-            div.h1 **{ class: "Section3" } do |h1|
-              f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
-            end
-            f.elements.reject do |e|
-              ["reference", "title", "bibitem"].include? e.name
-            end.each { |e| parse(e, div) }
-            biblio_list(f, div, false)
-          end
-        end
-      end
-
       def info(isoxml, out)
         @meta.keywords isoxml, out
         super
       end
 
       SECTIONS_XPATH =
-        "//foreword | //introduction | //reviewnote | //executivesummary | //annex | "\
-        "//sections/clause | //bibliography/references | "\
+        "//foreword | //introduction | //reviewnote | //executivesummary | "\
+        "//annex | //sections/clause | //bibliography/references | "\
         "//bibliography/clause".freeze
 
       def initial_anchor_names(d)
@@ -430,8 +538,8 @@ module IsoDoc
       def hierarchical_recommendation_names(clause, num)
         clause.xpath(ns(".//recommendation")).each_with_index do |t, i|
           next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}",
-                                            t, "Recommendation", "recommendation")
+          @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}", t, 
+                                            "Recommendation", "recommendation")
         end
       end
 
@@ -443,7 +551,8 @@ module IsoDoc
       end
 
       def get_linkend(node)
-        link = anchor_linkend(node, docid_l10n(node["target"] || "[#{node['citeas']}]"))
+        link = anchor_linkend(node, docid_l10n(node["target"] || 
+                                               "[#{node['citeas']}]"))
         link += eref_localities(node.xpath(ns("./locality")), link)
         contents = node.children.select { |c| c.name != "locality" }
         return link if contents.nil? || contents.empty?

data/lib/metanorma/nist/version.rb

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

metadata

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