metanorma-nist 1.2.9 → 1.2.14

data/lib/asciidoctor/nist/nist.rng

@@ -194,6 +194,9 @@
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -207,6 +210,9 @@
       <optional>
         <ref name="bibliography"/>
       </optional>
+      <zeroOrMore>
+        <ref name="indexsect"/>
+      </zeroOrMore>
     </element>
   </define>
 </grammar>

data/lib/asciidoctor/nist/nist_intro.xml

@@ -6,21 +6,21 @@
     <p>
     {%- if substage == "retired" or substage == "withdrawn" -%}
     {%- if unpublished -%}
-    {%- if substage == "retired" %}{{draft-retired-boilerplate}}{% else %}{{draft-withdrawn-boilerplate}}{% endif -%}  
+    {%- if substage == "retired" %}{{labels["draft-retired-boilerplate"]}}{% else %}{{labels["draft-withdrawn-boilerplate"]}}{% endif -%}  
     {%- else -%}
-    {%- if withdrawal_pending %}{{ withdrawal-pending-boilerplate}}{% else %}{{ publication-withdrawn-boilerplate }}{% endif -%}
+    {%- if withdrawal_pending %}{{ labels["withdrawal-pending-boilerplate"]}}{% else %}{{ labels["publication-withdrawn-boilerplate"] }}{% endif -%}
     {%- endif -%}
     {%- else -%}
     {%- if status == "Internal Draft" -%}
-    {{- draft-internal-boilerplate -}}
+    {{- labels["draft-internal-boilerplate"] -}}
     {%- elsif status == "Work-in-Progress Draft" -%}
-    {{- draft-wip-boilerplate -}}
+    {{- labels["draft-wip-boilerplate"] -}}
     {%- elsif status == "Preliminary Draft" -%}
-    {{- draft-prelim-boilerplate -}}
+    {{- labels["draft-prelim-boilerplate"] -}}
     {%- elsif status == "Public Draft" -%}
-    {{- draft-public-boilerplate -}}
+    {{- labels["draft-public-boilerplate"] -}}
     {%- elsif status == "Approval Draft" -%}
-    {{- draft-public-boilerplate -}}
+    {{- labels["draft-public-boilerplate"] -}}
     {%- endif -%}
     {%- endif -%}
   </p>
@@ -78,8 +78,8 @@ CODEN: NSPUE2</p>
   <p align="center"><strong>Comments on this publication may be submitted to:</strong></p>
 
 <p align="center">National Institute of Standards and Technology <br/>
-  Attn: {{ nist_division }} <br/>
-  {{ nist_division_address }} <br/>
+  Attn: {{ labels["nist_division"] }} <br/>
+  {{ labels["nist_division_address"] }} <br/>
   {% if email %}
   Email: <link target="mailto:{{ email }}"/>
   {% endif %}</p>

data/lib/asciidoctor/nist/nist_intro_cswp.xml

@@ -6,21 +6,21 @@
     <p>
     {%- if substage == "retired" or substage == "withdrawn" -%}
     {%- if unpublished -%}
-    {%- if substage == "retired" %}{{draft-retired-boilerplate}}{% else %}{{draft-withdrawn-boilerplate}}{% endif -%}
+    {%- if substage == "retired" %}{{labels["draft-retired-boilerplate"]}}{% else %}{{labels["draft-withdrawn-boilerplate"]}}{% endif -%}
     {%- else -%}
-    {%- if withdrawal_pending %}{{ withdrawal-pending-boilerplate}}{% else %}{{ publication-withdrawn-boilerplate }}{% endif -%}
+    {%- if withdrawal_pending %}{{ labels["withdrawal-pending-boilerplate"]}}{% else %}{{ labels["publication-withdrawn-boilerplate"] }}{% endif -%}
     {%- endif -%}
     {%- else -%}
     {%- if status == "Internal Draft" -%}
-    {{- draft-internal-boilerplate -}}
+    {{- labels["draft-internal-boilerplate"] -}}
     {%- elsif status == "Work-in-Progress Draft" -%}
-    {{- draft-wip-boilerplate -}}
+    {{- labels["draft-wip-boilerplate"] -}}
     {%- elsif status == "Preliminary Draft" -%}
-    {{- draft-prelim-boilerplate -}}
+    {{- labels["draft-prelim-boilerplate"] -}}
     {%- elsif status == "Public Draft" -%}
-    {{- draft-public-boilerplate -}}
+    {{- labels["draft-public-boilerplate"] -}}
     {%- elsif status == "Approval Draft" -%}
-    {{- draft-public-boilerplate -}}
+    {{- labels["draft-public-boilerplate"] -}}
     {%- endif -%}
     {%- endif -%}
   </p>
@@ -62,8 +62,8 @@
   <p align="center"><strong>Comments on this publication may be submitted to:</strong></p>
 
 <p align="center">National Institute of Standards and Technology <br/>
-  Attn: {{ nist_division }} <br/>
-  {{ nist_division_address }} <br/>
+  Attn: {{ labels["nist_division"] }} <br/>
+  {{ labels["nist_division_address"] }} <br/>
   {% if email %}
   Email: <link target="mailto:{{ email }}"/>
   {% endif %}</p>

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/html/html_nist_titlepage.html

@@ -86,7 +86,7 @@
       {% if unpublished %}
       <div class="coverpage-warning">
         <!--
-        <p>{% if substage == "retired" %}{{draft-retired-boilerplate}}{% else %}{{draft-withdrawn-boilerplate}}{% endif %}</p>
+        <p>{% if substage == "retired" %}{{labels["draft-retired-boilerplate"]}}{% else %}{{labels["draft-withdrawn-boilerplate"]}}{% endif %}</p>
         -->
         <div class="authority6"/>
 
@@ -105,9 +105,9 @@
       <div class="coverpage-warning">
         <!--
         {% if withdrawal_pending %}
-        <p>{{ withdrawal-pending-boilerplate}}</p>
+        <p>{{ labels["withdrawal-pending-boilerplate"]}}</p>
         {% else %}
-        <p>{{ publication-withdrawn-boilerplate }}</p>
+        <p>{{ labels["publication-withdrawn-boilerplate"] }}</p>
         {% endif %}
         -->
         <div class="authority6"/>
@@ -172,12 +172,14 @@
       {% endif %}
       </div>
 
+      {% if doi %}
       <div class="download-info">
 
         This publication is available free of charge from: <br>
         <a href="{{doi}}">{{ doi }}</a>
 
       </div>
+      {% endif %}
       {% endunless %}       
 
       {% endif %}          

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

@@ -59,9 +59,9 @@ AABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAkwUAAAAA
     style='mso-bidi-font-weight:normal'><span lang="EN-US">Warning Notice<o:p></o:p></span></b></p>
     <p class="Default"><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'><o:p>&#xa0;</o:p></span></p>
     {% if substage == "retired" %}
-    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{draft-retired-boilerplate}}<o:p></o:p></span></p>
+    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{labels["draft-retired-boilerplate"]}}<o:p></o:p></span></p>
     {% else %}
-    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{draft-withdrawn-boilerplate}}<o:p></o:p></span></p>
+    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{labels["draft-withdrawn-boilerplate"]}}<o:p></o:p></span></p>
     {% endif %}
       -->
       <div class="authority6"/>
@@ -375,7 +375,7 @@ AABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAkwUAAAAA
     <p class="Default" align="center" style='text-align:center;font-size:12.0pt;'><b
     style='mso-bidi-font-weight:normal'><span lang="EN-US">Warning Notice<o:p></o:p></span></b></p>
     <p class="Default"><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'><o:p>&#xa0;</o:p></span></p>
-    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{ withdrawal-pending-boilerplate}}<o:p></o:p></span></p>
+    <p class="Default" style='font-size:12.0pt;'><span lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{ labels["withdrawal-pending-boilerplate"]}}<o:p></o:p></span></p>
         -->
     <p class="Default" align="center" style='text-align:center'><span lang="EN-US"
     style='mso-fareast-font-family:"Times New Roman"'><o:p>&#xa0;</o:p></span></p>
@@ -593,7 +593,7 @@ style='width:477.0pt;margin-left:-5.25pt;border-collapse:collapse;border:none;ms
   color:black;mso-themecolor:text1'><o:p>&#xa0;</o:p></span></p>
   <p class="Default"><span lang="EN-US" style='font-size:11.0pt;font-family:"Calibri",sans-serif;
   mso-ascii-theme-font:major-latin;mso-fareast-font-family:"Times New Roman";
-  mso-hansi-theme-font:major-latin;mso-bidi-font-family:"Times New Roman"'>{{publication-withdrawn-boilerplate}}<o:p></o:p></span></p>
+  mso-hansi-theme-font:major-latin;mso-bidi-font-family:"Times New Roman"'>{{labels["publication-withdrawn-boilerplate"]}}<o:p></o:p></span></p>
     -->
     <div class="withdrawn">
       <div class="authority6"/>
@@ -1111,13 +1111,13 @@ style='font-size:14.0pt;color:black;mso-themecolor:text1'>&#xa0;</span></p>
     style='font-size:14.0pt'>&#xa0;</span></p>
     <p class="Default" align="left" style='text-align:justify;text-justify:inter-ideograph'><span lang="EN-US"
     style='font-size:12.0pt'>{% if status == "Internal Draft" %}
-    {{draft-internal-boilerplate}}
+    {{labels["draft-internal-boilerplate"]}}
     {% elsif status == "Work-in-Progress Draft" %}
-    {{draft-wip-boilerplate}}
+    {{labels["draft-wip-boilerplate"]}}
     {% elsif status == "Preliminary Draft" %}
-    {{draft-prelim-boilerplate}}
+    {{labels["draft-prelim-boilerplate"]}}
     {% elsif status == "Public Draft" %}
-    {{draft-public-boilerplate}}
+    {{labels["draft-public-boilerplate"]}}
     {% else %}
     {{status}}
     {% endif %}</span></p>

data/lib/isodoc/nist/html/word_nist_titlepage_cswp.html

@@ -62,7 +62,9 @@ mso-themeshade:128'>{{ issueddate_MMMddyyyy }}</span></p>
 
 <p class="MsoNormal">&#xa0;</p>
 
+{% if doi %}
 <p class="MsoNormal"><span
 style='color:#244061;mso-themecolor:accent1;mso-themeshade:128'>This
 publication is available free of charge from:<br/>
 {{ doi }}</span></p>
+{% endif %}

data/lib/isodoc/nist/html_convert.rb

@@ -21,14 +21,12 @@ 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',
-                                  normalfontsize: "14px",
-                                  footnotefontsize: "0.9em",
-                                  monospacefontsize: "0.8em",
+          bodyfont: '"Libre Baskerville",serif',
+          headerfont: '"Libre Baskerville",serif',
+          monospacefont: '"Space Mono",monospace',
+          normalfontsize: "14px",
+          footnotefontsize: "0.9em",
+          monospacefontsize: "0.8em",
         }
       end
 

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

data/lib/isodoc/nist/metadata_id.rb

@@ -73,8 +73,7 @@ module IsoDoc
 
       def docid(ixml, _out)
         docid = ixml.at(ns("//bibdata/docidentifier[@type = 'NIST']"))&.text
-        docid_long = ixml.at(ns("//bibdata/docidentifier"\
-                                "[@type = 'nist-long']"))&.text
+        docid_long = ixml.at(ns("//bibdata/docidentifier[@type = 'nist-long']"))&.text
         set(:docidentifier, docid)
         set(:docidentifier_long, docid_long)
         set(:docidentifier_undated, stripdate(docid))
@@ -86,8 +85,7 @@ module IsoDoc
 
       def stripdate(id)
         return if id.nil?
-        id.sub(/ \((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[^)]+\)$/,
-               "")
+        id.sub(/ \((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[^)]+\)$/, "")
       end
 
       def draft_prefix(ixml)
@@ -117,9 +115,7 @@ module IsoDoc
 
       def draftinfo(draft, revdate)
         draftinfo = ""
-        if draft
-          draftinfo = " #{@labels["draft_label"]} #{draft}"
-        end
+        draft and draftinfo = " #{@labels["draft_label"]} #{draft}"
         @i18n.l10n(draftinfo, @lang, @script)
       end
     end