metanorma-nist 0.2.14 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70c9e42e24e708b9f976011dfa482e7479f69236bbab12085fca5000f67f5f46
-  data.tar.gz: 3b50a5e413ebee30ffcebc8c95ebd4cf2bba893686026dcdf9c0218063ba37ce
+  metadata.gz: 390fa7e0d2b9f5159246cb5334ac5aa765da260f7e01305806f011e90bb0e357
+  data.tar.gz: 3e571e05d0a8885bf9c857fbd3a9a0f588eb114a47a1f7e2f70e1fa76dd15653
 SHA512:
-  metadata.gz: c75d78cc1dc4c160b47de98a9591b013affc1759afef6def5d65d023db1d7e3aeaaed4dd173995ba7b1c7945813d3db74d8fd3aa2aed23b16cce83976e28b15b
-  data.tar.gz: 07bd75b3208d1fc23919eb0d5550dacd4833bbb34fb06b191dd74054b21923d120bbb75cb12c28f6c142ac4598f3bccdb2a2930444fa8d32d8892dfbdbc8a8fa
+  metadata.gz: 929748797649b3913451079a7f6ea48f975eb35aa395cf7ac26077a9a662c8785e2923cf51aa3b17651323235eb14b72331f7b2c3637796b5bf203e46f51079d
+  data.tar.gz: 2e29269159b3938c08f7c3ea1c3db30de91a648afb2e11713ebe171823b25a91c9aeee0469f5c8e8d0eafd9b17fe066f52b2eafcaff89c9033cf682ba20148a3

data/lib/asciidoctor/nist/converter.rb

@@ -13,7 +13,7 @@ module Asciidoctor
   module NIST
     class Converter < Standoc::Converter
       XML_ROOT_TAG = "nist-standard".freeze
-      XML_NAMESPACE = "https://www.metanorma.com/ns/nist".freeze
+      XML_NAMESPACE = "https://www.metanorma.org/ns/nist".freeze
 
       register_for "nist"
 

data/lib/asciidoctor/nist/front_id.rb

@@ -58,7 +58,7 @@ module Asciidoctor
         dn += "#{vol_delim}#{args[:vol]}" if args[:vol]
         dn += "," if args[:vol] && args[:revision]
         dn += "#{ed_delim}#{args[:revision]}" if args[:revision]
-        stage = IsoDoc::NIST::Metadata.new(nil, nil, {}).stage_abbr(args[:stage], args[:iter])
+        stage = IsoDoc::NIST::Metadata.new(nil, nil, {}).status_abbr(args[:stage], args[:iter])
         dn += " (#{stage})" if stage
         dn += " (#{MMMddyyyy(args[:date])})" if args[:date]
         dn

data/lib/asciidoctor/nist/nist.rng

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.com/ns/nist" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns="https://www.metanorma.org/ns/nist" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!--
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
     we cannot have a new default namespace: we will end up with a grammar with two different

data/lib/isodoc/nist/metadata.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require "twitter_cldr"
+require_relative "./metadata_id.rb"
 
 module IsoDoc
   module NIST
@@ -7,42 +8,16 @@ module IsoDoc
       def initialize(lang, script, labels)
         super
         here = File.dirname(__FILE__)
-        set(:logo_nist,
-            File.expand_path(File.join(here, "html", "logo.png")))
+        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_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
 
-      def iter_abbr(stage, iter)
-        return "F" if iter&.downcase == "final" &&
-          %w(draft-wip draft-prelim draft-public draft-approval).include?(stage)
-        case stage
-        when "draft-wip", "draft-prelim", "dradt-internal", "draft-approval"
-          iter || ""
-        when "draft-public"
-          iter ||= "1"
-          iter == "1" ? "I" : iter
-        else
-          ""
-        end
-      end
-
-      def stage_abbr(stage, iter)
-        case stage
-        when "draft-internal" then "#{iter_abbr(stage, iter)}ID"
-        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"
-        when "draft-approval" then "#{iter_abbr(stage, iter)}AD"
-        else
-          nil
-        end
-      end
-
       def title(ixml, out)
         main = ixml&.at(ns("//bibdata/title[@type = 'main']"))&.text
         set(:doctitle, main)
@@ -64,86 +39,8 @@ module IsoDoc
         set(:tc, tc.text.upcase) if tc
         personal_authors(ixml)
         subdiv = ixml.at(ns("//bibdata/contributor[role/@type = 'publisher']/"\
-                            "organization/subdivision"))
-        set(:nist_subdiv, subdiv.text) if subdiv
-      end
-
-      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)
-        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 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(ixml)
-        prefix = "DRAFT "
-        iter and prefix += "(#{iter}) "
-        prefix
-      end
-
-      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
-        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
-
-      def draftinfo(draft, revdate)
-        draftinfo = ""
-        if draft
-          draftinfo = " #{@labels["draft_label"]} #{draft}"
-        end
-        IsoDoc::Function::I18n::l10n(draftinfo, @lang, @script)
-      end
-
-      def docstatus(ixml, _out)
-        docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
-        set(:unpublished, !/^draft/.match(docstatus).nil?)
-        substage = ixml.at(ns("//bibdata/status/substage"))&.text
-        substage and set(:substage, substage)
-        iter = ixml.at(ns("//bibdata/status/iteration"))&.text
-        set(:iteration, iter) if iter
-        set(:status, status_print(docstatus || "final"))
-        set(:errata, true) if ixml.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-prelim" then "Preliminary Draft"
-        when "draft-public" then "Public Draft"
-        when "draft-approval" then "Approval Draft"
-        when "final" then "Final"
-        when "final-review" then "Under Review"
-        when "final-withdrawn" then "Withdrawn"
-        end
+                            "organization/subdivision")) and
+                           set(:nist_subdiv, subdiv.text)
       end
 
       def version(ixml, _out)
@@ -203,14 +100,13 @@ module IsoDoc
       end
 
       def series(ixml, _out)
-        series = ixml.at(ns("//bibdata/series[@type = 'main']/title"))&.text
-        set(:series, series) if series
+        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
-        subseries = ixml.at(ns("//bibdata/series[@type = 'secondary']/"\
-                               "title"))&.text
-        set(:subseries, subseries) if subseries
+        subs = ixml.at(ns("//bibdata/series[@type = 'secondary']/"\
+                          "title"))&.text and set(:subseries, subs)
       end
 
       def monthyr(isodate)
@@ -230,9 +126,7 @@ module IsoDoc
 
       def keywords(ixml, _out)
         keywords = []
-        ixml.xpath(ns("//bibdata/keyword")).each do |kw|
-          keywords << kw.text
-        end
+        ixml.xpath(ns("//bibdata/keyword")).each { |kw| keywords << kw.text }
         set(:keywords, keywords)
       end
 
@@ -296,8 +190,7 @@ module IsoDoc
       end
 
       def superseding_titles(ixml, d)
-        title = d.at(ns("./title[@type = 'main']"))&.text
-        if title
+        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)

data/lib/isodoc/nist/metadata_id.rb

@@ -0,0 +1,125 @@
+module IsoDoc
+  module NIST
+    class Metadata < IsoDoc::Metadata
+      def iter_abbr(stage, iter)
+        return "F" if iter&.downcase == "final" &&
+          %w(draft-wip draft-prelim draft-public draft-approval).include?(stage)
+        case stage
+        when "draft-wip", "draft-prelim", "dradt-internal", "draft-approval"
+          iter || ""
+        when "draft-public"
+          iter ||= "1"
+          iter == "1" ? "I" : iter
+        else
+          ""
+        end
+      end
+
+      def stage_abbr(stage)
+        case stage
+        when "draft-internal" then "ID"
+        when "draft-wip" then "WD"
+        when "draft-prelim" then "PreD"
+        when "draft-public" then "PD"
+        when "draft-approval" then "AD"
+        else
+          nil
+        end
+      end
+
+      def status_abbr(stage, iter)
+        case stage
+        when "draft-internal" then "#{iter_abbr(stage, iter)}ID"
+        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"
+        when "draft-approval" then "#{iter_abbr(stage, iter)}AD"
+        else
+          nil
+        end
+      end
+
+      def docstatus(ixml, _out)
+        docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
+        set(:unpublished, unpublished(docstatus))
+        substage = ixml.at(ns("//bibdata/status/substage"))&.text
+        substage and set(:substage, substage)
+        iter = ixml.at(ns("//bibdata/status/iteration"))&.text
+        set(:iteration, iter) if iter
+        set(:status, status_print(docstatus || "final"))
+        set(:errata, true) if ixml.at(ns("//errata"))
+        unpublished(docstatus) and
+          set(:stageabbr, stage_abbr(docstatus))
+      end
+
+      def unpublished(status)
+        !/^draft/.match(status).nil?
+      end
+
+      def status_print(status)
+        case status
+        when "draft-internal" then "Internal Draft"
+        when "draft-wip" then "Work-in-Progress Draft"
+        when "draft-prelim" then "Preliminary Draft"
+        when "draft-public" then "Public Draft"
+        when "draft-approval" then "Approval Draft"
+        when "final" then "Final"
+        when "final-review" then "Under Review"
+        when "final-withdrawn" then "Withdrawn"
+        end
+      end
+
+      def docid(ixml, _out)
+        docid = ixml.at(ns("//bibdata/docidentifier[@type = 'NIST']"))&.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))
+        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)
+      end
+
+      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(ixml)
+        prefix = "DRAFT "
+        iter and prefix += "(#{iter}) "
+        prefix
+      end
+
+      def iter_code(ixml)
+        docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
+        iter = ixml.at(ns("//bibdata/status/iteration"))&.text
+        status_abbr(docstatus, iter)
+      end
+
+      def iter_ordinal(ixml)
+        docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
+        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
+
+      def draftinfo(draft, revdate)
+        draftinfo = ""
+        if draft
+          draftinfo = " #{@labels["draft_label"]} #{draft}"
+        end
+        IsoDoc::Function::I18n::l10n(draftinfo, @lang, @script)
+      end
+    end
+  end
+end

data/lib/isodoc/nist/render.rb

@@ -1,5 +1,7 @@
 require "nokogiri"
 require "twitter_cldr"
+require_relative "render_contributors"
+require_relative "render_dates"
 
 module Iso690Render
 =begin
@@ -12,85 +14,6 @@ module Iso690Render
     parse(docxml.root, embedded)
   end
 
-=begin
-  def self.multiplenames_and(names)
-    return "" if names.length == 0
-    return names[0] if names.length == 1
-    return "#{names[0]} and #{names[1]}" if names.length == 2
-    names[0..-2].join(", ") + " and #{names[-1]}"
-  end
-=end
-
-  def self.multiplenames(names)
-    names.join(", ")
-  end
-
-  def self.extract_orgname(org)
-    name = org.at("./name")
-    name&.text || "--"
-  end
-
-  def self.frontname(given, initials)
-    if given.empty? && initials.empty? then ""
-    elsif initials.empty?
-      given.map{ |m| m.text[0] }.join("")
-    else
-      initials.map{ |m| m.text[0] }.join("")
-    end
-  end
-
-  def self.commajoin(a, b)
-    return a unless b
-    return b unless a
-    #"#{a}, #{b}"
-    "#{a} #{b}"
-  end
-
-  def self.extract_personname(person)
-    completename = person.at("./name/completename")
-    return completename.text if completename
-    surname = person.at("./name/surname")
-    initials = person.xpath("./name/initials")
-    forenames = person.xpath("./name/forename")
-    #given = []
-    #forenames.each { |x| given << x.text }
-    #given.empty? && initials.each { |x| given << x.text }
-    commajoin(surname&.text, frontname(forenames, initials))
-  end
-
-  def self.extractname(contributor)
-    org = contributor.at("./organization")
-    person = contributor.at("./person")
-    return extract_orgname(org) if org
-    return extract_personname(person) if person
-    "--"
-  end
-
-  def self.contributorRole(contributors)
-    return "" unless contributors.length > 0
-    if contributors[0]&.at("role/@type")&.text == "editor"
-      return contributors.length > 1 ? " (Eds.)" : "(Ed.)"
-    end
-    ""
-  end
-
-  def self.creatornames(doc)
-    cr = doc.xpath("./contributor[role/@type = 'author']") 
-    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'performer']") 
-    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'adapter']") 
-    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'translator']") 
-    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'editor']") 
-    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'publisher']") 
-    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'distributor']") 
-    cr.empty? and cr = doc.xpath("./contributor")
-    cr.empty? and return ""
-    ret = []
-    cr.each do |x|
-      ret << extractname(x)
-    end
-    multiplenames(ret) + contributorRole(cr)
-  end
-
   def self.title(doc)
     doc&.at("./title")&.text
   end
@@ -131,34 +54,6 @@ module Iso690Render
     ret
   end
 
-  def self.date1(date)
-    return nil if date.nil?
-    on = date&.at("./on")&.text
-    from = date&.at("./from")&.text
-    to = date&.at("./to")&.text
-    return MMMddyyyy(on) if on
-    return "#{MMMddyyyy(from)}&ndash;#{MMMddyyyy(to)}" if from
-    nil
-  end
-
-  def self.date(doc)
-    updated = date1(doc&.at("./date[@type = 'updated']"))
-    pub = date1(doc&.at("./date[@type = 'issued']"))
-    if pub
-      ret = pub
-      ret += " (updated #{updated})" if updated
-      return ret
-    end
-    pub = date1(doc&.at("./date[@type = 'circulated']")) and
-      return pub
-    date1(doc&.at("./date"))
-  end
-
-  def self.year(date)
-    return nil if date.nil?
-    date.sub(/^(\d\d\d\d).*$/, "\\1")
-  end
-
   def self.series_title(doc)
     s = doc.at("./series[@type = 'main']") ||
       doc.at("./series[not(@type)]") ||
@@ -260,43 +155,6 @@ module Iso690Render
     ret.join(", ")
   end
 
-=begin
-  def self.monthyr(isodate)
-    return nil if isodate.nil?
-    arr = isodate.split("-")
-    date = if arr.size == 2
-      DateTime.new(*arr.map(&:to_i))
-    else
-      DateTime.parse(isodate)
-    end
-    date.localize(:en).to_additional_s("yMMMM")
-  end
-
-  def self.mmddyyyy(isodate)
-    return nil if isodate.nil?
-    arr = isodate.split("-")
-    date = if arr.size == 1 and (/^\d+$/.match isodate)
-             Date.new(*arr.map(&:to_i)).strftime("%Y")
-      elsif arr.size == 2
-      Date.new(*arr.map(&:to_i)).strftime("%m-%Y")
-    else
-      Date.parse(isodate).strftime("%m-%d-%Y")
-    end
-  end
-=end
-
-  def self.MMMddyyyy(isodate)
-    return nil if isodate.nil?
-    arr = isodate.split("-")
-    date = if arr.size == 1 and (/^\d+$/.match isodate)
-             Date.new(*arr.map(&:to_i)).strftime("%Y")
-           elsif arr.size == 2
-             Date.new(*arr.map(&:to_i)).strftime("%B %Y")
-           else
-             Date.parse(isodate).strftime("%B %d, %Y")
-           end
-  end
-
   def self.draft(doc)
     return nil unless is_nist(doc)
     dr = doc&.at("./status/stage")&.text

data/lib/isodoc/nist/render_contributors.rb

@@ -0,0 +1,80 @@
+module Iso690Render
+=begin
+  def self.multiplenames_and(names)
+    return "" if names.length == 0
+    return names[0] if names.length == 1
+    return "#{names[0]} and #{names[1]}" if names.length == 2
+    names[0..-2].join(", ") + " and #{names[-1]}"
+  end
+=end
+
+  def self.multiplenames(names)
+    names.join(", ")
+  end
+
+  def self.extract_orgname(org)
+    name = org.at("./name")
+    name&.text || "--"
+  end
+
+  def self.frontname(given, initials)
+    if given.empty? && initials.empty? then ""
+    elsif initials.empty?
+      given.map{ |m| m.text[0] }.join("")
+    else
+      initials.map{ |m| m.text[0] }.join("")
+    end
+  end
+
+  def self.commajoin(a, b)
+    return a unless b
+    return b unless a
+    #"#{a}, #{b}"
+    "#{a} #{b}"
+  end
+
+  def self.extract_personname(person)
+    completename = person.at("./name/completename")
+    return completename.text if completename
+    surname = person.at("./name/surname")
+    initials = person.xpath("./name/initials")
+    forenames = person.xpath("./name/forename")
+    #given = []
+    #forenames.each { |x| given << x.text }
+    #given.empty? && initials.each { |x| given << x.text }
+    commajoin(surname&.text, frontname(forenames, initials))
+  end
+
+  def self.extractname(contributor)
+    org = contributor.at("./organization")
+    person = contributor.at("./person")
+    return extract_orgname(org) if org
+    return extract_personname(person) if person
+    "--"
+  end
+
+    def self.contributorRole(contributors)
+    return "" unless contributors.length > 0
+    if contributors[0]&.at("role/@type")&.text == "editor"
+      return contributors.length > 1 ? " (Eds.)" : "(Ed.)"
+    end
+    ""
+  end
+
+  def self.creatornames(doc)
+    cr = doc.xpath("./contributor[role/@type = 'author']")
+    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'performer']")
+    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'adapter']")
+    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'translator']")
+    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'editor']")
+    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'publisher']")
+    cr.empty? and cr = doc.xpath("./contributor[role/@type = 'distributor']")
+    cr.empty? and cr = doc.xpath("./contributor")
+    cr.empty? and return ""
+    ret = []
+    cr.each do |x|
+      ret << extractname(x)
+    end
+    multiplenames(ret) + contributorRole(cr)
+  end
+end

data/lib/isodoc/nist/render_dates.rb

@@ -0,0 +1,66 @@
+module Iso690Render
+  def self.date1(date)
+    return nil if date.nil?
+    on = date&.at("./on")&.text
+    from = date&.at("./from")&.text
+    to = date&.at("./to")&.text
+    return MMMddyyyy(on) if on
+    return "#{MMMddyyyy(from)}–#{MMMddyyyy(to)}" if from
+    nil
+  end
+
+  def self.date(doc)
+    updated = date1(doc&.at("./date[@type = 'updated']"))
+    pub = date1(doc&.at("./date[@type = 'issued']"))
+    if pub
+      ret = pub
+      ret += " (updated #{updated})" if updated
+      return ret
+    end
+    pub = date1(doc&.at("./date[@type = 'circulated']")) and
+      return pub
+    date1(doc&.at("./date"))
+  end
+
+  def self.year(date)
+    return nil if date.nil?
+    date.sub(/^(\d\d\d\d).*$/, "\\1")
+  end
+
+=begin
+  def self.monthyr(isodate)
+    return nil if isodate.nil?
+    arr = isodate.split("-")
+    date = if arr.size == 2
+      DateTime.new(*arr.map(&:to_i))
+    else
+      DateTime.parse(isodate)
+    end
+    date.localize(:en).to_additional_s("yMMMM")
+  end
+
+  def self.mmddyyyy(isodate)
+    return nil if isodate.nil?
+    arr = isodate.split("-")
+    date = if arr.size == 1 and (/^\d+$/.match isodate)
+             Date.new(*arr.map(&:to_i)).strftime("%Y")
+      elsif arr.size == 2
+      Date.new(*arr.map(&:to_i)).strftime("%m-%Y")
+    else
+      Date.parse(isodate).strftime("%m-%d-%Y")
+    end
+  end
+=end
+
+  def self.MMMddyyyy(isodate)
+    return nil if isodate.nil?
+    arr = isodate.split("-")
+    date = if arr.size == 1 and (/^\d+$/.match isodate)
+             Date.new(*arr.map(&:to_i)).strftime("%Y")
+           elsif arr.size == 2
+             Date.new(*arr.map(&:to_i)).strftime("%B %Y")
+           else
+             Date.parse(isodate).strftime("%B %d, %Y")
+           end
+  end
+end

data/lib/isodoc/nist/word_convert.rb

@@ -3,6 +3,7 @@ require_relative "metadata"
 require "fileutils"
 require "sassc"
 require_relative "base_convert"
+require_relative "word_convert_toc"
 
 module IsoDoc
   module NIST
@@ -31,25 +32,21 @@ module IsoDoc
       end
 
       def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+        { bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
                      '"Times New Roman",serif'),
           headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
                                   '"Arial",sans-serif'),
-          monospacefont: '"Courier New",monospace'
-        }
+          monospacefont: '"Courier New",monospace' }
       end
 
       def default_file_locations(_options)
-        {
-          wordstylesheet: html_doc_path("wordstyle.scss"),
+        { wordstylesheet: html_doc_path("wordstyle.scss"),
           standardstylesheet: html_doc_path("nist.scss"),
           header: html_doc_path("header.html"),
           wordcoverpage: html_doc_path("word_nist_titlepage.html"),
           wordintropage: html_doc_path("word_nist_intro.html"),
           ulstyle: "l3",
-          olstyle: "l2",
-        }
+          olstyle: "l2" }
       end
 
       def metadata_init(lang, script, labels)
@@ -138,86 +135,6 @@ module IsoDoc
         word_annex_cleanup1(docxml, 6)
       end
 
-      def toc_insert(docxml, level)
-        insertion = docxml.at("//div[h1 = 'Executive Summary']/"\
-                              "preceding-sibling::div[h1][1]") ||
-        docxml.at("//div[@class = 'WordSection2']/child::*[last()]")
-        if docxml.at("//p[@class = 'TableTitle']")
-          insertion.next = make_TableWordToC(docxml)
-          insertion.next = %{<p class="TOCTitle">List of Tables</p>}
-        end
-        if docxml.at("//p[@class = 'FigureTitle']")
-          insertion.next = make_FigureWordToC(docxml)
-          insertion.next = %{<p class="TOCTitle">List of Figures</p>}
-        end
-        if docxml.at("//p[@class = 'h1Annex']")
-          insertion.next = make_AppendixWordToC(docxml)
-          insertion.next = %{<p class="TOCTitle">List of Appendices</p>}
-        end
-        insertion.next = make_WordToC(docxml, level)
-        insertion.next = %{<p class="TOCTitle" style="page-break-before:
-        always;">Table of Contents</p>}
-        docxml
-      end
-
-      WORD_TOC_APPENDIX_PREFACE1 = <<~TOC.freeze
-      <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;h1Annex,1,h2Annex,2,h3Annex,3&quot; <span
-        style='mso-element:field-separator'></span></span>
-      TOC
-
-      WORD_TOC_TABLE_PREFACE1 = <<~TOC.freeze
-      <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;TableTitle,1&quot; <span
-        style='mso-element:field-separator'></span></span>
-      TOC
-
-      WORD_TOC_FIGURE_PREFACE1 = <<~TOC.freeze
-      <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;FigureTitle,1&quot; <span
-        style='mso-element:field-separator'></span></span>
-      TOC
-
-      def header_strip(h)
-        h = h.to_s.gsub(/<\/?p[^>]*>/, "").
-          gsub(%r{<a [^>]+>[^<]+</a><aside>.*</aside>}m, "")
-        super
-      end
-
-      def make_TableWordToC(docxml)
-        toc = ""
-        docxml.xpath("//p[@class = 'TableTitle']").each do |h|
-          toc += word_toc_entry(1, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) +  WORD_TOC_SUFFIX1
-      end
-
-      def make_FigureWordToC(docxml)
-        toc = ""
-        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
-          toc += word_toc_entry(1, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) +  WORD_TOC_SUFFIX1
-      end
-
-      def make_AppendixWordToC(docxml)
-        toc = ""
-        docxml.xpath("//p[@class = 'h1Annex'] | //p[@class = 'h2Annex'] | "\
-                     "p[@class = 'h3Annex']").each do |h|
-          toc += word_toc_entry(h["class"][1].to_i, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_APPENDIX_PREFACE1}}) +  WORD_TOC_SUFFIX1
-      end
-
       def word_preface_cleanup(docxml)
         docxml.xpath("//h1[@class = 'AbstractTitle'] | "\
                      "//h1[@class = 'IntroTitle'] | "\

data/lib/isodoc/nist/word_convert_toc.rb

@@ -0,0 +1,86 @@
+module IsoDoc
+  module NIST
+    class WordConvert < IsoDoc::WordConvert
+      def toc_insert(docxml, level)
+        insertion = docxml.at("//div[h1 = 'Executive Summary']/"\
+                              "preceding-sibling::div[h1][1]") ||
+        docxml.at("//div[@class = 'WordSection2']/child::*[last()]")
+        if docxml.at("//p[@class = 'TableTitle']")
+          insertion.next = make_TableWordToC(docxml)
+          insertion.next = %{<p class="TOCTitle">List of Tables</p>}
+        end
+        if docxml.at("//p[@class = 'FigureTitle']")
+          insertion.next = make_FigureWordToC(docxml)
+          insertion.next = %{<p class="TOCTitle">List of Figures</p>}
+        end
+        if docxml.at("//p[@class = 'h1Annex']")
+          insertion.next = make_AppendixWordToC(docxml)
+          insertion.next = %{<p class="TOCTitle">List of Appendices</p>}
+        end
+        insertion.next = make_WordToC(docxml, level)
+        insertion.next = %{<p class="TOCTitle" style="page-break-before:
+        always;">Table of Contents</p>}
+        docxml
+      end
+
+      WORD_TOC_APPENDIX_PREFACE1 = <<~TOC.freeze
+      <span lang="EN-GB"><span
+        style='mso-element:field-begin'></span><span
+        style='mso-spacerun:yes'>&#xA0;</span>TOC
+        \\h \\z \\t &quot;h1Annex,1,h2Annex,2,h3Annex,3&quot; <span
+        style='mso-element:field-separator'></span></span>
+      TOC
+
+      WORD_TOC_TABLE_PREFACE1 = <<~TOC.freeze
+      <span lang="EN-GB"><span
+        style='mso-element:field-begin'></span><span
+        style='mso-spacerun:yes'>&#xA0;</span>TOC
+        \\h \\z \\t &quot;TableTitle,1&quot; <span
+        style='mso-element:field-separator'></span></span>
+      TOC
+
+      WORD_TOC_FIGURE_PREFACE1 = <<~TOC.freeze
+      <span lang="EN-GB"><span
+        style='mso-element:field-begin'></span><span
+        style='mso-spacerun:yes'>&#xA0;</span>TOC
+        \\h \\z \\t &quot;FigureTitle,1&quot; <span
+        style='mso-element:field-separator'></span></span>
+      TOC
+
+      def header_strip(h)
+        h = h.to_s.gsub(/<\/?p[^>]*>/, "").
+          gsub(%r{<a [^>]+>[^<]+</a><aside>.*</aside>}m, "")
+        super
+      end
+
+      def make_TableWordToC(docxml)
+        toc = ""
+        docxml.xpath("//p[@class = 'TableTitle']").each do |h|
+          toc += word_toc_entry(1, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) +  WORD_TOC_SUFFIX1
+      end
+
+      def make_FigureWordToC(docxml)
+        toc = ""
+        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
+          toc += word_toc_entry(1, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) +  WORD_TOC_SUFFIX1
+      end
+
+      def make_AppendixWordToC(docxml)
+        toc = ""
+        docxml.xpath("//p[@class = 'h1Annex'] | //p[@class = 'h2Annex'] | "\
+                     "p[@class = 'h3Annex']").each do |h|
+          toc += word_toc_entry(h["class"][1].to_i, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{WORD_TOC_APPENDIX_PREFACE1}}) +  WORD_TOC_SUFFIX1
+      end
+    end
+  end
+end
+

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "0.2.14"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 1.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -294,10 +294,14 @@ files:
 - lib/isodoc/nist/html_convert.rb
 - lib/isodoc/nist/i18n-en.yaml
 - lib/isodoc/nist/metadata.rb
+- lib/isodoc/nist/metadata_id.rb
 - lib/isodoc/nist/pdf_convert.rb
 - lib/isodoc/nist/refs.rb
 - lib/isodoc/nist/render.rb
+- lib/isodoc/nist/render_contributors.rb
+- lib/isodoc/nist/render_dates.rb
 - lib/isodoc/nist/word_convert.rb
+- lib/isodoc/nist/word_convert_toc.rb
 - lib/isodoc/nist/xrefs.rb
 - lib/metanorma-nist.rb
 - lib/metanorma/nist.rb