metanorma-nist 1.2.9 → 1.2.14

data/lib/isodoc/nist/pdf_convert.rb

@@ -14,7 +14,11 @@ module IsoDoc
 
       def pdf_stylesheet(docxml)
         series =  docxml&.at(ns("//bibdata/series/abbreviation"))&.text
-        series == "NIST CSWP" ?  "nist.cswp.xsl" : "nist.sp.xsl"
+        case series
+        when "NIST CSWP" then "nist.cswp.xsl" 
+        when "NIST CSTS" then "nist.csts.xsl" 
+        else "nist.sp.xsl"
+        end
       end
     end
   end

data/lib/isodoc/nist/presentation_xml_convert.rb

@@ -22,10 +22,8 @@ module IsoDoc
       def get_linkend(node)
         contents = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
         return unless contents.empty?
-        link = anchor_linkend(node, docid_l10n(node["target"] ||
-                                               wrap_brackets(node['citeas'])))
-        link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
-                                link)
+        link = anchor_linkend(node, docid_l10n(node["target"] || wrap_brackets(node['citeas'])))
+        link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link)
         non_locality_elems(node).each { |n| n.remove }
         node.add_child(link)
       end
@@ -57,15 +55,12 @@ module IsoDoc
         elsif foreword = docxml.at(ns("//preface/foreword"))
           foreword.next = keyword_clause(kw)
         else
-          preface_init_insert_pt(docxml)&.children&.first&.
-            add_previous_sibling(keyword_clause(kw))
+          preface_init_insert_pt(docxml)&.children&.first&.add_previous_sibling(keyword_clause(kw))
         end
       end
 
       def preface_init_insert_pt(docxml)
-        docxml.at(ns("//preface")) ||
-          docxml.at(ns("//sections")).
-          add_previous_sibling("<preface> </preface>").first
+        docxml.at(ns("//preface")) || docxml.at(ns("//sections")).add_previous_sibling("<preface> </preface>").first
       end
 
       def clause1(f)
@@ -73,8 +68,33 @@ module IsoDoc
         super
       end
 
+      def references(docxml)
+        docxml.xpath(ns("//references/bibitem")).each do |x|
+          bibitem(x)
+        end
+        @xrefs.parse docxml
+      end
+
+      def bracket_if_num(x)
+        return nil if x.nil?
+        x = x.text.sub(/^\[/, "").sub(/\]$/, "")
+        "[#{x}]"
+      end
+
+      def bibitem(x)
+        if f = x.at(ns("./formattedref"))
+          code = render_identifier(bibitem_ref_code(x))
+          f << " [#{code[1]}] " if code[1]
+        else
+          x.children = ::Iso690Render.render(x.to_xml)
+        end
+        if id =  x.at(ns("./docidentifier[@type = 'metanorma']"))
+          id["display"] = "true"
+          id.children =  bracket_if_num(id)
+        end
+      end
+
       include Init
     end
   end
 end
-

data/lib/isodoc/nist/refs.rb

@@ -8,11 +8,7 @@ module IsoDoc
       # we are taking the ref number/code out as prefix to reference
       def nonstd_bibitem(list, b, ordinal, bibliography)
         list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
-          if !b.at(ns("./formattedref"))
-            nist_reference_format(b, r)
-          else
             reference_format(b, r)
-          end
         end
       end
 
@@ -21,13 +17,11 @@ module IsoDoc
       end
 
       def reference_format(b, r)
-        code = render_identifier(bibitem_ref_code(b))
-        if code[0]
-          r << "#{code[0]} "
+        if code = b.at(ns("./docidentifier[@display = 'true']"))
+          r << code.text
           insert_tab(r, 1)
         end
         reference_format1(b, r)
-        r << " [#{code[1]}] " if code[1]
       end
 
       def reference_format1(b, r)
@@ -52,22 +46,12 @@ module IsoDoc
         super || prefix == "NIST"
       end
 
-      def nist_reference_format(b, r)
-        code = render_identifier(bibitem_ref_code(b))
-        if code[0]
-          r << "#{code[0]} "
-          insert_tab(r, 1)
-        end
-        bibitem = b.dup.to_xml
-        r.parent.add_child ::Iso690Render.render(bibitem, true)
-      end
-
       def bibliography_parse(node, out)
         return if node["hidden"] == "true"
         title = node&.at(ns("./title"))&.text || ""
         out.div do |div|
           unless suppress_biblio_title(node)
-              clause_parse_title(node, div, node.at(ns("./title")), out)
+            clause_parse_title(node, div, node.at(ns("./title")), out)
           end
           biblio_list(node, div, true)
         end
@@ -80,7 +64,7 @@ module IsoDoc
           next if f["hidden"] == "true"
           out.div do |div|
             div.h1 **{ class: "Section3" } do |h1|
-                f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
+              f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
             end
             biblio_list(f, div, false)
           end

data/lib/isodoc/nist/render.rb

@@ -18,6 +18,10 @@ module Iso690Render
     doc&.at("./medium")&.text
   end
 
+  def self.blank?(x)
+    x.nil? || x.empty?
+  end
+
 =begin
   def self.edition(doc)
     x = doc.at("./edition")
@@ -51,19 +55,14 @@ module Iso690Render
   end
 
   def self.series_title(doc)
-    s = doc.at("./series[@type = 'main']") ||
-      doc.at("./series[not(@type)]") ||
-      doc.at("./series")
+    s = doc.at("./series[@type = 'main']") || doc.at("./series[not(@type)]") || doc.at("./series")
     s&.at("./title")&.text
   end
 
   def self.series(doc, type)
-    s = doc.at("./series[@type = 'main']") || 
-      doc.at("./series[not(@type)]") ||
-      doc.at("./series")
+    s = doc.at("./series[@type = 'main']") || doc.at("./series[not(@type)]") || doc.at("./series")
     return "" unless s
-    f = s.at("./formattedref")
-    return f.text if f
+    f = s.at("./formattedref") and return f.text
     t = s.at("./title")
     a = s.at("./abbreviation")
     n = s.at("./number")
@@ -72,7 +71,7 @@ module Iso690Render
     rev = doc&.at(".//edition")&.text&.sub(/^Revision /, "")
     ret = ""
     if t
-      title = included(type) ? wrap(t.text, " <I>", "</I>") : wrap(t.text, " ", "")
+      title = included(type) ? wrap(t.text, " <em>", "</em>") : wrap(t.text, " ", "")
       ret += title
       ret += " (#{a.text.sub(/^NIST /, "")})" if a
     end
@@ -97,16 +96,13 @@ module Iso690Render
 
   def self.standardidentifier1(id)
     r = ""
-    r += "#{id['type']} " if id["type"] and
-      !%w(ISO IEC NIST).include? id["type"]
+    r += "#{id['type']} " if id["type"] and !%w(ISO IEC NIST).include? id["type"]
     r += id.text
     r
   end
 
   def self.uri(doc)
-    uri = doc.at("./uri[@type = 'doi']") ||
-      doc.at("./uri[@type = 'uri']") ||
-      doc.at("./uri")
+    uri = doc.at("./uri[@type = 'doi']") || doc.at("./uri[@type = 'uri']") || doc.at("./uri")
     uri&.text
   end
 
@@ -120,7 +116,7 @@ module Iso690Render
   end
 
   def self.wrap(text, startdelim = " ", enddelim = ".")
-    return "" if text.nil? || text.empty?
+    return "" if blank?(text)
     "#{startdelim}#{text}#{enddelim}"
   end
 
@@ -145,8 +141,7 @@ module Iso690Render
   def self.extent1(localities)
     ret = []
     localities.each do |l|
-      ret << extent2(l["type"] || "page", 
-                     l.at("./referenceFrom"), l.at("./referenceTo"))
+      ret << extent2(l["type"] || "page", l.at("./referenceFrom"), l.at("./referenceTo"))
     end
     ret.join(", ")
   end
@@ -199,53 +194,60 @@ module Iso690Render
     end
   end
 
+  # converting bibitem to <formattedref> + <docidentifier>
   def self.parse(doc, embedded = false)
-    ret = ""
     f = doc.at("./formattedref") and 
-      return embedded ? f.children.to_xml : "<p>#{f.children.to_xml}</p>"
+      return embedded ? f.children.to_xml : doc.to_xml
 
+    ret = ""
     type = type(doc)
     container = doc.at("./relation[@type='includedIn']")
     if container && !date(doc) && date(container&.at("./bibitem"))
-      doc << 
-      ( container&.at("./bibitem/date[@type = 'issued' or @type = 'published' or "\
+      doc << ( container&.at("./bibitem/date[@type = 'issued' or @type = 'published' or "\
                       "@type = 'circulated']")&.remove )
     end
-    ser = series_title(doc)
     dr = draft(doc)
-
+    cr = creatornames(doc)
     # NIST has seen fit to completely change rendering based on the type of publication.
-    if ser == "NIST Federal Information Processing Standards"
-      ret += "National Institute of Standards and Technology"
-    else
-      ret += embedded ? wrap(creatornames(doc), "", "") : wrap(creatornames(doc), "", "")
+    if series_title(doc) == "NIST Federal Information Processing Standards"
+      cr = "National Institute of Standards and Technology"
     end
+    pub = placepub(doc)
+
+    ret += wrap(cr, "", "")
     if dr
       mdy = MMMddyyyy(date(doc)) and ret += wrap(mdy, " (", ")")
     else
       yr = year(date(doc)) and ret += wrap(yr, " (", ")")
     end
-    ret += included(type) ? wrap(title(doc)) : wrap(title(doc), " <I>", "</I>.")
-    ret += wrap(medium(doc), " [", "].")
+    ret += included(type) ? wrap(title(doc), " ", "") : wrap(title(doc), " <em>", "</em>")
+    ret += wrap(medium(doc), " [", "]")
     #ret += wrap(edition(doc), "", " edition.")
-    s = series(doc, type)
-    ret += wrap(placepub(doc), " (", "),")
+    if cr != pub
+      ret += wrap(pub, " (", ")")
+    end
+    if cr != pub && pub && !pub.empty? && (dr || !blank?(series(doc, type)))
+      ret += ","
+    end
     if dr
       ret += " Draft (#{dr})"
     end
     ret += wrap(series(doc, type), " ", "")
-    ret += "," if !series(doc, type).empty? && date(doc)
-    ret += wrap(date(doc))
-    ret += wrap(standardidentifier(doc)) unless is_nist(doc)
-    ret += wrap(uri(doc))
-    ret += wrap(accessLocation(doc), " At: ", ".")
+    ret += wrap(date(doc), ", ", "")
+    ret += wrap(standardidentifier(doc), ". ", "") unless is_nist(doc)
+    ret += wrap(uri(doc), ". ", "")
+    ret += wrap(accessLocation(doc), ". At: ", "")
     if container 
-      ret += wrap(parse(container.at("./bibitem"), true), " In: ", "")
+      ret += wrap(parse(container.at("./bibitem"), true), ". In: ", "")
       locality = doc.xpath("./extent")
-      ret += wrap(extent(locality))
+      ret += wrap(extent(locality), ", " , "")
     else
-      ret += wrap(extent(doc.xpath("./extent")))
+      ret += wrap(extent(doc.xpath("./extent")), ", ", "")
     end
-    embedded ? ret : "<p>#{ret}</p>"
+    if !embedded
+      ret += "."
+    end
+
+    embedded ? ret : "<formattedref>#{ret}</formattedref>#{doc.xpath('./docidentifier').to_xml}"
   end
 end

data/lib/isodoc/nist/render_dates.rb

@@ -17,8 +17,7 @@ module Iso690Render
       ret += " (updated #{updated})" if updated
       return ret
     end
-    pub = date1(doc&.at("./date[@type = 'circulated']")) and
-      return pub
+    pub = date1(doc&.at("./date[@type = 'circulated']")) and return pub
     date1(doc&.at("./date"))
   end
 
@@ -31,12 +30,12 @@ module Iso690Render
     return nil if isodate.nil?
     return isodate if isodate == "--"
     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
+    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

@@ -22,10 +22,11 @@ module IsoDoc
 
       def convert1(docxml, filename, dir)
         @series =  docxml&.at(ns("//bibdata/series/abbreviation"))&.text
+        @cswp = ["NIST CSWP", "NIST CSTS"].include?(@series)
         @bibliographycount =
           docxml.xpath(ns("//bibliography/references | //annex/references | "\
                           "//bibliography/clause/references")).size
-        if @series == "NIST CSWP"
+        if @cswp
           @wordstylesheet_name = html_doc_path("wordstyle_cswp.scss")
           @standardstylesheet_name = html_doc_path("nist_cswp.scss")
           @wordcoverpage = html_doc_path("word_nist_titlepage_cswp.html")
@@ -36,10 +37,8 @@ module IsoDoc
       end
 
       def default_fonts(options)
-        { bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
-                     '"Times New Roman",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-                                  '"Arial",sans-serif'),
+        { bodyfont: '"Times New Roman",serif',
+          headerfont: '"Arial",sans-serif',
           monospacefont: '"Courier New",monospace',
           normalfontsize: "12.0pt",
           footnotefontsize: "10.0pt",
@@ -111,7 +110,7 @@ module IsoDoc
         auth1 = docxml&.at("//div[@id = 'authority6']")&.remove
         dest1 and auth1 and dest1.each { |d| d.replace(auth1) }
         insert = docxml.at("//div[@class = 'WordSection2']")
-        if @series != "NIST CSWP"
+        if @cswp
           auth = docxml&.at("//div[@class = 'authority']")&.remove || return
           insert.children.first.add_previous_sibling(auth)
         end

data/lib/isodoc/nist/xref.rb

@@ -4,6 +4,9 @@ require "fileutils"
 
 module IsoDoc
   module NIST
+    class Counter < IsoDoc::XrefGen::Counter
+    end
+
     class Xref < IsoDoc::Xref
       SECTIONS_XPATH =
         "//foreword | //introduction | //reviewnote | //executivesummary | //annex | "\
@@ -17,15 +20,18 @@ module IsoDoc
         @in_execsummary = true
         hierarchical_asset_names(d.xpath("//xmlns:executivesummary"), "ES")
         @in_execsummary = false
-        clause_names(d, 0)
+        c = Counter.new
+        clause_names(d, c)
         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)
+        i = Counter.new("@")
+        docxml.xpath(ns("//annex")).each do |c|
+          i.increment(c)
+          annex_names(c, i.print)
         end
         docxml.xpath(ns("//bibliography/clause | "\
                         "//bibliography/references")).each do |b|
@@ -44,8 +50,8 @@ module IsoDoc
 
       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)
+        docxml.xpath(q).each do |c|
+          section_names(c, sect_num, 1)
         end
       end
 

data/lib/metanorma/nist/processor.rb

@@ -17,6 +17,18 @@ module Metanorma
         )
       end
 
+      def fonts_manifest
+        {
+          "Arial" => nil,
+          "Calibri" => nil,
+          "Cambria" => nil,
+          "Courier" => nil,
+          "Courier New" => nil,
+          "STIX Two Math" => nil,
+          "Times New Roman" => nil,
+        }
+      end
+
       def version
         "Metanorma::NIST #{Metanorma::NIST::VERSION}"
       end

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.2.9"
+    VERSION = "1.2.14"
   end
 end

data/metanorma-nist.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "iso-639"
   spec.add_dependency "tzinfo-data" # we need this for windows only
 
-  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
-  spec.add_dependency "isodoc", "~> 1.3.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.8.2"
+  spec.add_dependency "isodoc", "~> 1.5.0"
   #spec.add_dependency "relaton-nist", "~> 0.3.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"