metanorma-nist 0.0.7 → 0.0.8

data/lib/isodoc/nist/i18n-en.yaml

@@ -1,5 +1,10 @@
 clause: Section
 annex: Appendix
+draft-internal-boilerplate: This document is currently under development and is <br/><b>NOT INTENDED FOR PUBLIC RELEASE.</b>
 draft-wip-boilerplate: This document is currently under development. The draft is not yet complete, and organizations should not attempt to implement it. The content is in an early stage of development, rough, incomplete and experimental; it has not been extensively edited or vetted. This provides an insider view of the iterative process to develop the content and it gives NIST an opportunity to share early thoughts, ideas, and approaches with the community. NIST welcomes early informal feedback and comments, which will be adjudicated after the specified public comment period.
 draft-prelim-boilerplate: This document incorporates comments from the work-in-progress draft. It is a relatively cohesive document and is considered stable, although there are gaps in the content and the overall document is incomplete. Some changes are expected. Organizations may consider experimenting with guidelines, with the understanding that they will identify gaps and challenges. NIST welcomes early informal feedback and comments, which will be adjudicated after the specified public comment period; a full public draft is expected to follow.
-draft-public-boilerplate: This draft represents a complete document that is released for public comment as part of NIST’s official review process, in support of an open and transparent process for developing guidelines and standards. The language is normalized and is consistent throughout the document. Comments received during previous review cycles (if any) have been adjudicated and are addressed in this release. Early adopters may attempt to implement the guidelines in a test or development environment; however, comments received on this draft may cause NIST to determine that a subsequent public draft and comment period is necessary. The content of this document will not be considered as “final” until formally published and announced by NIST.
+draft-public-boilerplate: This draft represents a complete document that is released for public comment as part of NIST’s official review process, in support of an open and transparent process for developing guidelines and standards. The language is normalized and is consistent throughout the document. Comments received during previous review cycles (if any) have been adjudicated and are addressed in this release. Early adopters may attempt to implement the guidelines in a test or development environment; however, comments received on this draft may cause NIST to determine that a subsequent public draft and comment period are necessary. The content of this document will not be considered “final” until it is formally published and announced by NIST.
+withdrawal-pending-boilerplate: This document has been superseded by the document identified below. It will remain active until the withdrawal date, when it will be officially withdrawn.
+draft-retired-boilerplate: The attached draft document has been RETIRED. NIST has discontinued additional development of this document, which is provided here in its entirety for historical purposes.
+draft-withdrawn-boilerplate: The attached draft document has been withdrawn, and is provided solely for historical purposes. It has been superseded by the document identified below.
+publication-withdrawn-boilerplate: The attached publication has been withdrawn (archived), and is provided solely for historical purposes. It may have been superseded by another publication (indicated below).

data/lib/isodoc/nist/metadata.rb

@@ -1,4 +1,5 @@
 require "isodoc"
+require "twitter_cldr"
 
 module IsoDoc
   module NIST
@@ -12,11 +13,15 @@ module IsoDoc
       def title(isoxml, out)
         main = isoxml&.at(ns("//bibdata/title[@type = 'main']"))&.text
         set(:doctitle, main)
+        short = isoxml&.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
         set(:docsubtitle, main) if main
+        short = isoxml&.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
         set(:docclasstitle, main) if main
       end
@@ -25,6 +30,8 @@ module IsoDoc
         tc = isoxml.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"))
+        set(:nist_subdiv, subdiv.text) if subdiv
       end
 
       def docid(isoxml, _out)
@@ -36,6 +43,7 @@ module IsoDoc
         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(:docnumber, docnumber)
       end
 
@@ -57,6 +65,15 @@ module IsoDoc
         "#{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"
+        return "Final" if iter.downcase == "final"
+        iter.to_i.localize.to_rbnf_s("SpelloutRules", "spellout-ordinal")
+      end
+
       def draftinfo(draft, revdate)
         draftinfo = ""
         if draft
@@ -67,16 +84,19 @@ module IsoDoc
 
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))&.text
-        iter = isoxml.at(ns("//bibdata/status/iteration"))&.text
         set(:unpublished, !/^draft/.match(docstatus).nil?)
+        substage = isoxml.at(ns("//bibdata/status/substage"))&.text
+        substage and set(:substage, substage)
+        iter = isoxml.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"))
       end
 
       def status_print(status)
         case status
         when "draft-internal" then "Internal Draft"
-        when "draft-wip" then "Work In Progress Draft"
+        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"
@@ -89,8 +109,36 @@ module IsoDoc
 
       def version(isoxml, _out)
         super
+        set(:revision, isoxml&.at(ns("//bibdata/revision"))&.text)
         revdate = get[:revdate]
         set(:revdate_monthyear, monthyr(revdate))
+        set(:revdate_MMMddyyyy, MMMddyyyy(revdate))
+      end
+
+      def bibdate(isoxml, _out)
+        super
+        isoxml.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)
+      end
+
+      def withdrawal_pending(isoxml)
+        d = isoxml&.at(ns("//bibdata/date[@type = 'obsoleted']"))&.text or return
+        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])
+        val_monthyear += "&ndash;" if m[:ndash]
+        val_monthyear += self.send(fn, m[:date2]) unless m[:date2].empty?
+        val_monthyear
       end
 
       def series(isoxml, _out)
@@ -101,25 +149,19 @@ module IsoDoc
         set(:subseries, subseries) if subseries
       end
 
-      MONTHS = {
-        "01": "January",
-        "02": "February",
-        "03": "March",
-        "04": "April",
-        "05": "May",
-        "06": "June",
-        "07": "July",
-        "08": "August",
-        "09": "September",
-        "10": "October",
-        "11": "November",
-        "12": "December",
-      }.freeze
-
       def monthyr(isodate)
-        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
-        return isodate unless m && m[:yr] && m[:mo]
-        return "#{MONTHS[m[:mo].to_sym]} #{m[:yr]}"
+        return nil if isodate.nil?
+        DateTime.parse(isodate).localize(:en).to_additional_s("yMMMM")
+      end
+
+      def mmddyyyy(isodate)
+        return nil if isodate.nil?
+        Date.parse(isodate).strftime("%m-%d-%Y")
+      end
+
+      def MMMddyyyy(isodate)
+        return nil if isodate.nil?
+        Date.parse(isodate).strftime("%B %d, %Y")
       end
 
       def keywords(isoxml, _out)
@@ -164,6 +206,76 @@ module IsoDoc
         set(:supersedes, ret) unless ret.empty?
         ret = relations1(isoxml, "supersededBy")
         set(:supersededby, ret) unless ret.empty?
+        superseding_doc(isoxml)
+      end
+
+      def superseding_doc(isoxml)
+        d = isoxml.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
+          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)
+        superseding_titles(isoxml, d)
+        authors = d.xpath(ns("./contributor[role/@type = 'author']/person"))
+        authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person")) if authors.empty?
+        set(:superseding_authors, extract_person_names(authors))
+      end
+
+      def superseding_titles(isoxml, 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)
+        end
+      end
+
+      def superseding_iteration(d)
+        return unless d.at(ns("./status/stage"))&.text == "draft-public"
+        iter = d.at(ns("./status/iteration"))&.text || "1"
+        case iter.downcase
+        when "1"
+          set(:superseding_iteration_ordinal, "Initial")
+          set(:superseding_iteration_code, "IPD")
+        when "final"
+          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_code, "#{iter}PD")
+        end
+      end
+
+      def superseding_dates(d)
+        if cdate = d.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 = 'published']/on"))&.text
+          set(:superseding_published_date, cdate)
+          set(:superseding_published_date_monthyear, monthyr(cdate))
+        end
+      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
+          set(:withdrawal_announcement_link, note)
       end
     end
   end

data/lib/isodoc/nist/pdf_convert.rb

@@ -1,6 +1,7 @@
 require "isodoc"
 require_relative "metadata"
 require "fileutils"
+require_relative "base_convert"
 
 module IsoDoc
   module NIST
@@ -91,64 +92,6 @@ module IsoDoc
         end
       end
 
-      def abstract(isoxml, out)
-        f = isoxml.at(ns("//preface/abstract")) || return
-        page_break(out)
-        out.div **attr_code(id: f["id"]) do |s|
-          clause_name(nil, @abstract_lbl, s, class: "AbstractTitle")
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
-        end
-      end
-
-      def keywords(_docxml, out)
-        kw = @meta.get[:keywords]
-        kw.empty? and return
-        out.div **{ class: "Section3" } do |div|
-          clause_name(nil, "Keywords", div,  class: "IntroTitle")
-          div.p kw.sort.join("; ")
-        end
-      end
-
-      FRONT_CLAUSE = "//*[parent::preface][not(local-name() = 'abstract')]".freeze
-
-      def preface(isoxml, out)
-        isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
-          foreword(isoxml, out) and next if c.name == "foreword"
-          authority_parse(isoxml, out) and next if c.name == "authority"
-          next if skip_render(c, isoxml)
-          out.div **attr_code(id: c["id"]) do |s|
-            clause_name(get_anchors[c['id']][:label],
-                        c&.at(ns("./title"))&.content, s, nil)
-            c.elements.reject { |c1| c1.name == "title" }.each do |c1|
-              parse(c1, s)
-            end
-          end
-        end
-      end
-
-      def skip_render(c, isoxml)
-        return false unless c.name == "reviewernote"
-        status = isoxml&.at(ns("//bibdata/status/stage"))&.text
-        return true if status.nil?
-        /^final/.match status
-      end
-
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
-
       def authority_cleanup(docxml)
         dest = docxml.at("//div[@id = 'authority']") || return
         auth = docxml.at("//div[@class = 'authority']") || return
@@ -167,191 +110,6 @@ module IsoDoc
         docxml
       end
 
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child("&nbsp;")
-          h2.add_child(d.remove)
-        end
-        docxml
-      end
-
-      def requirement_cleanup(docxml)
-        docxml.xpath("//div[@class = 'recommend' or @class = 'require' or "\
-                     "@class = 'permission'][title]").each do |d|
-          title = d.at("./title")
-          title.name = "b"
-          n = title.next_element
-          n&.children&.first&.add_previous_sibling(" ")
-          n&.children&.first&.add_previous_sibling(title.remove)
-        end
-        docxml
-      end
-
-      def figure_parse(node, out)
-        return pseudocode_parse(node, out) if node["type"] == "pseudocode"
-        super
-      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 dl_parse(node, out)
-        return glossary_parse(node, out) if node["type"] == "glossary"
-        super
-      end
-
-      def glossary_parse(node, out)
-        out.dl  **attr_code(id: node["id"], class: "glossary") do |v|
-          node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
-            v.dt **attr_code(id: dt["id"]) do |term|
-              dt_parse(dt, term)
-            end
-            v.dd  **attr_code(id: dd["id"]) do |listitem|
-              dd.children.each { |n| parse(n, listitem) }
-            end
-          end
-        end
-        node.elements.reject { |n| dt_dd? n }.each { |n| parse(n, out) }
-      end
-
-      def error_parse(node, out)
-        case node.name
-        when "nistvariable" then nistvariable_parse(node, out)
-        when "recommendation" then recommendation_parse(node, out)
-        when "requirement" then requirement_parse(node, out)
-        when "permission" then permission_parse(node, out)
-        when "errata" then errata_parse(node, out)
-        when "authority" then authority_parse(node, out)
-        when "authority1" then authority1_parse(node, out, "authority1")
-        when "authority2" then authority1_parse(node, out, "authority2")
-        when "authority3" then authority1_parse(node, out, "authority3")
-        when "authority4" then authority1_parse(node, out, "authority4")
-        when "authority5" then authority1_parse(node, out, "authority5")
-        else
-          super
-        end
-      end
-
-      def authority_parse(node, out)
-        out.div **{class: "authority"} do |s|
-          node.children.each do |n|
-            if n.name == "title"
-              s.h1 do |h|
-                n.children.each { |nn| parse(nn, h) }
-              end
-            else
-              parse(n, s)
-            end
-          end
-        end
-      end
-      def authority1_parse(node, out, classname)
-        out.div **{class: classname} do |s|
-          node.children.each do |n|
-            if n.name == "title"
-              s.h2 do |h|
-                n.children.each { |nn| parse(nn, h) }
-              end
-            else
-              parse(n, s)
-            end
-          end
-        end
-      end
-
-      def nistvariable_parse(node, out)
-        out.span **{class: "nistvariable"} do |s|
-          node.children.each { |n| parse(n, s) }
-        end
-      end
-
-      def recommendation_parse(node, out)
-        name = node["type"]
-        out.div **{ class: "recommend" } do |t|
-          t.title { |b| b << "Recommendation #{get_anchors[node['id']][:label]}:" }
-          node.children.each do |n|
-            parse(n, t)
-          end
-        end
-      end
-
-      def requirement_parse(node, out)
-        name = node["type"]
-        out.div **{ class: "require" } do |t|
-          t.title { |b| b << "Requirement #{get_anchors[node['id']][:label]}:" }
-          node.children.each do |n|
-            parse(n, t)
-          end
-        end
-      end
-
-      def permission_parse(node, out)
-        name = node["type"]
-        out.div **{ class: "permission" } do |t|
-          t.title { |b| b << "Permission #{get_anchors[node['id']][:label]}:" }
-          node.children.each do |n|
-            parse(n, t)
-          end
-        end
-      end
-
-      def errata_parse(node, out)
-        out.table **make_table_attr(node) do |t|
-          t.thead do |h|
-            h.tr do |tr|
-              %w(Date Type Change Pages).each do |hdr|
-                tr.th hdr
-              end
-            end
-          end
-          t.tbody do |b|
-            node.xpath(ns("./row")).each do |row|
-              b.tr do |tr|
-                tr.td do |td|
-                  row&.at(ns("./date"))&.children.each do |n|
-                    parse(n, td)
-                  end
-                end
-                tr.td do |td|
-                  row&.at(ns("./type"))&.children.each do |n|
-                    parse(n, td)
-                  end
-                end
-                tr.td do |td|
-                  row&.at(ns("./change"))&.children.each do |n|
-                    parse(n, td)
-                  end
-                end
-                tr.td do |td|
-                  row&.at(ns("./pages"))&.children.each do |n|
-                    parse(n, td)
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-
-      MIDDLE_CLAUSE = "//clause[parent::sections]|//terms[parent::sections]".freeze
-
-      def middle(isoxml, out)
-        middle_title(out)
-        clause isoxml, out
-        bibliography isoxml, out
-        annex isoxml, out
-      end
-
       def bibliography(isoxml, out)
         f = isoxml.at(ns("//bibliography/clause | //bibliography/references")) || return
         page_break(out)
@@ -372,182 +130,27 @@ module IsoDoc
         end
       end
 
-      def info(isoxml, out)
-        @meta.keywords isoxml, out
-        @meta.series isoxml, out
-        @meta.commentperiod isoxml, out
-        super
-      end
-
-      SECTIONS_XPATH =
-        "//foreword | //introduction | //reviewnote | //execsummary | //annex | "\
-        "//sections/clause | //bibliography/references | "\
-        "//bibliography/clause".freeze
-
-      def initial_anchor_names(d)
-        d.xpath("//xmlns:preface/child::*").each do |c|
-          preface_names(c)
-        end
-        sequential_asset_names(d.xpath("//xmlns:preface/child::*"))
-        clause_names(d, 0)
-        middle_section_asset_names(d)
-        termnote_anchor_names(d)
-        termexample_anchor_names(d)
-      end
-
-      def back_anchor_names(docxml)
-        docxml.xpath(ns("//annex")).each_with_index do |c, i|
-          annex_names(c, (65 + i).chr.to_s)
-        end
-        docxml.xpath(ns("//bibliography/clause | "\
-                        "//bibliography/references")).each do |b|
-          preface_names(b)
-        end
-        docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-          reference_names(ref)
-        end
-      end
-
-      def middle_section_asset_names(d)
-        middle_sections =
-          "//xmlns:preface/child::* | //xmlns:sections/child::*"
-        sequential_asset_names(d.xpath(middle_sections))
-      end
-
-      def sequential_asset_names(clause)
-        super
-        sequential_permission_names(clause)
-        sequential_requirement_names(clause)
-        sequential_recommendation_names(clause)
-      end
-
-      def sequential_permission_names(clause)
-        clause.xpath(ns(".//permission")).each_with_index do |t, i|
-          next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct(i + 1, t, "Permission", "permission")
-        end
-      end
-
-      def sequential_requirement_names(clause)
-        clause.xpath(ns(".//requirement")).each_with_index do |t, i|
-          next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct(i + 1, t, "Requirement", "requirement")
-        end
-      end
-
-      def sequential_recommendation_names(clause)
-        clause.xpath(ns(".//recommendation")).each_with_index do |t, i|
-          next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct(i + 1, t, "Recommendation", "recommendation")
-        end
-      end
-
-      def hierarchical_asset_names(clause, num)
-        super
-        hierarchical_permission_names(clause, num)
-        hierarchical_requirement_names(clause, num)
-        hierarchical_recommendation_names(clause, num)
-      end
-
-      def hierarchical_permission_names(clause, num)
-        clause.xpath(ns(".//permission")).each_with_index do |t, i|
-          next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}",
-                                            t, "Permission", "permission")
-        end
-      end
-
-      def hierarchical_requirement_names(clause, num)
-        clause.xpath(ns(".//requirement")).each_with_index do |t, i|
-          next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}",
-                                            t, "Requirement", "requirement")
-        end
-      end
-
-      def hierarchical_recommendation_names(clause, num)
-        clause.xpath(ns(".//recommendation")).each_with_index do |t, i|
-          next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}",
-                                            t, "Recommendation", "recommendation")
-        end
-      end
-
-      def clause_names(docxml, sect_num)
-        q = "//xmlns:sections/child::*"
-        docxml.xpath(q).each_with_index do |c, i|
-          section_names(c, (i + sect_num), 1)
-        end
-      end
-
-      def get_linkend(node)
-        link = anchor_linkend(node, docid_l10n(node["target"] || "[#{node['citeas']}]"))
-        link += eref_localities(node.xpath(ns("./locality")), link)
-        contents = node.children.select { |c| c.name != "locality" }
-        return link if contents.nil? || contents.empty?
-        Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
-        # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
-        # <locality type="section"><reference>3.1</reference></locality></origin>
-      end
-
-      def load_yaml(lang, script)
-        y = if @i18nyaml then YAML.load_file(@i18nyaml)
-            elsif lang == "en"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            end
-        super.merge(y)
-      end
-
-      def annex_name_lbl(clause, num)
-        l10n("<b>#{@annex_lbl} #{num}</b>")
-      end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} &mdash; "
-          t.b do |b|
-            if @bibliographycount == 1 && annex.at(ns("./references"))
-              b << "References"
-            else
-              name&.children&.each { |c2| parse(c2, b) }
-            end
+      def keywords(_docxml, out)
+        kw = @meta.get[:keywords]
+        kw.empty? and return
+        out.div **{ class: "Section3" } do |div|
+          out.div do |div|
+            clause_name(nil, "Keywords", div,  class: "IntroTitle")
+            div.p kw.sort.join("; ")
           end
         end
       end
 
-      def hiersep
-        "-"
-      end
-
-      def annex_names(clause, num)
-        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), type: "clause",
-                                   xref: "#{@annex_lbl} #{num}", level: 1 }
-        clause.xpath(ns("./clause | ./terms | ./term | ./references")).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", 2)
-        end
-        hierarchical_asset_names(clause, num)
-      end
-
-      def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
-                                   level: level, type: "clause" }
-        clause.xpath(ns("./clause | ./terms | ./term | ./references")).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", level + 1)
-        end
-      end
-
-      def terms_parse(node, out)
-        out.div **attr_code(id: node["id"]) do |div|
-          node.at(ns("./title")) and
-            clause_parse_title(node, div, node.at(ns("./title")), out)
-          term_defs_boilerplate(div, node.xpath(ns(".//termdocsource")),
-                                node.at(ns(".//term")), node.at(ns("./p")))
-          node.elements.each do |e|
-            parse(e, div) unless %w{title source}.include? e.name
+      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)
@@ -564,26 +167,16 @@ module IsoDoc
       end
 
       def term_cleanup(docxml)
-        docxml.xpath("//dl[@class = 'terms_dl']").each do |d|
+        docxml.xpath("//table[@class = 'terms_dl']").each do |d|
           prev = d.previous_element
-          next unless prev.name == "dl" and prev["class"] == "terms_dl"
+          next unless prev.name == "table" and prev["class"] == "terms_dl"
           d.children.each { |n| prev.add_child(n.remove) }
           d.remove
         end
         docxml
       end
 
-      def bibliography_parse(node, out)
-        title = node&.at(ns("./title"))&.text || ""
-        out.div do |div|
-          node.parent.name == "annex" or
-            div.h2 title, **{ class: "Section3" }
-          node.elements.reject do |e|
-            ["reference", "title", "bibitem"].include? e.name
-          end.each { |e| parse(e, div) }
-          biblio_list(node, div, true)
-        end
-      end
+      include BaseConvert
     end
   end
 end