metanorma-nist 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77b41b5dd747530f461f057cf1372802edb2607e6a7144c390347e4ee57f6d3c
-  data.tar.gz: 7316d76679f0a51af953f434d3ef51aa8b68e165d4e5ca728f2c49f1b85f843d
+  metadata.gz: bd9a240ccb58e745abb276285bf1f48004d72a8f5a15413f39611773926fc9f5
+  data.tar.gz: 126d8a1e178ec82888a4ddaa6d10b0a589872424981df7e49409a72882a85241
 SHA512:
-  metadata.gz: 8acbc8f62cebeff401b9e22130040857f87b4ab59aca4657ae9309e974dc955780052be44824b281d0ceb4dd39c4b0acf7c9df44a44ec3921eacf1945156e477
-  data.tar.gz: ddd906a92cb5d6f5e67bae2f19b83da79d510f6d2eaa3b18a15e1fee272aca5799981ae42977bc5599b05cb514d2e09a3421aefbf5cedd7ab3e1cf5de4f145a2
+  metadata.gz: c7bd829e6baf2aaea5cfc577c8c0bc41cd8622a322a06bd551ca212467e53d768127fce8b2d12f40eeeaa7ad4d989254ee3bd555bd0e153197c04d2a63e2e0e0
+  data.tar.gz: 892c02adf47677f1b1133b818c235ba7d7ccee378490f3e3c6f416d7e39d9cd74b571a490e2b8cf6e77e954ce9fe3479962265bda536664b33a579c57dfb24f1

data/.rubocop.yml

@@ -10,5 +10,3 @@ AllCops:
   DisplayCopNames: false
   StyleGuideCopsOnly: false
   TargetRubyVersion: 2.4
-Rails:
-  Enabled: true

data/lib/asciidoctor/nist/biblio.rng

@@ -787,6 +787,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">

data/lib/asciidoctor/nist/isodoc.rng

@@ -876,6 +876,18 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="pagebreak">
+      <element name="pagebreak">
+        <optional>
+          <attribute name="orientation">
+            <choice>
+              <value>landscape</value>
+              <value>portrait</value>
+            </choice>
+          </attribute>
+        </optional>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <define name="colgroup">
@@ -943,8 +955,170 @@
       <ref name="permission"/>
       <ref name="imagemap"/>
       <ref name="svgmap"/>
+      <ref name="inputform"/>
     </choice>
   </define>
+  <define name="inputform">
+    <element name="form">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="name"/>
+      <attribute name="action"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="TextElement"/>
+          <ref name="FormInput"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="FormInput">
+    <choice>
+      <ref name="input"/>
+      <ref name="formlabel"/>
+      <ref name="select"/>
+      <ref name="textarea"/>
+    </choice>
+  </define>
+  <define name="InputType">
+    <choice>
+      <value>button</value>
+      <value>checkbox</value>
+      <value>date</value>
+      <value>file</value>
+      <value>password</value>
+      <value>radio</value>
+      <value>submit</value>
+      <value>text</value>
+    </choice>
+  </define>
+  <define name="input">
+    <element name="input">
+      <attribute name="type">
+        <ref name="InputType"/>
+      </attribute>
+      <optional>
+        <attribute name="checked">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="readonly">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="maxlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="minlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
+  <define name="formlabel">
+    <element name="label">
+      <attribute name="for">
+        <data type="IDREF"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="select">
+    <element name="select">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="multiple">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="size">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="option"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="option">
+    <element name="option">
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="textarea">
+    <element name="textarea">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="rows">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="cols">
+          <data type="int"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
   <define name="bibliography">
     <element name="bibliography">
       <oneOrMore>
@@ -1017,9 +1191,7 @@
   </define>
   <define name="IsoWorkgroup">
     <optional>
-      <attribute name="number">
-        <data type="int"/>
-      </attribute>
+      <attribute name="number"/>
     </optional>
     <optional>
       <attribute name="type"/>

data/lib/isodoc/nist/metadata.rb

@@ -1,22 +1,23 @@
 require "isodoc"
 require "twitter_cldr"
-require_relative "./metadata_id.rb"
+require_relative "./metadata_id"
 
 module IsoDoc
   module NIST
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
         super
-        here = File.dirname(__FILE__)
-        set(:logo_nist, File.expand_path(File.join(here, "html", "logo.png")))
-        set(:logo_cswp, File.expand_path(File.join(here, "html", "logo_cswp.png")))
+        here = File.join(File.dirname(__FILE__), "html")
+        set(:logo_nist, File.expand_path(File.join(here, "logo.png")))
+        set(:logo_cswp,
+            File.expand_path(File.join(here, "logo_cswp.png")))
         set(:logo_commerce,
-            File.expand_path(File.join(here, "html", "commerce-logo-color.png")))
+            File.expand_path(File.join(here, "commerce-logo-color.png")))
         set(:logo_commerce_word,
-            File.expand_path(File.join(here, "html", "deptofcommerce.png")))
+            File.expand_path(File.join(here, "deptofcommerce.png")))
       end
 
-      def title(ixml, out)
+      def title(ixml, _out)
         main = ixml&.at(ns("//bibdata/title[@type = 'main']"))&.text
         set(:doctitle, main)
         short = ixml&.at(ns("//bibdata/title[@type = 'short-title']"))&.text
@@ -27,7 +28,7 @@ module IsoDoc
         main = ixml&.at(ns("//bibdata/title[@type = 'subtitle']"))&.text
         set(:docsubtitle, main) if main
         short = ixml&.at(ns("//bibdata/title[@type = 'short-subtitle']"))&.text
-        set(:docsubtitle_short, short || main) if (short || main)
+        set(:docsubtitle_short, short || main) if short || main
         main = ixml&.at(ns("//bibdata/title[@type = 'document-class']"))&.text
         set(:docclasstitle, main) if main
       end
@@ -37,7 +38,7 @@ module IsoDoc
         set(:tc, tc.text.upcase) if tc
         subdiv = ixml.at(ns("//bibdata/contributor[role/@type = 'publisher']/"\
                             "organization/subdivision")) and
-                           set(:nist_subdiv, subdiv.text)
+          set(:nist_subdiv, subdiv.text)
         super
       end
 
@@ -55,6 +56,7 @@ module IsoDoc
         ixml.xpath(ns("//bibdata/date")).each do |d|
           val = Common::date_range(d)
           next if val == "XXX"
+
           set("#{d['type']}date_monthyear".to_sym, daterange_proc(val, :monthyr))
           set("#{d['type']}date_mmddyyyy".to_sym, daterange_proc(val, :mmddyyyy))
           set("#{d['type']}date_MMMddyyyy".to_sym, daterange_proc(val, :MMMddyyyy))
@@ -67,6 +69,7 @@ module IsoDoc
         date = most_recent_date1(ixml) || return
         val = Common::date_range(date)
         return if val == "XXX"
+
         set(:most_recent_date_monthyear, daterange_proc(val, :monthyr))
         set(:most_recent_date_mmddyyyy, daterange_proc(val, :mmddyyyy))
         set(:most_recent_date_MMMddyyyy, daterange_proc(val, :MMMddyyyy))
@@ -74,24 +77,27 @@ module IsoDoc
 
       def most_recent_date1(ixml)
         docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
-        /^draft/.match(docstatus) ?
+        if /^draft/.match?(docstatus)
           (ixml.at(ns("//bibdata/date[@type = 'circulated']")) ||
-           ixml.at(ns("//version/revision-date"))) :
-        ( ixml.at(ns("//bibdata/date[@type = 'issued']")))
+                   ixml.at(ns("//version/revision-date")))
+        else
+          ixml.at(ns("//bibdata/date[@type = 'issued']"))
+        end
       end
 
       def withdrawal_pending(ixml)
-        d = ixml&.at(ns("//bibdata/date[@type = 'obsoleted']"))&.text&.strip or return
-        d += "-01" if /^\d\d\d\d-\d\d$/.match(d)
+        d = ixml&.at(ns("//bibdata/date[@type = 'obsoleted']"))&.text&.strip or
+          return
+        d += "-01" if /^\d\d\d\d-\d\d$/.match?(d)
         date = Date.parse(d) or return
         set(:withdrawal_pending, true) if date > Date.today
       end
 
-      def daterange_proc(val, fn)
-        m = /^(?<date1>[^&]+)(?<ndash>\&ndash;)?(?<date2>.*)$/.match val
-        val_monthyear = self.send(fn, m[:date1])
+      def daterange_proc(val, format)
+        m = /^(?<date1>[^&]+)(?<ndash>&ndash;)?(?<date2>.*)$/.match val
+        val_monthyear = send(format, m[:date1])
         val_monthyear += "&ndash;" if m[:ndash]
-        val_monthyear += self.send(fn, m[:date2]) unless m[:date2].empty?
+        val_monthyear += send(format, m[:date2]) unless m[:date2].empty?
         val_monthyear
       end
 
@@ -101,7 +107,7 @@ module IsoDoc
         set(:seriesabbr, seriesabbr) if seriesabbr
         subs = ixml.at(ns("//bibdata/series[@type = 'secondary']/title"))&.text
         abbr = ixml.at(ns("//bibdata/series[@type = 'secondary']/abbreviation"))&.text
-        if (seriesabbr == "NIST CSTS")
+        if seriesabbr == "NIST CSTS"
           subs and set(:series, subs)
           abbr and set(:seriesabbr, abbr)
         else
@@ -112,7 +118,8 @@ module IsoDoc
 
       def mmddyyyy(isodate)
         return nil if isodate.nil?
-        isodate += "-01" if /^\d\d\d\d-\d\d$/.match(isodate)
+
+        isodate += "-01" if /^\d\d\d\d-\d\d$/.match?(isodate)
         Date.parse(isodate).strftime("%m-%d-%Y")
       end
 
@@ -129,13 +136,16 @@ module IsoDoc
         super
         a = xml.at(ns("//bibdata/uri[@type = 'email']")) and set(:email, a.text)
         a = xml.at(ns("//bibdata/uri[@type = 'doi']")) and set(:doi, a.text)
-        a = xml.at(ns("//bibdata/uri[@type = 'uri' or not(@type)]")) and set(:url, a.text)
+        a = xml.at(ns("//bibdata/uri[@type = 'uri' or not(@type)]")) and
+          set(:url, a.text)
       end
 
       def relations1(ixml, type)
         ret = []
-        ixml.xpath(ns("//bibdata/relation[@type = '#{type}'][not(xmlns:description)] | "\
-                      "//bibdata/relation[description = '#{type}']")).each do |x|
+        ixml.xpath(ns("//bibdata/relation[@type = '#{type}']"\
+                      "[not(xmlns:description)] | "\
+                      "//bibdata/relation[description = '#{type}']"))
+          .each do |x|
           id = x&.at(ns(".//docidentifier"))&.text and ret << id
         end
         ret
@@ -156,6 +166,7 @@ module IsoDoc
       def superseding_doc(ixml)
         d = ixml.at(ns("//bibdata/relation[@type = 'obsoletedBy']/bibitem"))
         return unless d
+
         set(:superseding_status, status_print(d.at(ns("./status/stage"))&.text || "final"))
         superseding_iteration(d)
         docid = d.at(ns("./docidentifier[@type = 'NIST']"))&.text and
@@ -163,27 +174,35 @@ module IsoDoc
         docid_long = d.at(ns("./docidentifier[@type = 'nist-long']"))&.text and
           set(:superseding_docidentifier_long, docid_long)
         superseding_dates(d)
-        doi = d.at(ns("./uri[@type = 'doi']"))&.text and set(:superseding_doi, doi)
-        uri = d.at(ns("./uri[@type = 'uri']"))&.text and set(:superseding_uri, uri)
+        doi = d.at(ns("./uri[@type = 'doi']"))&.text and
+          set(:superseding_doi, doi)
+        uri = d.at(ns("./uri[@type = 'uri']"))&.text and
+          set(:superseding_uri, uri)
         superseding_titles(ixml, d)
         authors = d.xpath(ns("./contributor[role/@type = 'author']/person"))
-        authors.empty? and authors = ixml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person"))
+        authors.empty? and
+          authors = ixml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person"))
         set(:superseding_authors, extract_person_names(authors))
       end
 
-      def superseding_titles(ixml, d)
-        if title = d.at(ns("./title[@type = 'main']"))&.text
-          set(:superseding_title, d.at(ns("./title[@type = 'main']"))&.text)
-          set(:superseding_subtitle, d.at(ns("./title[@type = 'subtitle']"))&.text)
+      def superseding_titles(ixml, newdoc)
+        if newdoc.at(ns("./title[@type = 'main']"))&.text
+          set(:superseding_title,
+              newdoc.at(ns("./title[@type = 'main']"))&.text)
+          set(:superseding_subtitle,
+              newdoc.at(ns("./title[@type = 'subtitle']"))&.text)
         else
-          set(:superseding_title, ixml.at(ns("//bibdata/title[@type = 'main']"))&.text)
-          set(:superseding_subtitle, ixml.at(ns("//bibdata/title[@type = 'subtitle']"))&.text)
+          set(:superseding_title,
+              ixml.at(ns("//bibdata/title[@type = 'main']"))&.text)
+          set(:superseding_subtitle,
+              ixml.at(ns("//bibdata/title[@type = 'subtitle']"))&.text)
         end
       end
 
-      def superseding_iteration(d)
-        return unless d.at(ns("./status/stage"))&.text == "draft-public"
-        iter = d.at(ns("./status/iteration"))&.text || "1"
+      def superseding_iteration(newdoc)
+        return unless newdoc.at(ns("./status/stage"))&.text == "draft-public"
+
+        iter = newdoc.at(ns("./status/iteration"))&.text || "1"
         case iter.downcase
         when "1"
           set(:superseding_iteration_ordinal, "Initial")
@@ -192,21 +211,22 @@ module IsoDoc
           set(:superseding_iteration_ordinal, "Final")
           set(:superseding_iteration_code, "FPD")
         else
-          set(:superseding_iteration_ordinal, iter.to_i.localize.to_rbnf_s("SpelloutRules", "spellout-ordinal"))
+          set(:superseding_iteration_ordinal,
+              iter.to_i.localize.to_rbnf_s("SpelloutRules", "spellout-ordinal"))
           set(:superseding_iteration_code, "#{iter}PD")
         end
       end
 
-      def superseding_dates(d)
-        if cdate = d.at(ns("./date[@type = 'circulated']/on"))&.text
+      def superseding_dates(newdoc)
+        if cdate = newdoc.at(ns("./date[@type = 'circulated']/on"))&.text
           set(:superseding_circulated_date, cdate)
           set(:superseding_circulated_date_monthyear, monthyr(cdate))
         end
-        if cdate = d.at(ns("./date[@type = 'issued']/on"))&.text
+        if cdate = newdoc.at(ns("./date[@type = 'issued']/on"))&.text
           set(:superseding_issued_date, cdate)
           set(:superseding_issued_date_monthyear, monthyr(cdate))
         end
-        if cdate = d.at(ns("./date[@type = 'updated']/on"))&.text
+        if cdate = newdoc.at(ns("./date[@type = 'updated']/on"))&.text
           set(:superseding_updated_date, cdate)
           set(:superseding_updated_date_monthyear, monthyr(cdate))
           set(:superseding_updated_date_MMMddyyyy, MMMddyyyy(cdate))
@@ -214,10 +234,12 @@ module IsoDoc
       end
 
       def note(xml, _out)
-        note = xml.at(ns("//bibdata/note[@type = 'additional-note']"))&.text and set(:additional_note, note)
-        note = xml.at(ns("//bibdata/note[@type = 'withdrawal-note']"))&.text and set(:withdrawal_note, note)
+        note = xml.at(ns("//bibdata/note[@type = 'additional-note']"))&.text and
+          set(:additional_note, note)
+        note = xml.at(ns("//bibdata/note[@type = 'withdrawal-note']"))&.text and
+          set(:withdrawal_note, note)
         note = xml.at(ns("//bibdata/note[@type = 'withdrawal-announcement-link']"))&.text and
-                        set(:withdrawal_announcement_link, note)
+          set(:withdrawal_announcement_link, note)
         super
       end
     end