metanorma-nist 0.0.5 → 0.0.6

data/lib/isodoc/nist/html/word_nist_intro.html

@@ -1,155 +0,0 @@
-<h1 class="AbstractTitle">Authority</h1>
-
-<p class=MsoNormal align=left style='margin-bottom:12.0pt;text-align:left;
-mso-pagination:widow-orphan;mso-hyphenate:auto;mso-layout-grid-align:auto;
-mso-vertical-align-alt:auto'><span lang=EN-US style='mso-bidi-font-size:11.0pt;
-mso-bidi-font-family:Arial'>This publication has been developed by NIST in
-accordance with its statutory responsibilities under the Federal Information
-Security Modernization Act (FISMA) of 2014, 44 <span class=SpellE>U.S.C</span>.
-§ 3551 <i style='mso-bidi-font-style:normal'>et seq.</i>, Public Law (<span
-class=SpellE>P.L</span>.) 113-283. NIST is responsible for developing
-information security standards and guidelines, including minimum requirements
-for federal information systems, but such standards and guidelines shall not
-apply to national security systems without the express approval of appropriate federal
-officials exercising policy authority over such systems. This guideline is
-consistent with the requirements of the Office of Management and Budget (OMB)
-Circular A-130.<o:p></o:p></span></p>
-
-<p class=MsoNormal align=left style='margin-bottom:12.0pt;text-align:left;
-mso-pagination:widow-orphan;mso-hyphenate:auto;mso-layout-grid-align:auto;
-mso-vertical-align-alt:auto'><span lang=EN-US style='mso-bidi-font-size:11.0pt;
-mso-bidi-font-family:Arial'>Nothing in this publication should be taken to
-contradict the standards and guidelines made mandatory and binding on federal
-agencies by the Secretary of Commerce under statutory authority. Nor should
-these guidelines be interpreted as altering or superseding the existing
-authorities of the Secretary of Commerce, Director of the OMB, or any other federal
-official.<span style='mso-spacerun:yes'>  </span>This publication may be used
-by nongovernmental organizations on a voluntary basis and is not subject to
-copyright in the United States. Attribution would, however, be appreciated by
-NIST.</span><span lang=EN-US style='mso-bidi-font-size:11.0pt;font-family:"Arial",sans-serif'><o:p></o:p></span></p>
-
-<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center;
-line-height:90%'><span lang=EN-US style='font-size:11.0pt;line-height:
-90%;font-family:"Arial",sans-serif'>National Institute of Standards and
-Technology {{ docnumber }}<br></span>
-<span lang=EN-US style='font-size:10.0pt;line-height:90%;font-family:
-"Arial",sans-serif;mso-bidi-font-weight:bold'>Natl. Inst. Stand. Technol.
-{{ docnumber }}, <!--[if supportFields]><span
-lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
-style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span
-style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
-style='mso-no-proof:yes'>26</span><!--[if supportFields]><span
-lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
-style='mso-element:field-end'></span></span><![endif]--> pages ({{ revdate_monthyear }})<br>
-<span class=SpellE><span style='color:black'>CODEN</span></span><span
-style='color:black'>: NSPUE2<o:p></o:p></span></span></p>
-
-{% if url %}
-<p class=MsoHeader align=center style='text-align:center;line-height:90%;
-tab-stops:36.0pt'><span lang=EN-US style='font-size:10.0pt;line-height:90%;
-font-family:"Arial",sans-serif;color:black;mso-themecolor:text1'>This
-publication is available free of charge from:<br>
-</span><span lang=EN-US style='font-size:10.0pt;line-height:90%;font-family:
-"Arial",sans-serif'>{{ url }}</span><b><span lang=EN-US
-style='mso-bidi-font-size:11.0pt;line-height:90%;font-family:"Arial",sans-serif;
-color:black;mso-themecolor:text1'><o:p></o:p></span></b></p>
-{% endif %}
-<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center;
-line-height:90%'><span lang=EN-US style='font-size:10.0pt;line-height:90%;
-font-family:"Arial",sans-serif;color:black'><o:p>&nbsp;</o:p></span></p>
-
-<div style='mso-element:para-border-div;border:solid black 1.0pt;padding:8.0pt 8.0pt 8.0pt 8.0pt;
-background:#D9D9D9'>
-
-<p class=MsoNormal align=left style='margin-top:6.0pt;margin-right:0cm;
-margin-bottom:6.0pt;margin-left:0cm;text-align:left;mso-pagination:widow-orphan;
-mso-hyphenate:auto;background:#D9D9D9;mso-layout-grid-align:auto;mso-vertical-align-alt:
-auto;border:none;mso-border-alt:solid black 1.0pt;padding:0cm;mso-padding-alt:
-8.0pt 8.0pt 8.0pt 8.0pt'><span lang=EN-US style='font-size:10.0pt;mso-bidi-font-size:
-12.0pt;mso-bidi-font-family:Arial'>Certain commercial entities, equipment, or
-materials may be identified in this document in order to describe an
-experimental procedure or concept adequately. Such identification is not
-intended to imply recommendation or endorsement by NIST, nor is it intended to
-imply that the entities, materials, or equipment are necessarily the best
-available for the purpose. <o:p></o:p></span></p>
-
-<p class=MsoNormal align=left style='margin-top:6.0pt;margin-right:0cm;
-margin-bottom:6.0pt;margin-left:0cm;text-align:left;mso-pagination:widow-orphan;
-mso-hyphenate:auto;background:#D9D9D9;mso-layout-grid-align:auto;mso-vertical-align-alt:
-auto;border:none;mso-border-alt:solid black 1.0pt;padding:0cm;mso-padding-alt:
-8.0pt 8.0pt 8.0pt 8.0pt'><span lang=EN-US style='font-size:10.0pt;mso-bidi-font-size:
-12.0pt;mso-bidi-font-family:Arial'>There may be references in this publication
-to other publications currently under development by NIST in accordance with
-its assigned statutory responsibilities. The information in this publication,
-including concepts and methodologies, may be used by federal agencies even
-before the completion of such companion publications. Thus, until each
-publication is completed, current requirements, guideline<span
-style='color:black'>s, a</span>nd procedures, where they exist, remain
-operative. For planning and transition purposes, federal agencies may wish to
-closely follow the development of these new publications by NIST.<span
-style='mso-spacerun:yes'>  </span><o:p></o:p></span></p>
-
-<p class=MsoNormal align=left style='margin-bottom:12.0pt;text-align:left;
-line-height:90%;background:#D9D9D9;border:none;mso-border-alt:solid black 1.0pt;
-padding:0cm;mso-padding-alt:8.0pt 8.0pt 8.0pt 8.0pt'><span lang=EN-US
-style='font-size:10.0pt;mso-bidi-font-size:12.0pt;line-height:90%'>Organizations
-are encouraged to review all draft publications during public comment periods
-and provide feedback to NIST. Many NIST cybersecurity publications<span
-style='color:black'>, ot</span>her than the ones noted above, are available at <u><span
-style='color:blue'><a href="https://csrc.nist.gov/publications"
-title="NIST Computer Security Division publications">https://csrc.nist.gov/publications</a></span></u>.</span><b><span
-lang=EN-US style='font-size:12.0pt;mso-bidi-font-size:11.0pt;line-height:90%;
-font-family:"Arial",sans-serif;color:black'><o:p></o:p></span></b></p>
-
-</div>
-
-{% if comment_extended %}
-<p class=MsoNormal align="center">[{{ comment_extended}}: Comment period extended]</p>
-{% endif %}
-
-{% if comment_from and comment_to %}
-<p class=MsoNormal align="center"><b>Public comment period: <i>{{ comment_from }}</i> through <i>{{comment_to}}</i></b></p>
-{% else %}
-{% if comment_from %}
-<p class=MsoNormal align="center"><b>Public comment period: from <i>{{ comment_from }}</i></b></p>
-{% endif %}
-{% endif %}
-
-
-<p class=MsoNormal align=center style='margin-bottom:6.0pt;text-align:center'><b><span
-lang=EN-US style='font-size:11.0pt;font-family:"Arial",sans-serif'>Comments
-on this publication may be submitted to:</span></b><b style='mso-bidi-font-weight:
-normal'><span lang=EN-US style='mso-bidi-font-size:11.0pt;font-family:"Arial",sans-serif'><o:p></o:p></span></b></p>
-
-<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span
-lang=EN-US style='font-size:10.0pt;font-family:"Arial",sans-serif'>National
-Institute of Standards and Technology<br>
-Attn: Computer Security Division, Information Technology Laboratory<br>
-100 Bureau Drive (Mail Stop 8930) Gaithersburg, MD 20899-8930<br>
-Email: <span class=MsoHyperlink><a href="mailto:{{ email }}">{{ email }}</a></span><o:p></o:p></span></p>
-
-<p class=MsoNormal align=center style='margin-bottom:12.0pt;text-align:center'><span
-lang=EN-US style='font-size:11.0pt;font-family:"Arial",sans-serif'>All
-comments are subject to release under the Freedom of Information Act (FOIA).<o:p></o:p></span></p>
-
-<p><span lang=EN-US style='font-size:11.0pt;mso-bidi-font-size:11.0pt;font-family:
-"Times New Roman",serif;mso-fareast-font-family:"Times New Roman";mso-ansi-language:
-EN-US;mso-fareast-language:EN-US;mso-bidi-language:AR-SA'><br clear=all style='page-break-before:always;'></span></p>
-
-<h1 class="IntroTitle">Reports on Computer Systems Technology</h1>
-
-<p class=MsoNormal align=left style='margin-bottom:12.0pt;text-align:left'><span
-lang=EN-US style='font-size:12.0pt'>The Information Technology Laboratory (<span
-class=SpellE>ITL</span>) at the National Institute of Standards and Technology
-(NIST) promotes the U.S. economy and public welfare by providing technical
-leadership for the Nation’s measurement and standards infrastructure. <span
-class=SpellE>ITL</span> develops tests, test methods, reference data, proof of
-concept implementations, and technical analyses to advance the development and
-productive use of information technology. <span class=SpellE>ITL’s</span>
-responsibilities include the development of management, administrative,
-technical, and physical standards and guidelines for the cost-effective
-security and privacy of other than national security-related information in federal
-information systems. The Special Publication 800-series reports on <span
-class=SpellE>ITL’s</span> research, guidelines, and outreach efforts in
-information system security, and its collaborative activities with industry,
-government, and academic organizations.<o:p></o:p></span></p>

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

@@ -1,4 +1,4 @@
-<p class="ReportNumber"><span lang="EN-US">{{ docnumber_long }}
+<p class="ReportNumber"><span lang="EN-US">{{ draft_prefix }} {{ docidentifier_long }}
   {% if edition %} <br/> Revision {{ edition }} {% endif %}
   {% if draftinfo %}
     <br/>{{ draftinfo }}
@@ -39,15 +39,14 @@ mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom
 lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
 
 
-{% if url %}
+{% if doi %}
 <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
 mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
 lang="EN-US" style='font-size:14.0pt;color:black'>This publication is available
 free of charge from:<o:p></o:p></span></p>
 <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
 mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
-     lang="EN-US" style='font-size:14.0pt;color:black'>{{ url }}<o:p></o:p></span></p>
-
+     lang="EN-US" style='font-size:14.0pt;color:black'>{{ doi }}<o:p></o:p></span></p>
 {% endif %}
 
 <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
@@ -68,7 +67,8 @@ padding:1.0pt 0cm 1.0pt 0cm'>
 <p class="MsoNormal" align="center" style='text-align:center;border:none;
 mso-border-top-alt:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;
 padding:0cm;mso-padding-alt:1.0pt 0cm 1.0pt 0cm'><span lang="EN-US"
-     style='font-size:16.0pt;font-family:"Arial",sans-serif;mso-ansi-language:EN-US;letter-spacing:10.0pt'>{{ subseries }}<o:p></o:p></span></p>
+     style='font-size:16.0pt;font-family:"Arial",sans-serif;mso-ansi-language:EN-US;letter-spacing:10.0pt'>{{ docclasstitle }}<o:p></o:p></span></p>
+
 
 </div>
 
@@ -126,7 +126,7 @@ EN-US;mso-bidi-language:AR-SA'><br clear="all" style='page-break-before:always;'
 mso-pagination:widow-orphan;mso-hyphenate:auto;mso-layout-grid-align:auto;
 mso-vertical-align-alt:auto'><b style='mso-bidi-font-weight:normal'><span
 lang="EN-US" style='font-size:20.0pt;mso-bidi-font-size:12.0pt;line-height:90%'>
-{{ docnumber_long }}
+    {{ draft_prefix }} {{ docidentifier_long }}
   {% if draftinfo %}
     <br/>{{ draftinfo }}
     {% endif %}

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

@@ -396,7 +396,7 @@ h1.NormalTitle {
 
 h1.Annex {
 }
-.h2Annex
+.h2Annex, .h2Preface
         {mso-style-priority:2;
         mso-style-unhide:no;
         mso-style-qformat:yes;

data/lib/isodoc/nist/html_convert.rb

@@ -42,23 +42,11 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
 
-      def html_head
+      def googlefonts
         <<~HEAD.freeze
-        <title>{{ doctitle }}</title>
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-
-    <!--TOC script import-->
-    <script type="text/javascript" src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
-
-    <!--Google fonts-->
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,600,600i" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet" />
     <link href="https://fonts.googleapis.com/css?family=Libre+Baskerville:400,400i,700,700i" rel="stylesheet">
-
-    <!--Font awesome import for the link icon-->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
-    <style class="anchorjs"></style>
         HEAD
       end
 
@@ -75,12 +63,24 @@ module IsoDoc
         docxml
       end
 
+      def authority_cleanup(docxml)
+        dest = docxml.at("//div[@id = 'authority']") || return
+        auth = docxml.at("//div[@class = 'authority']") || return
+        dest.replace(auth.remove)
+      end
+
       def cleanup(docxml)
         super
         term_cleanup(docxml)
         requirement_cleanup(docxml)
       end
 
+      def html_preface(docxml)
+        super
+        authority_cleanup(docxml)
+        docxml
+      end
+
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
           abstract docxml, div3
@@ -137,6 +137,7 @@ module IsoDoc
       def preface(isoxml, out)
         isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
           foreword(isoxml, out) and next if c.name == "foreword"
+          authority_parse(c, out) and next if c.name == "authority"
           next if skip_render(c, isoxml)
           out.div **attr_code(id: c["id"]) do |s|
             clause_name(get_anchors[c['id']][:label],
@@ -226,11 +227,45 @@ module IsoDoc
         when "requirement" then requirement_parse(node, out)
         when "permission" then permission_parse(node, out)
         when "errata" then errata_parse(node, out)
+        when "authority" then authority_parse(node, out)
+        when "authority1" then authority1_parse(node, out, "authority1")
+        when "authority2" then authority1_parse(node, out, "authority2")
+        when "authority3" then authority1_parse(node, out, "authority3")
+        when "authority4" then authority1_parse(node, out, "authority4")
+        when "authority5" then authority1_parse(node, out, "authority5")
         else
           super
         end
       end
 
+      def authority_parse(node, out)
+        out.div **{class: "authority"} do |s|
+          node.children.each do |n|
+            if n.name == "title"
+              s.h1 do |h|
+                n.children.each { |nn| parse(nn, h) }
+              end
+            else
+              parse(n, s)
+            end
+          end
+        end
+      end
+
+      def authority1_parse(node, out, classname)
+        out.div **{class: classname} do |s|
+          node.children.each do |n|
+            if n.name == "title"
+              s.h2 do |h|
+                n.children.each { |nn| parse(nn, h) }
+              end
+            else
+              parse(n, s)
+            end
+          end
+        end
+      end
+
       def nistvariable_parse(node, out)
         out.span **{class: "nistvariable"} do |s|
           node.children.each { |n| parse(n, s) }
@@ -318,6 +353,7 @@ module IsoDoc
         @meta.keywords isoxml, out
         @meta.series isoxml, out
         @meta.commentperiod isoxml, out
+        @meta.commentperiod isoxml, out
         super
       end
 

data/lib/isodoc/nist/metadata.rb

@@ -11,13 +11,15 @@ module IsoDoc
       end
 
       def title(isoxml, out)
-        main = isoxml&.at(ns("//bibdata/title/title-main"))&.text
+        main = isoxml&.at(ns("//bibdata/title[@type = 'main']"))&.text
         set(:doctitle, main)
       end
 
       def subtitle(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title/title-sub"))&.text or return
-        set(:docsubtitle, main)
+        main = isoxml&.at(ns("//bibdata/title[@type = 'subtitle']"))&.text
+        set(:docsubtitle, main) if main
+        main = isoxml&.at(ns("//bibdata/title[@type = 'document-class']"))&.text
+        set(:docclasstitle, main) if main
       end
 
       def author(isoxml, _out)
@@ -32,20 +34,21 @@ module IsoDoc
                                   "[@type = 'nist-long']"))&.text
         docnumber = isoxml.at(ns("//bibdata/docnumber"))&.text
         set(:docidentifier, docid)
-        set(:docidentifier_long, draft_prefix(docid_long, isoxml))
+        set(:docidentifier_long, docid_long)
+        d = draft_prefix(isoxml) and set(:draft_prefix, d)
         set(:docnumber, docnumber)
       end
 
-      def draft_prefix(docidentifier_long, isoxml)
-        return nil if docidentifier_long.nil?
+      def draft_prefix(isoxml)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))&.text
-        return docidentifier_long unless docstatus && docstatus != "final"
+        return nil unless docstatus && 
+          !%w(final withdrawn).include?(docstatus)
         iter = isoxml.at(ns("//bibdata/status/iteration"))&.text
         prefix = "DRAFT "
         /^\d+$/.match iter and
           iter = iter.to_i.localize.to_rbnf_s("OrdinalRules", "digits-ordinal")
         prefix += "(#{iter}) " if iter
-        prefix + docidentifier_long
+        prefix
       end
 
       def draftinfo(draft, revdate)
@@ -67,7 +70,7 @@ module IsoDoc
       end
 
       def adjust_docstatus(status, iter)
-        return unless iter and status
+        return status unless iter and status
         status = "initial-public-draft" if status == "public-draft" &&
           (iter == "1" ||  iter == "initial")
         status = "final-public-draft" if status == "public-draft" &&
@@ -76,6 +79,7 @@ module IsoDoc
       end
 
       def version(isoxml, _out)
+        #require "byebug"; byebug
         super
         revdate = get[:revdate]
         set(:revdate_monthyear, monthyr(revdate))
@@ -134,6 +138,25 @@ module IsoDoc
         a = xml.at(ns("//bibdata/uri[@type = 'uri' or not(@type)]")) and
           set(:url, a.text)
       end
+
+      def relations1(isoxml, type)
+        ret = []
+        isoxml.xpath(ns("//bibdata/relation[@type = '#{type}']")).each do |x|
+          ret << x.at(ns(".//docidentifier")).text if x.at(ns(".//docidentifier"))
+        end
+        ret
+      end
+
+      def relations(isoxml, _out)
+        ret = relations1(isoxml, "obsoletes")
+        set(:obsoletes, ret) unless ret.empty?
+        ret = relations1(isoxml, "obsoletedBy")
+        set(:obsoletedby, ret) unless ret.empty?
+        ret = relations1(isoxml, "supersedes")
+        set(:supersedes, ret) unless ret.empty?
+        ret = relations1(isoxml, "supersededBy")
+        set(:supersededby, ret) unless ret.empty?
+      end
     end
   end
 end

data/lib/isodoc/nist/pdf_convert.rb

@@ -49,6 +49,11 @@ module IsoDoc
 
     <!--TOC script import-->
     <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
+    <script type="text/javascript">
+    function toclevel() { var i; var text = "";
+      for(i = 1; i <= #{@htmlToClevels}; i++) {
+        if (i > 1) { text += ","; } text += "h" + i + ":not(.TermNum)"; } }
+    </script>
 
     <!--Google fonts-->
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,600,600i" rel="stylesheet">
@@ -109,6 +114,7 @@ module IsoDoc
       def preface(isoxml, out)
         isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
           foreword(isoxml, out) and next if c.name == "foreword"
+          authority_parse(isoxml, out) and next if c.name == "authority"
           next if skip_render(c, isoxml)
           out.div **attr_code(id: c["id"]) do |s|
             clause_name(get_anchors[c['id']][:label],
@@ -143,12 +149,24 @@ module IsoDoc
         File.join(File.dirname(__FILE__), loc)
       end
 
+      def authority_cleanup(docxml)
+        dest = docxml.at("//div[@id = 'authority']") || return
+        auth = docxml.at("//div[@class = 'authority']") || return
+        dest.replace(auth.remove)
+      end
+
       def cleanup(docxml)
         super
         term_cleanup(docxml)
         requirement_cleanup(docxml)
       end
 
+      def html_preface(docxml)
+        super
+        authority_cleanup(docxml)
+        docxml
+      end
+
       def term_cleanup(docxml)
         docxml.xpath("//p[@class = 'Terms']").each do |d|
           h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
@@ -213,11 +231,44 @@ module IsoDoc
         when "requirement" then requirement_parse(node, out)
         when "permission" then permission_parse(node, out)
         when "errata" then errata_parse(node, out)
+        when "authority" then authority_parse(node, out)
+        when "authority1" then authority1_parse(node, out, "authority1")
+        when "authority2" then authority1_parse(node, out, "authority2")
+        when "authority3" then authority1_parse(node, out, "authority3")
+        when "authority4" then authority1_parse(node, out, "authority4")
+        when "authority5" then authority1_parse(node, out, "authority5")
         else
           super
         end
       end
 
+      def authority_parse(node, out)
+        out.div **{class: "authority"} do |s|
+          node.children.each do |n|
+            if n.name == "title"
+              s.h1 do |h|
+                n.children.each { |nn| parse(nn, h) }
+              end
+            else
+              parse(n, s)
+            end
+          end
+        end
+      end
+      def authority1_parse(node, out, classname)
+        out.div **{class: classname} do |s|
+          node.children.each do |n|
+            if n.name == "title"
+              s.h2 do |h|
+                n.children.each { |nn| parse(nn, h) }
+              end
+            else
+              parse(n, s)
+            end
+          end
+        end
+      end
+
       def nistvariable_parse(node, out)
         out.span **{class: "nistvariable"} do |s|
           node.children.each { |n| parse(n, s) }

data/lib/isodoc/nist/word_convert.rb

@@ -1,6 +1,7 @@
 require "isodoc"
 require_relative "metadata"
 require "fileutils"
+require "sassc"
 
 module IsoDoc
   module NIST
@@ -68,13 +69,19 @@ module IsoDoc
         section_break(body)
       end
 
+      def authority_cleanup(docxml)
+        insert = docxml.at("//div[@class = 'WordSection2']")
+        auth = docxml&.at("//div[@class = 'authority']")&.remove || return
+        insert.children.first.add_previous_sibling(auth)
+      end
+
       def cleanup(docxml)
         super
         term_cleanup(docxml)
         requirement_cleanup(docxml)
         h1_cleanup(docxml)
         word_annex_cleanup(docxml) # need it earlier
-        toc_insert(docxml)
+        toc_insert(docxml, @wordToClevels)
       end
 
       # create fallback h1 class to deal with page breaks
@@ -84,31 +91,22 @@ 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|
+      def word_annex_cleanup1(docxml, i)
+        docxml.xpath("//h#{i}[ancestor::*[@class = 'Section3']]").each do |h2|
           h2.name = "p"
-          h2["class"] = "h6Annex"
+          h2["class"] = "h#{i}Annex"
         end
       end
 
-      def toc_insert(docxml)
+      def word_annex_cleanup(docxml)
+        word_annex_cleanup1(docxml, 2)
+        word_annex_cleanup1(docxml, 3)
+        word_annex_cleanup1(docxml, 4)
+        word_annex_cleanup1(docxml, 5)
+        word_annex_cleanup1(docxml, 6)
+      end
+
+      def toc_insert(docxml, level)
         insertion = docxml.at("//div[h1 = 'Executive Summary']/"\
                               "preceding-sibling::div[h1][1]") ||
         docxml.at("//div[@class = 'WordSection2']/child::*[last()]")
@@ -124,7 +122,7 @@ module IsoDoc
           insertion.next = make_AppendixWordToC(docxml)
           insertion.next = %{<p class="TOCTitle">List of Appendices</p>}
         end
-        insertion.next = make_WordToC(docxml)
+        insertion.next = make_WordToC(docxml, level)
         insertion.next = %{<p class="TOCTitle" style="page-break-before:
         always;">Table of Contents</p>}
         docxml
@@ -187,18 +185,6 @@ module IsoDoc
                 %{\\1#{WORD_TOC_APPENDIX_PREFACE1}}) +  WORD_TOC_SUFFIX1
       end
 
-      def make_WordToC(docxml)
-        toc = ""
-        docxml.xpath("//h1[not(ancestor::*[@class = 'WordSection2'])] |"\
-                     "//h1[contains(., 'Executive Summary')] |"\
-                     "//h2[not(ancestor::*[@class = 'WordSection2'])] |"\
-                     "//h3[not(ancestor::*[@class = 'WordSection2'])]").each do |h|
-          toc += word_toc_entry(h.name[1].to_i, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_PREFACE1}}) +  WORD_TOC_SUFFIX1
-      end
-
       def word_preface_cleanup(docxml)
         docxml.xpath("//h1[@class = 'AbstractTitle'] | "\
                      "//h1[@class = 'IntroTitle']").each do |h2|
@@ -210,6 +196,7 @@ module IsoDoc
       def word_cleanup(docxml)
         super
         word_preface_cleanup(docxml)
+        authority_cleanup(docxml)
         docxml
       end
 
@@ -265,6 +252,7 @@ module IsoDoc
       def preface(isoxml, out)
         isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
           foreword(isoxml, out) and next if c.name == "foreword"
+          authority_parse(c, out) and next if c.name == "authority"
           next if skip_render(c, isoxml)
           title = c&.at(ns("./title"))
           patent = ["Call for Patent Claims", "Patent Disclosure Notice"].include? title&.text
@@ -371,11 +359,44 @@ module IsoDoc
         when "requirement" then requirement_parse(node, out)
         when "permission" then permission_parse(node, out)
         when "errata" then errata_parse(node, out)
+        when "authority" then authority_parse(node, out)
+        when "authority1" then authority1_parse(node, out, "authority1")
+        when "authority2" then authority1_parse(node, out, "authority2")
+        when "authority3" then authority1_parse(node, out, "authority3")
+        when "authority4" then authority1_parse(node, out, "authority4")
+        when "authority5" then authority1_parse(node, out, "authority5")
         else
           super
         end
       end
 
+      def authority_parse(node, out)
+        out.div **{class: "authority"} do |s|
+          node.children.each do |n|
+            if n.name == "title"
+              s.p **{class: "h1Preface"} do |h|
+                n.children.each { |nn| parse(nn, h) }
+              end
+            else
+              parse(n, s)
+            end
+          end
+        end
+      end
+      def authority1_parse(node, out, classname)
+        out.div **{class: classname} do |s|
+          node.children.each do |n|
+            if n.name == "title"
+              s.p **{class: "h2Preface"} do |h|
+                n.children.each { |nn| parse(nn, h) }
+              end
+            else
+              parse(n, s)
+            end
+          end
+        end
+      end
+
       def nistvariable_parse(node, out)
         out.span **{class: "nistvariable"} do |s|
           node.children.each { |n| parse(n, s) }

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end