metanorma-nist 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c3f8f7501c3253edf4e36a10084620a0809aa8bb388932c40527a3deed50f76
-  data.tar.gz: 3f47ac4616595d8b62701f9d9a7d16ebf4f986f14b091494c94da488d51c5186
+  metadata.gz: 36ac09c63540d7f54f30b736c97745c39540395609ccc8ec87633b598c22fb1d
+  data.tar.gz: 5ea3cbb59d1771302c79eddc3bde4c59143c48e3bc4ed21849f5a76eb770004a
 SHA512:
-  metadata.gz: 0d546a77f835d5527cda36a14160605ff0e1e50022216e0222ccf816c445c1c671a9dab9d02940dd1e4d900a38aaba3a1d9f5c5004f483a590655f60e45c3532
-  data.tar.gz: 71ac09b0a49b3081c535eb54004e4358da63c85f32fdb3ca1b394ad2702cca433d8ef7ada8ac11545913727e6d9161674c3ea9f32eedadf092d945fab74b8e45
+  metadata.gz: d3922390af3fe4aba54d16c0fa110adfbeb1e037f553244c645f6c403daaec8c3eb7e3db3da5fa18f2b8f558c20eb8a11af67ed7ad9fba46f017a45a524cf9c9
+  data.tar.gz: 1cc37283a2d664adabfce277a46c5024a97d201a132a46f6fe2a5aa3134a18529a2efc5d56f506252676f07496931310b7e15673bebb20d9a25f919318ee6403

data/README.adoc

@@ -299,7 +299,7 @@ Can be a number, or text (e.g. "initial", "final").
 `:series:`:: The publication series that the document belongs to. Legal values are:
 +
 --
-* nist-ams
+*  nist-ams
 *  building-science
 *  nist-fips
 *  nist-gcr
@@ -321,11 +321,28 @@ Can be a number, or text (e.g. "initial", "final").
 *  csrc-use-case
 *  csrc-building-block
 *  nist-cswp
+*  nist-csts
 --
 
 Documents belonging to different series are expected to be rendered differently. As of this
-writing, styling has been provided for `nist-cswp` (Cybersecurity White Papers) and for 
-`nist-sp` (SP-800).
+writing, styling has been provided for `nist-cswp` (Cybersecurity White Papers),
+`nist-csts` (Cybersecurity Technical Specifications, added in v1.2.10), and for `nist-sp` (SP-800).
+
+`:series-title:`:: (Added in v1.2.10) 
+`:series-mrprefix:`:: (Added in v1.2.10) 
+`:series-abbrev:`:: (Added in v1.2.10) The formal documents published by NIST belong to a registered
+list of series, each with a predefined title and abbreviation. Non-formal documents instead belong
+to ad hoc series defined for the purposes of Metanorma, such as `nist-csts`. That particular series
+acts as an umbrella for user-defined series of publications; so when it is used, the user needs to provide
+a title (e.g. "Automated Cryptographic Validation Protocol") and abbreviation (e.g. ACVP) for the user-defined
+series. The user also needs to provide the prefix by which the series will be identified in the machine-readable
+NIST identifier, when it is at variance with the abbreviation.
++
+--
+In this case, CSTS is retained as the primary series of the publication (and all CSTS documents
+are rendered the same way), and ACVP is modelled as a secondary series specific to CSTS. However,
+the series information rendered for the document involves the user-defined series, not CSTS itself.
+--
 
 `:comment-from:`:: The beginning of the period during which comments may be submitted to the NIST
 document draft. ISO-8601 date.

data/lib/asciidoctor/nist/basicdoc.rng

@@ -729,12 +729,27 @@
   </define>
   <define name="index">
     <element name="index">
-      <attribute name="primary"/>
+      <attribute name="to">
+        <data type="IDREF"/>
+      </attribute>
+      <element name="primary">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
       <optional>
-        <attribute name="secondary"/>
+        <element name="secondary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
       </optional>
       <optional>
-        <attribute name="tertiary"/>
+        <element name="tertiary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
       </optional>
     </element>
   </define>

data/lib/asciidoctor/nist/boilerplate.rb

@@ -24,6 +24,7 @@ module Asciidoctor
         "csrc-use-case": "CSRC Use Case",
         "csrc-building-block": "CSRC Building Block",
         "nist-cswp": "NIST Cybersecurity White Paper",
+        "nist-csts": "NIST Cybersecurity Technical Specification",
       }.freeze
 
       SERIES_ABBR = {
@@ -49,6 +50,7 @@ module Asciidoctor
         "csrc-use-case": "CSRC Use Case",
         "csrc-building-block": "CSRC Building Block",
         "nist-cswp": "NIST CSWP",
+        "nist-csts": "NIST CSTS",
       }.freeze
 
       CALL_FOR_PATENT_CLAIMS = <<~END.freeze
@@ -100,7 +102,7 @@ module Asciidoctor
       end
 
       def boilerplate_file(xmldoc)
-        File.join(@libdir, @series == "nist-cswp" ? "nist_intro_cswp.xml" : "nist_intro.xml")
+        File.join(@libdir, @cswp ? "nist_intro_cswp.xml" : "nist_intro.xml")
       end
     end
   end

data/lib/asciidoctor/nist/cleanup.rb

@@ -72,7 +72,7 @@ module Asciidoctor
       end
 
       def callforpatentclaims(x, preface)
-        return if @series == "nist-cswp"
+        return if @cswp
         if @callforpatentclaims
           docemail = x&.at("//uri[@type = 'email']")&.text || "???"
           docnumber = x&.at("//docnumber")&.text || "???"

data/lib/asciidoctor/nist/converter.rb

@@ -103,6 +103,7 @@ module Asciidoctor
         @nistdivisionaddress = node.attr("nist-division-address") ||
           "100 Bureau Drive (Mail Stop 8930) Gaithersburg, MD 20899-8930"
         @series = node.attr("series")
+        @cswp = %w(nist-cswp nist-csts).include?(@series)
         super
       end
 

data/lib/asciidoctor/nist/front.rb

@@ -29,8 +29,7 @@ module Asciidoctor
         t.title(**attr_code(at.merge(type: "subtitle"))) do |t1|
           t1 << asciidoc_sub(node.attr("title-sub"))
         end
-        node.attr("title-sub-short") and
-          t.title(**attr_code(at.merge(type: "short-subtitle"))) do |t1|
+        node.attr("title-sub-short") and t.title(**attr_code(at.merge(type: "short-subtitle"))) do |t1|
           t1 << asciidoc_sub(node.attr("title-sub-short"))
         end
       end
@@ -46,8 +45,7 @@ module Asciidoctor
         t.title(**attr_code(at.merge(type: "main"))) do |t1|
           t1 << (asciidoc_sub(node.attr("title-main")) || node.title)
         end
-        node.attr("title-main-short") and
-          t.title(**attr_code(at.merge(type: "short-title"))) do |t1|
+        node.attr("title-main-short") and t.title(**attr_code(at.merge(type: "short-title"))) do |t1|
           t1 << asciidoc_sub(node.attr("title-main-short"))
         end
       end
@@ -85,21 +83,16 @@ module Asciidoctor
       end
 
       def metadata_committee(node, xml)
-        return unless node.attr("technical-committee") ||
-          node.attr("subcommittee") ||
+        return unless node.attr("technical-committee") || node.attr("subcommittee") ||
           node.attr("workgroup") || node.attr("workinggroup")
         xml.editorialgroup do |a|
-          node.attr("technical-committee") and
-            a.committee(node.attr("technical-committee"))
-          node.attr("subcommittee") and
-            a.subcommittee(
-              node.attr("subcommittee"),
-              **attr_code(type: node.attr("subcommittee-type"),
-                          number: node.attr("subcommittee-number")))
-          (node.attr("workgroup") || node.attr("workinggroup")) and
-            a.workgroup(node.attr("workgroup") || node.attr("workinggroup"),
-                        **attr_code(type: node.attr("workgroup-type"),
-                                    number: node.attr("workgroup-number")))
+          c = node.attr("technical-committee") and a.committee(c)
+          c = node.attr("subcommittee") and
+            a.subcommittee(c, **attr_code(type: node.attr("subcommittee-type"),
+                                          number: node.attr("subcommittee-number")))
+          c = (node.attr("workgroup") || node.attr("workinggroup")) and
+            a.workgroup(c,
+                        **attr_code(type: node.attr("workgroup-type"), number: node.attr("workgroup-number")))
         end
       end
 
@@ -114,16 +107,26 @@ module Asciidoctor
 
       def metadata_source(node, xml)
         super
-        node.attr("doc-email") && xml.uri(node.attr("doc-email"), type: "email")
-        node.attr("doi") && xml.uri(node.attr("doi"), type: "doi")
+        node.attr("doc-email") and xml.uri(node.attr("doc-email"), type: "email")
+        node.attr("doi") and xml.uri(node.attr("doi"), type: "doi")
       end
 
       def metadata_series(node, xml)
         series = node.attr("series") || "nist-sp"
         series and xml.series **{ type: "main" } do |s|
           s.title (SERIES.dig(series.to_sym) || series)
-          SERIES_ABBR.dig(series.to_sym) and
-            s.abbreviation SERIES_ABBR.dig(series.to_sym)
+          SERIES_ABBR.dig(series.to_sym) and s.abbreviation SERIES_ABBR.dig(series.to_sym)
+        end
+        metadata_subseries(node, xml)
+      end
+
+      def metadata_subseries(node, xml)
+        title = node.attr("series-title")
+        abbrev = node.attr("series-abbrev")
+        return unless (title || abbrev)
+        xml.series **{ type: "secondary" } do |s|
+          title and s.title title
+          abbrev and s.abbreviation abbrev
         end
       end
 
@@ -143,13 +146,11 @@ module Asciidoctor
       end
 
       def relaton_relation_descriptions
-        super.merge({ "supersedes" => "obsoletes",
-                      "superseded-by" => "obsoleted-by", })
+        super.merge({ "supersedes" => "obsoletes", "superseded-by" => "obsoleted-by", })
       end
 
       def metadata_getrelation(node, xml, type, desc = nil)
-        if type == "obsoleted-by" and desc.nil? and 
-            node.attr("superseding-status")
+        if type == "obsoleted-by" and desc.nil? and node.attr("superseding-status")
           metadata_superseding_doc(node, xml)
         end
         super
@@ -166,29 +167,24 @@ module Asciidoctor
             metadata_superseding_dates(b, node)
             b.status do |s|
               s.stage node.attr("superseding-status")
-              iter = node.attr("superseding-iteration") and
-                s.iteration iter
+              iter = node.attr("superseding-iteration") and s.iteration iter
             end
           end
         end
       end
 
       def metadata_superseding_ids(b, xml)
-        did = xml&.parent&.at("./ancestor::bibdata/docidentifier"\
-                              "[@type = 'NIST']")&.text
-        didl = xml&.parent&.at("./ancestor::bibdata/docidentifier"\
-                               "[@type = 'nist-long']")&.text
+        did = xml&.parent&.at("./ancestor::bibdata/docidentifier[@type = 'NIST']")&.text
+        didl = xml&.parent&.at("./ancestor::bibdata/docidentifier[@type = 'nist-long']")&.text
         b.docidentifier did, **{ type: "NIST" }
         b.docidentifier didl, **{ type: "nist-long" }
       end
 
       def metadata_superseding_dates(b, node)
-        cdate = node.attr("superseding-circulated-date") and
-          b.date **{ type: "circulated" } do |d|
+        cdate = node.attr("superseding-circulated-date") and b.date **{ type: "circulated" } do |d|
           d.on cdate
         end
-        cdate = node.attr("superseding-issued-date") and
-          b.date **{ type: "issued" } do |d|
+        cdate = node.attr("superseding-issued-date") and b.date **{ type: "issued" } do |d|
           d.on cdate
         end
       end
@@ -198,24 +194,21 @@ module Asciidoctor
           b.title **{ type: "main" } do |t|
             t << asciidoc_sub(node.attr("superseding-title"))
           end
-          node.attr("superseding-subtitle") and
-            b.title **{ type: "subtitle" } do |t|
+          node.attr("superseding-subtitle") and b.title **{ type: "subtitle" } do |t|
             t << asciidoc_sub(node.attr("superseding-subtitle"))
           end
         else
           b.title **{ type: "main" } do |t|
             t << (asciidoc_sub(node.attr("title-main")) || node.title)
           end
-          node.attr("title-sub") and
-            b.title **{ type: "subtitle" } do |t|
+          node.attr("title-sub") and b.title **{ type: "subtitle" } do |t|
             t << asciidoc_sub(node.attr("title-sub"))
           end
         end
       end
 
       def metadata_superseding_authors(b, node)
-        node.attr("superseding-authors") and
-          node.attr("superseding-authors").split(/,\s*/).each do |a|
+        node.attr("superseding-authors") and node.attr("superseding-authors").split(/,\s*/).each do |a|
           b.contributor do |c|
             c.role nil, **{ type: "author" }
             c.person do |p|
@@ -228,10 +221,8 @@ module Asciidoctor
       end
 
       def metadata_note(node, xml)
-        note = node.attr("bib-additional-note") and
-          xml.note note, **{ type: "additional-note" }
-        note = node.attr("bib-withdrawal-note") and
-          xml.note note, **{ type: "withdrawal-note" }
+        note = node.attr("bib-additional-note") and xml.note note, **{ type: "additional-note" }
+        note = node.attr("bib-withdrawal-note") and xml.note note, **{ type: "withdrawal-note" }
         note = node.attr("bib-withdrawal-announcement-link") and
           xml.note note, **{ type: "withdrawal-announcement-link" }
       end

data/lib/asciidoctor/nist/front_id.rb

@@ -24,6 +24,9 @@ module Asciidoctor
         {
           id: dn0,
           series: node.attr("series"),
+          subseries: node.attr("series-title") || node.attr("series-abbrev"),
+          subseries_abbr: node.attr("series-abbrev"),
+          subseries_mr: node.attr("series-mrprefix") || node.attr("series-abbrev"),
           edition: node.attr("edition"),
           version: node.attr("version"),
           revision: node.attr("revision"),
@@ -52,8 +55,7 @@ module Asciidoctor
         else
           args = id_args(node, dn0) || return
           xml.docidentifier add_id_parts(args, false), **attr_code(type: "NIST")
-          xml.docidentifier add_id_parts(args, true),
-            **attr_code(type: "nist-long")
+          xml.docidentifier add_id_parts(args, true), **attr_code(type: "nist-long")
           xml.docidentifier add_id_parts_mr(args), **attr_code(type: "nist-mr")
         end
       end
@@ -67,10 +69,20 @@ module Asciidoctor
         IsoDoc::NIST::Metadata.new(nil, nil, @i18n).status_abbr(stage, iter)
       end
 
+      def id_series_name(args, type)
+        if args[:series] == "nist-csts"
+          return ret = case type
+                       when :long then args[:subseries] 
+                       when :short then args[:subseries_abbr]
+                       when :mr then args[:subseries_mr]
+                       end
+        end
+        type == :long ?
+          SERIES.dig(args[:series].to_sym) : SERIES_ABBR.dig(args[:series].to_sym)
+      end
+
       def add_id_parts(args, long)
-        args[:series] and series_name = long ?
-          SERIES.dig(args[:series].to_sym) :
-          SERIES_ABBR.dig(args[:series].to_sym)
+        args[:series] and series_name = id_series_name(args, (long ? :long : :short))
         dn = (series_name || "NIST #{args[:series]}")  + " " + args[:id]
         dn += " Volume #{args[:vol]}" if args[:vol]
         dn += "," if args[:vol] && args[:revision]
@@ -107,8 +119,7 @@ module Asciidoctor
 
       def add_id_parts_mr(args)
         ret = ["NIST"]
-        args[:series] and
-          ret << SERIES_ABBR&.dig(args[:series].to_sym)&.sub(/^NIST /, "")
+        args[:series] and ret << id_series_name(args, :mr)&.sub(/^NIST /, "")
         stage = status_abbr(args[:stage], nil) || ""
         stage += "[-#{args[:iter]}]" if args[:iter]
         ret << stage unless stage.empty?

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"/>

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/metadata.rb

@@ -9,11 +9,9 @@ module IsoDoc
         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")))
+        set(:logo_cswp, File.expand_path(File.join(here, "html", "logo_cswp.png")))
         set(:logo_commerce,
-            File.expand_path(File.join(here, "html",
-                                       "commerce-logo-color.png")))
+            File.expand_path(File.join(here, "html", "commerce-logo-color.png")))
         set(:logo_commerce_word,
             File.expand_path(File.join(here, "html", "deptofcommerce.png")))
       end
@@ -57,12 +55,9 @@ 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))
+          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))
         end
         withdrawal_pending(ixml)
         most_recent_date(ixml)
@@ -101,13 +96,18 @@ module IsoDoc
       end
 
       def series(ixml, _out)
-        series = ixml.at(ns("//bibdata/series[@type = 'main']/title"))&.text and
-          set(:series, series)
-        seriesabbr =
-          ixml.at(ns("//bibdata/series[@type = 'main']/abbreviation"))&.text
+        series = ixml.at(ns("//bibdata/series[@type = 'main']/title"))&.text and set(:series, series)
+        seriesabbr = ixml.at(ns("//bibdata/series[@type = 'main']/abbreviation"))&.text
         set(:seriesabbr, seriesabbr) if seriesabbr
-        subs = ixml.at(ns("//bibdata/series[@type = 'secondary']/"\
-                          "title"))&.text and set(:subseries, subs)
+        subs = ixml.at(ns("//bibdata/series[@type = 'secondary']/title"))&.text
+        abbr = ixml.at(ns("//bibdata/series[@type = 'secondary']/abbreviation"))&.text
+        if (seriesabbr == "NIST CSTS")
+          subs and set(:series, subs)
+          abbr and set(:seriesabbr, abbr)
+        else
+          subs and set(:subseries, subs)
+          abbr and set(:subseriesabbr, abbr)
+        end
       end
 
       def mmddyyyy(isodate)
@@ -129,8 +129,7 @@ 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)
@@ -157,35 +156,28 @@ 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"))
+        set(:superseding_status, status_print(d.at(ns("./status/stage"))&.text || "final"))
         superseding_iteration(d)
         docid = d.at(ns("./docidentifier[@type = 'NIST']"))&.text and
           set(:superseding_docidentifier, docid)
         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)
+          set(:superseding_subtitle, d.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
 
@@ -200,8 +192,7 @@ 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
@@ -223,12 +214,9 @@ 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 = "\
-                         "'withdrawal-announcement-link']"))&.text and
+        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)
         super
       end