metanorma-nist 1.0.8 → 1.1.2

data/lib/asciidoctor/nist/reqt.rng

@@ -30,9 +30,22 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="subsequence"/>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>
@@ -141,6 +154,16 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/isodoc/nist/base_convert.rb

@@ -1,19 +1,19 @@
 require "isodoc"
 require_relative "metadata"
-require_relative "xrefs"
+require_relative "xref"
 require_relative "refs"
+require_relative "section"
 require "fileutils"
 
 module IsoDoc
   module NIST
     module BaseConvert
-      def abstract(isoxml, out)
-        f = isoxml.at(ns("//preface/abstract")) || return
-        #page_break(out)
-        out.div **attr_code(id: f["id"]) do |s|
-          clause_name(nil, @abstract_lbl, s, class: "AbstractTitle")
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
-        end
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
+
+      def xref_init(lang, script, klass, labels, options)
+        @xrefs = Xref.new(lang, script, klass, labels, options)
       end
 
       def keywords(_docxml, out)
@@ -25,27 +25,8 @@ module IsoDoc
         end
       end
 
-      FRONT_CLAUSE = "//*[parent::preface][not(local-name() = 'abstract' or local-name() = 'foreword')]".freeze
-
-      # 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|
-          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|
-            page_break(s) if patent
-            clause_name(anchor(c['id'], :label), title, s,
-                        class: (c.name == "executivesummary") ? "NormalTitle" :
-                        "IntroTitle")
-            c.elements.reject { |c1| c1.name == "title" }.each do |c1|
-              parse(c1, s)
-            end
-          end
-        end
-      end
+      FRONT_CLAUSE = "//*[parent::preface][not(local-name() = 'abstract' or "\
+        "local-name() = 'foreword')]".freeze
 
       def skip_render(c, isoxml)
         return false unless c.name == "reviewernote"
@@ -121,7 +102,7 @@ module IsoDoc
 
       def errata_parse(node, out)
         out.a **{ name: "errata_XYZZY" }
-        out.table **make_table_attr(node) do |t|
+        out.table **table_attrs(node) do |t|
           errata_head(t)
           errata_body(t, node)
         end
@@ -153,17 +134,18 @@ module IsoDoc
         end
       end
 
-      MIDDLE_CLAUSE = "//clause[parent::sections] | "\
-        "//terms[parent::sections]".freeze
+      def middle_clause
+        "//clause[parent::sections] | //terms[parent::sections]"
+      end
 
       def middle(isoxml, out)
+        middle_admonitions(isoxml, out)
         clause isoxml, out
         bibliography isoxml, out
         annex isoxml, out
       end
 
       def info(isoxml, out)
-        @meta.keywords isoxml, out
         @meta.series isoxml, out
         @meta.commentperiod isoxml, out
         @meta.note isoxml, out
@@ -176,13 +158,15 @@ module IsoDoc
       end
 
       def get_linkend(node)
-        link = anchor_linkend(node, docid_l10n(node["target"] || wrap_brackets(node['citeas'])))
-        link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link)
-        contents = node.children.select { |c| !%w{locality localityStack}.include? c.name }
+        link = anchor_linkend(node, docid_l10n(node["target"] || 
+                                               wrap_brackets(node['citeas'])))
+        link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
+                                link)
+        contents = node.children.select do |c|
+          !%w{locality localityStack}.include? c.name 
+        end
         return link if contents.nil? || contents.empty?
         Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
-        # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
-        # <locality type="section"><reference>3.1</reference></locality></origin>
       end
 
       def load_yaml(lang, script)
@@ -205,36 +189,56 @@ module IsoDoc
         end
       end
 
-      def bibliography_parse(node, out)
-        title = node&.at(ns("./title"))&.text || ""
-        out.div do |div|
-          unless suppress_biblio_title(node)
-            anchor(node['id'], :label, false) and
-          clause_parse_title(node, div, node.at(ns("./title")), out) or
-            div.h2 title, **{ class: "Section3" }
-          end
-          biblio_list(node, div, true)
+      def termref_parse(node, out)
+      end
+
+      def term_cleanup(docxml)
+        docxml.xpath("//table[@class = 'terms_dl']").each do |d|
+          prev = d.previous_element
+          next unless prev && prev.name == "table" &&
+            prev["class"] == "terms_dl"
+          d.children.each { |n| prev.add_child(n.remove) }
+          d.remove
         end
+        docxml
       end
 
-      def suppress_biblio_title(node)
-        return false unless node.parent.name == "annex"
-        return false if node.parent.xpath("./references | ./clause | "\
-                                          "./terms | ./definitions").size > 1
-        title1 = node&.at(ns("./title"))&.text
-        return true unless title1
-        title2 = node&.parent&.at(ns("./title"))&.text
-        title1&.casecmp(title2) == 0
+      def term_and_termref_parse(node, dt)
+        pref = node.at(ns("./preferred"))
+        source = node.xpath(ns("./termsource"))
+        pref.children.each { |n| parse(n, dt) }
+        return if source.empty?
+        dt << "<br/>"
+        source.each_with_index do |s, i|
+          i > 0 and dt << "; "
+          s.elements.each { |n| parse(n, dt) }
+        end
       end
 
-      def foreword(isoxml, out)
-        f = isoxml.at(ns("//foreword")) || return
-        out.div **attr_code(id: f["id"]) do |s|
-          title = f.at(ns("./title"))
-          s.h1(**{ class: "ForewordTitle" }) do |h1|
-            title and title.children.each { |e| parse(e, h1) }
+      def term_rest_parse(node, dd)
+        set_termdomain("")
+        node.children.each do |n|
+          parse(n, dd) unless %w(preferred termsource).include?(n.name)
+        end
+      end
+
+      def modification_parse(node, out)
+        out << @modified_lbl
+        node.at(ns("./p[text()[normalize-space() != '']]")) and
+          out << " &mdash; "
+        node.at(ns("./p")).children.each { |n| parse(n, out) }
+      end
+
+      def annex_name(annex, name, div)
+        div.h1 **{ class: "Annex" } do |t|
+          t << "#{@xrefs.anchor(annex['id'], :label)} &mdash; "
+          t.b do |b|
+            if @bibliographycount == 1 && annex.at(ns("./references"))
+              b << "References"
+            else
+              name&.children&.each { |c2| parse(c2, b) }
+            end
           end
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
     end

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

@@ -66,7 +66,7 @@ img#NIST-logo {
   height: auto;
 }
 
-.authors-container {
+.authors-container, .currency {
   margin-top: 2em;
 }
 

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

@@ -163,7 +163,7 @@
 
 
       {% unless unpublished %}         
-      <div class="coverpage-logo">
+      <div class="currency">
         <span>{{ issueddate_monthyear }}</span>
         {%if confirmeddate and confirmeddate != "XXX" %}
         <br/>Publication is current as of {{ confirmeddate_MMMddyyyy }}

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

@@ -693,7 +693,7 @@ div.Admonition {
         mso-ansi-language:EN-AU;
 }
 
-div Admonotion p {
+div.Admonition p {
   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:#dddddd;mso-layout-grid-align:auto;mso-vertical-align-alt:
@@ -1008,4 +1008,3 @@ table.dl
 div.recommend {
   margin-left: 2cm;
 }
-

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

@@ -643,7 +643,7 @@ div.Admonition {
         mso-ansi-language:EN-AU;
 }
 
-div Admonotion p {
+div.Admonition p {
   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:#dddddd;mso-layout-grid-align:auto;mso-vertical-align-alt:
@@ -953,4 +953,3 @@ table.dl
 div.recommend {
   margin-left: 2cm;
 }
-

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

@@ -1346,4 +1346,3 @@ ol
 ul
 	{margin-bottom:0cm;
 	margin-left:18pt;}
-

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

@@ -1024,4 +1024,3 @@ ol
 ul
 	{margin-bottom:0cm;
 	margin-left:18pt;}
-

data/lib/isodoc/nist/html_convert.rb

@@ -20,9 +20,11 @@ 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'
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+                     '"Libre Baskerville",serif'),
+                     headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                                  '"Libre Baskerville",serif'),
+                                  monospacefont: '"Space Mono",monospace'
         }
       end
 
@@ -35,10 +37,6 @@ module IsoDoc
         }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
       def googlefonts
         <<~HEAD.freeze
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,600,600i" rel="stylesheet">
@@ -48,28 +46,34 @@ module IsoDoc
       end
 
       def toclevel
-        ret = toclevel_classes.map { |l| "#{l}:not(:empty):not(.TermNum):not(.noTOC):not(.AbstractTitle):not(.IntroTitle):not(.ForewordTitle)" }
-      <<~HEAD.freeze
+        ret = toclevel_classes.map do |l|
+          "#{l}:not(:empty):not(.TermNum):not(.noTOC):not(.AbstractTitle):"\
+            "not(.IntroTitle):not(.ForewordTitle)" 
+        end
+        <<~HEAD.freeze
     function toclevel() { return "#{ret.join(',')}";}
-      HEAD
-    end
+        HEAD
+      end
 
       def html_toc(docxml)
-      idx = docxml.at("//div[@id = 'toc']") or return docxml
-      toc = "<ul>"
-      path = toclevel_classes.map do |l|
-        "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')][not(text())][not(@class = 'AbstractTitle')][not(@class = 'IntroTitle')][not(@class = 'ForewordTitle')]"
-      end
-      docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
-        h["id"] ||= "toc#{tocidx}"
-        toc += html_toc_entry(h.name, h)
+        idx = docxml.at("//div[@id = 'toc']") or return docxml
+        toc = "<ul>"
+        path = toclevel_classes.map do |l|
+          "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')]"\
+            "[text()][not(@class = 'AbstractTitle')]"\
+            "[not(@class = 'IntroTitle')][not(@class = 'ForewordTitle')]"
+        end
+        docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
+          h["id"] ||= "toc#{tocidx}"
+          toc += html_toc_entry(h.name, h)
+        end
+        idx.children = "#{toc}</ul>"
+        docxml
       end
-      idx.children = "#{toc}</ul>"
-      docxml
-    end
 
       def make_body(xml, docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
+        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72",
+                      "xml:lang": "EN-US", class: "container" }
         xml.body **body_attr do |body|
           make_body1(body, docxml)
           make_body2(body, docxml)
@@ -77,10 +81,6 @@ module IsoDoc
         end
       end
 
-      def html_toc(docxml)
-        docxml
-      end
-
       def authority_cleanup(docxml)
         dest = docxml.at("//div[@id = 'authority']") || return
         auth = docxml.at("//div[@class = 'authority']") || return
@@ -102,6 +102,7 @@ module IsoDoc
         super
         term_cleanup(docxml)
         requirement_cleanup(docxml)
+        docxml
       end
 
       def make_body3(body, docxml)
@@ -117,56 +118,17 @@ 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|
-              if @bibliographycount == 1 then h1 << "References"
-              else
-                f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
-              end
-            end
-            biblio_list(f, div, false)
-          end
-        end
-      end
-
-      def keywords(_docxml, out)
-        kw = @meta.get[:keywords]
-        kw.empty? and return
-        out.div **{ class: "Section3" } do |div|
-          out.div do |div|
-            clause_name(nil, "Keywords", div,  class: "IntroTitle")
-            div.p kw.sort.join("; ")
-          end
-        end
-      end
-
       def termdef_parse(node, out)
-        pref = node.at(ns("./preferred"))
         out.dl **{ class: "terms_dl" } do |dl|
           dl.dt do |dt|
-            pref.children.each { |n| parse(n, dt) }
+            term_and_termref_parse(node, dt)
           end
-          set_termdomain("")
           dl.dd do |dd|
-            node.children.each { |n| parse(n, dd) unless n.name == "preferred" }
+            term_rest_parse(node, dd)
           end
         end
       end
 
-      def term_cleanup(docxml)
-        docxml.xpath("//table[@class = 'terms_dl']").each do |d|
-          prev = d.previous_element
-          next unless prev and prev.name == "table" and prev["class"] == "terms_dl"
-          d.children.each { |n| prev.add_child(n.remove) }
-          d.remove
-        end
-        docxml
-      end
-
       include BaseConvert
     end
   end

data/lib/isodoc/nist/metadata.rb

@@ -116,12 +116,6 @@ module IsoDoc
         Date.parse(isodate).strftime("%m-%d-%Y")
       end
 
-      def keywords(ixml, _out)
-        keywords = []
-        ixml.xpath(ns("//bibdata/keyword")).each { |kw| keywords << kw.text }
-        set(:keywords, keywords)
-      end
-
       def commentperiod(ixml, _out)
         from = ixml.at(ns("//bibdata/ext/commentperiod/from"))&.text
         to = ixml.at(ns("//bibdata/ext/commentperiod/to"))&.text