metanorma-nist 0.0.8 → 0.0.9

data/lib/isodoc/nist/html/header.html

@@ -80,7 +80,7 @@ normal'><span lang=EN-US><span style='mso-special-character:footnote-continuatio
 <div style='mso-element:header' id=eh2>
 
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;font-size:9pt;
-mso-line-height-rule:exactly'><span lang=EN-US>{{ draft_prefix }}{{ docnumber }}<span style='mso-tab-count:
+mso-line-height-rule:exactly'><span lang=EN-US>{{ draft_prefix }}{{ docidentifier }}<span style='mso-tab-count:
 1'></span>{{ doctitle_short }}</span>
 <br/><span lang=EN-US><span style='mso-tab-count:1'></span>{{ docsubtitle_short }}</span>
 </p>
@@ -90,7 +90,7 @@ mso-line-height-rule:exactly'><span lang=EN-US>{{ draft_prefix }}{{ docnumber }}
 <div style='mso-element:header' id=h2>
 
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;font-size:9pt;
-mso-line-height-rule:exactly'><span lang=EN-US>{{ draft_prefix }}{{ docnumber }}<span style='mso-tab-count:
+mso-line-height-rule:exactly'><span lang=EN-US>{{ draft_prefix }}{{ docidentifier }}<span style='mso-tab-count:
 1'></span>{{ doctitle_short }}</span>
 <br/><span lang=EN-US><span style='mso-tab-count:1'></span>{{ docsubtitle_short }}</span>
 </p>

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

@@ -37,7 +37,7 @@
       </div>
 
       <div class="coverpage-logo" style="float:left">
-        <span>{{ publisheddate_monthyear }}</span>
+        <span>{{ issueddate_monthyear }}</span>
         {%if confirmeddate and confirmeddate != "XXX" %}
         <br/>Publication is current as of {{ confirmeddate_mmddyyyy }}
         {% elsif errata and updateddate and updateddate != "XXX" %}

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

@@ -562,6 +562,7 @@ color: rgb(123, 168, 18);
 
     ul, ol {margin-left: 1.2em;}
 
+    /*
   ul > li {
   list-style: none;
    }
@@ -571,6 +572,7 @@ color: rgb(123, 168, 18);
     display: inline-block; width: 1em;
     margin-left: -1.2em;
   }
+  */
 
   ul > li p:first-child {
     display: inline;

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

@@ -21,6 +21,10 @@ div.authority5 {
   text-align: center;
 }
 
+div.authority1 p, div.authority2 p, div.authority3 p, div.authority4 p, div.authority5 p {
+	font-size:11.0pt;
+}
+
 p.Default, li.Default, div.Default
 	{mso-style-name:Default;
 	mso-style-unhide:no;

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

@@ -473,7 +473,7 @@ style='font-size:14.0pt'><o:p>&#xa0;</o:p></span></p>
   <td width="456" valign="top" style='width:342.0pt;padding:0cm 5.4pt 0cm 5.4pt'>
   <p class="Default" style='margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;
   margin-left:0cm'><span lang="EN-US" style='font-size:12.0pt;font-family:"Times New Roman",serif;
-  color:black;mso-themecolor:text1'>{{ superseding_published_date_monthyear }}<o:p></o:p></span></p>
+  color:black;mso-themecolor:text1'>{{ superseding_issued_date_monthyear }}{% if superseding_updated_date_MMMddyyyy %}(including updates as of {{superseding_updated_date_MMMddyyyy}}){% endif %} <o:p></o:p></span></p>
   </td>
  </tr>
  <tr style='mso-yfti-irow:5'>
@@ -667,7 +667,13 @@ style='width:477.0pt;margin-left:-5.25pt;border-collapse:collapse;border:none;ms
   padding:0cm 5.4pt 0cm 5.4pt'>
   <p class="Default"><span lang="EN-US" style='font-size:11.0pt;font-family:"Calibri",sans-serif;
   mso-ascii-theme-font:major-latin;mso-hansi-theme-font:major-latin;mso-bidi-font-family:
-  "Times New Roman";color:black;mso-themecolor:text1'>{{ publisheddate_monthyear }}<o:p></o:p></span></p>
+  "Times New Roman";color:black;mso-themecolor:text1'>{{ issueddate_monthyear }}<o:p></o:p></span>
+{% if confirmeddate and confirmeddate != "XXX" %}
+<span style="font-size:11.0pt;color:black;font-family:"Calibri",sans-serif;">(publication is current as of {{ confirmeddate_mmddyyyy }})</span>
+{% elsif errata and updateddate and updateddate != "XXX" %}
+ <span style="font-size:14.0pt;color:black;font-family:"Calibri",sans-serif;">(including updates as of {{ updateddate_mmddyyyy }})</span>
+{% endif %}
+  </p>
   </td>
  </tr>
  <tr style='mso-yfti-irow:5'>
@@ -1420,12 +1426,12 @@ d25yZXYueG1sUEsFBgAAAAAEAAQA8wAAAMQFAAAAAA==
 <v:fill o:detectmouseclick="t"/>
  <v:textbox style='mso-fit-shape-to-text:t'>
  <div>
-{% 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:</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 }}</span></p>
+     lang="EN-US" style='font-size:14.0pt;color:black'>{{ doi }}</span></p>
 {% else %}
 <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'></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'></p>
@@ -1434,17 +1440,20 @@ free of charge from:</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'>&#xa0;</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'>{{ publisheddate_monthyear }}</span>
+                     lang="EN-US" style='font-size:14.0pt;color:black'>{{ issueddate_monthyear }}</span>
 <br/>
 {% if confirmeddate and confirmeddate != "XXX" %}
 <span style="font-variant:small-caps;font-size:14.0pt;color:black;">Publication is current as of {{ confirmeddate_mmddyyyy }}</span>
 {% elsif errata and updateddate and updateddate != "XXX" %}
- <span style="font-variant:small-caps;font-size:14.0pt;color:black;">Includes updates as of {{ updateddate_mmddyyyy }}; see page <span style='mso-element:field-begin'></span><span
-style='mso-spacerun:yes'> </span>PAGEREF errata_XYZZY \h <span style='mso-element:field-separator'></span>2<span
-style='mso-element:field-end'></span>       </span> 
+<span style="font-variant:small-caps;font-size:14.0pt;color:black;"><a href="#errata_XYZZY">Includes updates as of {{ updateddate_mmddyyyy }}</a></span>
 {% endif %}
 </p>
 
+<!--
+ <span style="font-variant:small-caps;font-size:14.0pt;color:black;">Includes updates as of {{ updateddate_mmddyyyy }}; see page <span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>PAGEREF errata_XYZZY \h <span style='mso-element:field-separator'></span>2<span style='mso-element:field-end'></span>       </span> 
+-->
+
+
 <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'>&#xa0;</span></p>
 
@@ -1491,12 +1500,12 @@ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</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'>&#xa0;</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:</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 }}</span></p>
+     lang="EN-US" style='font-size:14.0pt;color:black'>{{ doi }}</span></p>
 {% endif %}
 
 <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
@@ -1505,7 +1514,7 @@ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
 lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</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'>{{ publisheddate_monthyear }}</span>
+                     lang="EN-US" style='font-size:14.0pt;color:black'>{{ issueddate_monthyear }}</span>
 {%if confirmeddate and confirmeddate != "XXX" %}
 <br/><span style="font-variant:small-caps;font-size:14.0pt;color:black;">Publication is current as of {{ confirmeddate }}</span>
         {% endif %}

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

@@ -403,6 +403,7 @@ h1.Annex {
         mso-style-parent:"Heading 1";
         mso-style-link:"Heading 2 Char";
         mso-style-next:Normal;
+	text-align:center;
         margin-top:3.0pt;
         margin-right:0cm;
         margin-bottom:12.0pt;
@@ -411,7 +412,6 @@ h1.Annex {
         line-height:12.5pt;
         mso-pagination:widow-orphan;
         page-break-after:avoid;
-        mso-outline-level:2;
         mso-hyphenate:none;
         tab-stops:27.0pt 35.0pt;
         font-size:12.0pt;
@@ -1026,7 +1026,7 @@ p.Tablebody, li.Tablebody, div.Tablebody
 @list l0:level7
 	{mso-level-reset-level:level2;
 	mso-level-suffix:space;
-	mso-level-text:"Figure\00A0%1\.%7\00A0—";
+	mso-level-text:"Figure\00A0%1\.%7\00A0•";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:0cm;
@@ -1035,7 +1035,7 @@ p.Tablebody, li.Tablebody, div.Tablebody
 @list l0:level8
 	{mso-level-reset-level:level2;
 	mso-level-suffix:space;
-	mso-level-text:"Table\00A0%1\.%8\00A0—";
+	mso-level-text:"Table\00A0%1\.%8\00A0•";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:0cm;
@@ -1205,63 +1205,63 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	mso-list-template-ids:-277327948 -457018030 67633155 67633157 67633153 67633155 67633157 67633153 67633155 67633157;}
 @list l3:level1
 	{mso-level-number-format:bullet;
-	mso-level-text:—;
+	mso-level-text:•;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:18.0pt;
 	text-indent:-18.0pt;}
 @list l3:level2
 	{mso-level-number-format:bullet;
-	mso-level-text:—;
+	mso-level-text:•;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:36.0pt;
 	text-indent:-18.0pt;}
 @list l3:level3
 	{mso-level-number-format:bullet;
-	mso-level-text:—;
+	mso-level-text:•;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:54.0pt;
 	text-indent:-18.0pt;}
 @list l3:level4
 	{mso-level-number-format:bullet;
-	mso-level-text:—;
+	mso-level-text:•;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:72.0pt;
 	text-indent:-18.0pt;}
 @list l3:level5
 	{mso-level-number-format:bullet;
-	mso-level-text:—;
+	mso-level-text:•;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:90.0pt;
 	text-indent:-18.0pt;}
 @list l3:level6
 	{mso-level-number-format:bullet;
-	mso-level-text:—;
+	mso-level-text:•;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:108.0pt;
 	text-indent:-18.0pt;}
 @list l3:level7
 	{mso-level-number-format:bullet;
-	mso-level-text:—;
+	mso-level-text:•;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:126.0pt;
 	text-indent:-18.0pt;}
 @list l3:level8
 	{mso-level-number-format:bullet;
-	mso-level-text:—;
+	mso-level-text:•;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:144.0pt;
 	text-indent:-18.0pt;}
 @list l3:level9
 	{mso-level-number-format:bullet;
-	mso-level-text:—;
+	mso-level-text:•;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:162.0pt;

data/lib/isodoc/nist/html_convert.rb

@@ -68,6 +68,11 @@ module IsoDoc
         dest = docxml.at("//div[@id = 'authority']") || return
         auth = docxml.at("//div[@class = 'authority']") || return
         dest.replace(auth.remove)
+        a = docxml.at("//div[@id = 'authority1']") and a["class"] = "authority1"
+        a = docxml.at("//div[@id = 'authority2']") and a["class"] = "authority2"
+        a = docxml.at("//div[@id = 'authority3']") and a["class"] = "authority3"
+        a = docxml.at("//div[@id = 'authority4']") and a["class"] = "authority4"
+        a = docxml.at("//div[@id = 'authority5']") and a["class"] = "authority5"
       end
 
       def cleanup(docxml)
@@ -84,8 +89,10 @@ module IsoDoc
 
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
+          foreword docxml, div3
           abstract docxml, div3
           keywords docxml, div3
+          boilerplate docxml, div3
           preface docxml, div3
           middle docxml, div3
           footnotes div3
@@ -124,18 +131,6 @@ module IsoDoc
         end
       end
 
-      def pseudocode_parse(node, out)
-        @in_figure = true
-        name = node.at(ns("./name"))
-        out.div **attr_code(id: node["id"], class: "pseudocode") do |div|
-          node.children.each do |n|
-            parse(n, div) unless n.name == "name"
-          end
-          figure_name_parse(node, div, name) if name
-        end
-        @in_figure = false
-      end
-
       def termdef_parse(node, out)
         pref = node.at(ns("./preferred"))
         out.dl **{ class: "terms_dl" } do |dl|

data/lib/isodoc/nist/metadata.rb

@@ -3,73 +3,114 @@ require "twitter_cldr"
 
 module IsoDoc
   module NIST
-
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
         super
-        set(:status, "XXX")
       end
 
-      def title(isoxml, out)
-        main = isoxml&.at(ns("//bibdata/title[@type = 'main']"))&.text
+      def iter_abbr(stage, iter)
+        return "F" if iter&.downcase == "final" &&
+          %w(draft-wip draft-prelim draft-public).include?(stage)
+        case stage
+        when "draft-wip", "draft-prelim"
+          iter || ""
+        when "draft-public"
+          iter ||= "1"
+          iter == "1" ? "I" : iter
+        else
+          ""
+        end
+      end
+
+      def stage_abbr(stage, iter)
+        case stage
+        when "draft-internal" then "Internal"
+        when "draft-wip" then "#{iter_abbr(stage, iter)}WD"
+        when "draft-prelim" then "#{iter_abbr(stage, iter)}PreD"
+        when "draft-public" then "#{iter_abbr(stage, iter)}PD"
+        else
+          nil
+        end
+      end
+
+      def title(ixml, out)
+        main = ixml&.at(ns("//bibdata/title[@type = 'main']"))&.text
         set(:doctitle, main)
-        short = isoxml&.at(ns("//bibdata/title[@type = 'short-title']"))&.text
+        short = ixml&.at(ns("//bibdata/title[@type = 'short-title']"))&.text
         set(:doctitle_short, short || main)
       end
 
-      def subtitle(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@type = 'subtitle']"))&.text
+      def subtitle(ixml, _out)
+        main = ixml&.at(ns("//bibdata/title[@type = 'subtitle']"))&.text
         set(:docsubtitle, main) if main
-        short = isoxml&.at(ns("//bibdata/title[@type = 'short-subtitle']"))&.text
+        short = ixml&.at(ns("//bibdata/title[@type = 'short-subtitle']"))&.text
         set(:docsubtitle_short, short || main) if (short || main)
-        main = isoxml&.at(ns("//bibdata/title[@type = 'document-class']"))&.text
+        main = ixml&.at(ns("//bibdata/title[@type = 'document-class']"))&.text
         set(:docclasstitle, main) if main
       end
 
-      def author(isoxml, _out)
-        tc = isoxml.at(ns("//bibdata/editorialgroup/committee"))
+      def author(ixml, _out)
+        tc = ixml.at(ns("//bibdata/editorialgroup/committee"))
         set(:tc, tc.text.upcase) if tc
-        personal_authors(isoxml)
-        subdiv = isoxml.at(ns("//bibdata/contributor[role/@type = 'publisher']/organization/subdivision"))
+        personal_authors(ixml)
+        subdiv = ixml.at(ns("//bibdata/contributor[role/@type = 'publisher']/"\
+                            "organization/subdivision"))
         set(:nist_subdiv, subdiv.text) if subdiv
       end
 
-      def docid(isoxml, _out)
-        docid = isoxml.at(ns("//bibdata/docidentifier[@type = 'nist']"))&.text
-        docid_long = isoxml.at(ns("//bibdata/docidentifier"\
-                                  "[@type = 'nist-long']"))&.text
-        docnumber = isoxml.at(ns("//bibdata/docnumber"))&.text
+      def docid(ixml, _out)
+        docid = ixml.at(ns("//bibdata/docidentifier[@type = 'nist']"))&.text
+        docid_long = ixml.at(ns("//bibdata/docidentifier"\
+                                "[@type = 'nist-long']"))&.text
+        docnumber = ixml.at(ns("//bibdata/docnumber"))&.text
         set(:docidentifier, docid)
         set(:docidentifier_long, docid_long)
-        d = draft_prefix(isoxml) and set(:draft_prefix, d)
-        d = iter_code(isoxml) and set(:iteration_code, d)
-        d = iter_ordinal(isoxml) and set(:iteration_ordinal, d)
+        set(:docidentifier_undated, stripdate(docid))
+        set(:docidentifier_long_undated, stripdate(docid_long))
+        d = draft_prefix(ixml) and set(:draft_prefix, d)
+        d = iter_code(ixml) and set(:iteration_code, d)
+        d = iter_ordinal(ixml) and set(:iteration_ordinal, d)
         set(:docnumber, docnumber)
       end
 
-      def draft_prefix(isoxml)
-        docstatus = isoxml.at(ns("//bibdata/status/stage"))&.text
+      def stripdate(id)
+        return if id.nil?
+        id.sub(/ \((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[^)]+\)$/,
+               "")
+      end
+
+      def draft_prefix(ixml)
+        docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
         return nil unless docstatus && /^draft/.match(docstatus)
-        iter = iter_code(isoxml)
+        iter = iter_code(ixml)
         prefix = "DRAFT "
         iter and prefix += "(#{iter}) "
         prefix
       end
 
-      def iter_code(isoxml)
-        docstatus = isoxml.at(ns("//bibdata/status/stage"))&.text
+      def iter_code(ixml)
+        docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
         return nil unless docstatus == "draft-public"
-        iter = isoxml.at(ns("//bibdata/status/iteration"))&.text || "1"
+        iter = ixml.at(ns("//bibdata/status/iteration"))&.text || "1"
         return "IPD" if iter == "1"
         return "FPD" if iter.downcase == "final"
         "#{iter}PD"
       end
 
-      def iter_ordinal(isoxml)
-        docstatus = isoxml.at(ns("//bibdata/status/stage"))&.text
-        return nil unless docstatus == "draft-public"
-        iter = isoxml.at(ns("//bibdata/status/iteration"))&.text || "1"
-        return "Initial" if iter == "1"
+      # override the above
+      def iter_code(ixml)
+        docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
+        iter = ixml.at(ns("//bibdata/status/iteration"))&.text
+        stage_abbr(docstatus, iter)
+      end
+
+      def iter_ordinal(ixml)
+        docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
+        #return nil unless docstatus == "draft-public"
+        iter = ixml.at(ns("//bibdata/status/iteration"))&.text
+        iter ||= "1" if docstatus == "draft-public"
+        return if iter.nil?
+        return "Initial" if iter == "1" && docstatus == "draft-public"
         return "Final" if iter.downcase == "final"
         iter.to_i.localize.to_rbnf_s("SpelloutRules", "spellout-ordinal")
       end
@@ -82,15 +123,15 @@ module IsoDoc
         IsoDoc::Function::I18n::l10n(draftinfo, @lang, @script)
       end
 
-      def docstatus(isoxml, _out)
-        docstatus = isoxml.at(ns("//bibdata/status/stage"))&.text
+      def docstatus(ixml, _out)
+        docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
         set(:unpublished, !/^draft/.match(docstatus).nil?)
-        substage = isoxml.at(ns("//bibdata/status/substage"))&.text
+        substage = ixml.at(ns("//bibdata/status/substage"))&.text
         substage and set(:substage, substage)
-        iter = isoxml.at(ns("//bibdata/status/iteration"))&.text
+        iter = ixml.at(ns("//bibdata/status/iteration"))&.text
         set(:iteration, iter) if iter
         set(:status, status_print(docstatus || "final"))
-        set(:errata, true) if isoxml.at(ns("//errata"))
+        set(:errata, true) if ixml.at(ns("//errata"))
       end
 
       def status_print(status)
@@ -99,36 +140,52 @@ module IsoDoc
         when "draft-wip" then "Work-in-Progress Draft"
         when "draft-prelim" then "Preliminary Draft"
         when "draft-public" then "Public Draft"
-        when "draft-retire" then "Retired Draft"
-        when "draft-withdrawn" then "Withdrawn Draft"
         when "final" then "Final"
         when "final-review" then "Under Review"
         when "final-withdrawn" then "Withdrawn"
         end
       end
 
-      def version(isoxml, _out)
+      def version(ixml, _out)
         super
-        set(:revision, isoxml&.at(ns("//bibdata/revision"))&.text)
+        set(:revision, ixml&.at(ns("//bibdata/revision"))&.text)
         revdate = get[:revdate]
         set(:revdate_monthyear, monthyr(revdate))
         set(:revdate_MMMddyyyy, MMMddyyyy(revdate))
       end
 
-      def bibdate(isoxml, _out)
+      def bibdate(ixml, _out)
         super
-        isoxml.xpath(ns("//bibdata/date")).each do |d|
+        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))
         end
-        withdrawal_pending(isoxml)
+        withdrawal_pending(ixml)
+        most_recent_date(ixml)
       end
 
-      def withdrawal_pending(isoxml)
-        d = isoxml&.at(ns("//bibdata/date[@type = 'obsoleted']"))&.text or return
+      def most_recent_date(ixml)
+        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))
+      end
+
+      def most_recent_date1(ixml)
+        docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
+        /^draft/.match(docstatus) ?
+          (ixml.at(ns("//bibdata/date[@type = 'circulated']")) ||
+           ixml.at(ns("//version/revision-date"))) :
+        ( ixml.at(ns("//bibdata/date[@type = 'issued']")))
+      end
+
+      def withdrawal_pending(ixml)
+        d = ixml&.at(ns("//bibdata/date[@type = 'obsoleted']"))&.text or return
         date = Date.parse(d) or return
         set(:withdrawal_pending, true) if date > Date.today
       end
@@ -141,11 +198,11 @@ module IsoDoc
         val_monthyear
       end
 
-      def series(isoxml, _out)
-        series = isoxml.at(ns("//bibdata/series[@type = 'main']/title"))&.text
+      def series(ixml, _out)
+        series = ixml.at(ns("//bibdata/series[@type = 'main']/title"))&.text
         set(:series, series) if series
-        subseries = isoxml.at(ns("//bibdata/series[@type = 'secondary']/"\
-                                 "title"))&.text
+        subseries = ixml.at(ns("//bibdata/series[@type = 'secondary']/"\
+                               "title"))&.text
         set(:subseries, subseries) if subseries
       end
 
@@ -164,18 +221,18 @@ module IsoDoc
         Date.parse(isodate).strftime("%B %d, %Y")
       end
 
-      def keywords(isoxml, _out)
+      def keywords(ixml, _out)
         keywords = []
-        isoxml.xpath(ns("//bibdata/keyword")).each do |kw|
+        ixml.xpath(ns("//bibdata/keyword")).each do |kw|
           keywords << kw.text
         end
         set(:keywords, keywords)
       end
 
-      def commentperiod(isoxml, _out)
-        from = isoxml.at(ns("//bibdata/commentperiod/from"))&.text
-        to = isoxml.at(ns("//bibdata/commentperiod/to"))&.text
-        extended = isoxml.at(ns("//bibdata/commentperiod/extended"))&.text
+      def commentperiod(ixml, _out)
+        from = ixml.at(ns("//bibdata/commentperiod/from"))&.text
+        to = ixml.at(ns("//bibdata/commentperiod/to"))&.text
+        extended = ixml.at(ns("//bibdata/commentperiod/extended"))&.text
         set(:comment_from, from) if from
         set(:comment_to, to) if to
         set(:comment_extended, extended) if extended
@@ -189,28 +246,28 @@ module IsoDoc
           set(:url, a.text)
       end
 
-      def relations1(isoxml, type)
+      def relations1(ixml, type)
         ret = []
-        isoxml.xpath(ns("//bibdata/relation[@type = '#{type}']")).each do |x|
+        ixml.xpath(ns("//bibdata/relation[@type = '#{type}']")).each do |x|
           id = x&.at(ns(".//docidentifier"))&.text and ret << id
         end
         ret
       end
 
-      def relations(isoxml, _out)
-        ret = relations1(isoxml, "obsoletes")
+      def relations(ixml, _out)
+        ret = relations1(ixml, "obsoletes")
         set(:obsoletes, ret) unless ret.empty?
-        ret = relations1(isoxml, "obsoletedBy")
+        ret = relations1(ixml, "obsoletedBy")
         set(:obsoletedby, ret) unless ret.empty?
-        ret = relations1(isoxml, "supersedes")
+        ret = relations1(ixml, "supersedes")
         set(:supersedes, ret) unless ret.empty?
-        ret = relations1(isoxml, "supersededBy")
+        ret = relations1(ixml, "supersededBy")
         set(:supersededby, ret) unless ret.empty?
-        superseding_doc(isoxml)
+        superseding_doc(ixml)
       end
 
-      def superseding_doc(isoxml)
-        d = isoxml.at(ns("//bibdata/relation[@type = 'obsoletedBy']/bibitem"))
+      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"))
@@ -224,20 +281,20 @@ module IsoDoc
           set(:superseding_doi, doi)
         uri = d.at(ns("./uri[@type = 'uri']"))&.text and
           set(:superseding_uri, uri)
-        superseding_titles(isoxml, d)
+        superseding_titles(ixml, d)
         authors = d.xpath(ns("./contributor[role/@type = 'author']/person"))
-        authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person")) if authors.empty?
+        authors = ixml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person")) if authors.empty?
         set(:superseding_authors, extract_person_names(authors))
       end
 
-      def superseding_titles(isoxml, d)
+      def superseding_titles(ixml, d)
         title = d.at(ns("./title[@type = 'main']"))&.text
         if title
           set(:superseding_title, d.at(ns("./title[@type = 'main']"))&.text)
           set(:superseding_subtitle, d.at(ns("./title[@type = 'subtitle']"))&.text)
         else
-          set(:superseding_title, isoxml.at(ns("//bibdata/title[@type = 'main']"))&.text)
-          set(:superseding_subtitle, isoxml.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
 
@@ -263,9 +320,14 @@ module IsoDoc
           set(:superseding_circulated_date, cdate)
           set(:superseding_circulated_date_monthyear, monthyr(cdate))
         end
-        if cdate = d.at(ns("./date[@type = 'published']/on"))&.text
-          set(:superseding_published_date, cdate)
-          set(:superseding_published_date_monthyear, monthyr(cdate))
+        if cdate = d.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
+          set(:superseding_updated_date, cdate)
+          set(:superseding_updated_date_monthyear, monthyr(cdate))
+          set(:superseding_updated_date_MMMddyyyy, MMMddyyyy(cdate))
         end
       end