metanorma-nist 0.0.9 → 0.1.0

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

@@ -396,7 +396,7 @@ AABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAkwUAAAAA
       </td>
       <td width="323" valign="top" style='width:242.25pt;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'>{% if superseded_date %}{{ obsoleteddate_MMMddyyyy}}{% else %}{{ obsoleteddate_MMMddyyyy}}{% endif %}<o:p></o:p></span></p>
+      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'>{% if superseded_date %}{{ supersededdate_MMMddyyyy}}{% else %}{{ obsoleteddate_MMMddyyyy}}{% endif %}<o:p></o:p></span></p>
       </td>
      </tr>
      <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'>
@@ -409,7 +409,7 @@ AABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAkwUAAAAA
       </td>
       <td width="323" valign="top" style='width:242.25pt;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'>{{circulateddate_MMMddyyyy}}<o:p></o:p></span></p>
+      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'>{{issueddate_MMMddyyyy}}<o:p></o:p></span></p>
       </td>
      </tr>
     </table>

data/lib/isodoc/nist/html_convert.rb

@@ -51,6 +51,15 @@ module IsoDoc
         HEAD
       end
 
+      def toclevel
+        <<~HEAD.freeze
+    function toclevel() { var i; var text = "";
+      for(i = 1; i <= #{@htmlToClevels}; i++) {
+        if (i > 1) { text += ","; } text += "h" + i + ":not(:empty):not(.TermNum):not(.AbstractTitle):not(.IntroTitle):not(.ForewordTitle)"; }
+      return text;}
+        HEAD
+      end
+
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
         xml.body **body_attr do |body|
@@ -67,6 +76,7 @@ module IsoDoc
       def authority_cleanup(docxml)
         dest = docxml.at("//div[@id = 'authority']") || return
         auth = docxml.at("//div[@class = 'authority']") || return
+        auth.xpath(".//h1 | .//h2").each { |h| h["class"] = "IntroTitle" }
         dest.replace(auth.remove)
         a = docxml.at("//div[@id = 'authority1']") and a["class"] = "authority1"
         a = docxml.at("//div[@id = 'authority2']") and a["class"] = "authority2"

data/lib/isodoc/nist/metadata.rb

@@ -10,9 +10,9 @@ module IsoDoc
 
       def iter_abbr(stage, iter)
         return "F" if iter&.downcase == "final" &&
-          %w(draft-wip draft-prelim draft-public).include?(stage)
+          %w(draft-wip draft-prelim draft-public draft-approval).include?(stage)
         case stage
-        when "draft-wip", "draft-prelim"
+        when "draft-wip", "draft-prelim", "dradt-internal", "draft-approval"
           iter || ""
         when "draft-public"
           iter ||= "1"
@@ -24,10 +24,11 @@ module IsoDoc
 
       def stage_abbr(stage, iter)
         case stage
-        when "draft-internal" then "Internal"
+        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
@@ -50,7 +51,7 @@ module IsoDoc
       end
 
       def author(ixml, _out)
-        tc = ixml.at(ns("//bibdata/editorialgroup/committee"))
+        tc = ixml.at(ns("//bibdata/ext/editorialgroup/committee"))
         set(:tc, tc.text.upcase) if tc
         personal_authors(ixml)
         subdiv = ixml.at(ns("//bibdata/contributor[role/@type = 'publisher']/"\
@@ -59,7 +60,7 @@ module IsoDoc
       end
 
       def docid(ixml, _out)
-        docid = ixml.at(ns("//bibdata/docidentifier[@type = 'nist']"))&.text
+        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
@@ -88,16 +89,6 @@ module IsoDoc
         prefix
       end
 
-      def iter_code(ixml)
-        docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
-        return nil unless docstatus == "draft-public"
-        iter = ixml.at(ns("//bibdata/status/iteration"))&.text || "1"
-        return "IPD" if iter == "1"
-        return "FPD" if iter.downcase == "final"
-        "#{iter}PD"
-      end
-
-      # override the above
       def iter_code(ixml)
         docstatus = ixml.at(ns("//bibdata/status/stage"))&.text
         iter = ixml.at(ns("//bibdata/status/iteration"))&.text
@@ -106,7 +97,6 @@ module IsoDoc
 
       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?
@@ -140,6 +130,7 @@ module IsoDoc
         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"
@@ -148,7 +139,8 @@ module IsoDoc
 
       def version(ixml, _out)
         super
-        set(:revision, ixml&.at(ns("//bibdata/revision"))&.text)
+        rev = ixml&.at(ns("//bibdata/edition"))&.text&.sub(/^Revision /, "")
+        set(:revision, rev) if rev
         revdate = get[:revdate]
         set(:revdate_monthyear, monthyr(revdate))
         set(:revdate_MMMddyyyy, MMMddyyyy(revdate))
@@ -223,16 +215,16 @@ module IsoDoc
 
       def keywords(ixml, _out)
         keywords = []
-        ixml.xpath(ns("//bibdata/keyword")).each do |kw|
+        ixml.xpath(ns("//bibdata/ext/keyword")).each do |kw|
           keywords << kw.text
         end
         set(:keywords, keywords)
       end
 
       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
+        from = ixml.at(ns("//bibdata/ext/commentperiod/from"))&.text
+        to = ixml.at(ns("//bibdata/ext/commentperiod/to"))&.text
+        extended = ixml.at(ns("//bibdata/ext/commentperiod/extended"))&.text
         set(:comment_from, from) if from
         set(:comment_to, to) if to
         set(:comment_extended, extended) if extended
@@ -272,7 +264,7 @@ module IsoDoc
         set(:superseding_status,
             status_print(d.at(ns("./status/stage"))&.text || "final"))
         superseding_iteration(d)
-        docid = d.at(ns("./docidentifier[@type = 'nist']"))&.text and
+        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)

data/lib/isodoc/nist/pdf_convert.rb

@@ -43,28 +43,20 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
 
-      def html_head()
+      def googlefonts
         <<~HEAD.freeze
-        <title>{{ doctitle }}</title>
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-
-    <!--TOC script import-->
-    <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
-    <script type="text/javascript">
-    function toclevel() { var i; var text = "";
-      for(i = 1; i <= #{@htmlToClevels}; i++) {
-        if (i > 1) { text += ","; } text += "h" + i + ":not(.TermNum)"; } }
-    </script>
-
-    <!--Google fonts-->
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,600,600i" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet" />
     <link href="https://fonts.googleapis.com/css?family=Libre+Baskerville:400,400i,700,700i" rel="stylesheet">
+        HEAD
+      end
 
-    <!--Font awesome import for the link icon-->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
-<style class="anchorjs"></style>
+      def toclevel
+        <<~HEAD.freeze
+    function toclevel() { var i; var text = "";
+      for(i = 1; i <= #{@htmlToClevels}; i++) {
+        if (i > 1) { text += ","; } text += "h" + i + ":not(:empty):not(.TermNum):not(.AbstractTitle):not(.IntroTitle):not(.ForewordTitle)"; }
+      return text;}
         HEAD
       end
 
@@ -98,7 +90,7 @@ 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 = '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"

data/lib/isodoc/nist/render.rb

@@ -172,7 +172,7 @@ module Iso690Render
     n = s.at("./number")
     p = s.at("./partnumber")
     dn = doc.at("./docnumber")
-    rev = doc.at(".//revision")
+    rev = doc&.at(".//edition")&.text.sub(/^Revision /, "")
     ret = ""
     if t
       title = included(type) ? wrap(t.text, " <I>", "</I>") : wrap(t.text, " ", "")
@@ -184,13 +184,14 @@ module Iso690Render
       ret += ".#{p.text}" if p
     elsif dn && is_nist(doc)
       ret += " #{dn.text}"
-      ret += " Rev. #{rev.text}" if rev
+      ret += " Rev. #{rev}" if rev
     end
     ret
   end
 
   def self.standardidentifier(doc)
     ret = []
+    require "byebug"; byebug
     doc.xpath("./docidentifier").each do |id|
       next if %w(nist-mr nist-long).include? id["type"]
       ret << standardidentifier1(id)
@@ -200,8 +201,9 @@ module Iso690Render
 
   def self.standardidentifier1(id)
     r = ""
+    require "byebug"; byebug
     r += "#{id['type']} " if id["type"] and
-      !%w(ISO IEC nist).include? id["type"]
+      !%w(ISO IEC NIST).include? id["type"]
     r += id.text
     r
   end
@@ -294,11 +296,9 @@ module Iso690Render
     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 "draft-approval" then "Approval Draft"
     when "final" then "Final"
     when "final-review" then "Under Review"
-    when "final-withdrawn" then "Withdrawn"
     end
   end
 

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

data/metanorma-nist.gemspec

@@ -22,15 +22,17 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "twitter_cldr"
-  spec.add_dependency "tzinfo-data" if RUBY_PLATFORM =~ /mswin|mingw/i
+  spec.add_dependency "tzinfo-data" # we need this for windows only
 
-  spec.add_dependency "metanorma-standoc", "~> 1.1.0"
-  spec.add_dependency "isodoc", "~> 0.9.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 0.10.0"
+  spec.add_dependency "relaton-nist", "~> 0.2.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug", "~> 9.1"
@@ -43,5 +45,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.3.0"
-  spec.add_development_dependency "nistbib", "~> 0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -66,34 +66,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: relaton-nist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -248,20 +276,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: nistbib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 description: 'Metanorma NIST gem.
 
   '
@@ -332,7 +346,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -340,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Metanorma NIST gem.