metanorma-nist 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d4336b5e5cd72fefe2e42d96ffdc559a438aad39e71e3f8dca8bed5c6a926c9
-  data.tar.gz: 4a926e7415482403215b1bc1f6d1b80b642cfc484b0484bea918bbe670fb0716
+  metadata.gz: efbc5ed91c60f75c2357b75e8e4b46aff94fbbda2e5ff42b5ae23ccdacee11b8
+  data.tar.gz: e11867a00497daa2adde0df1a6589fa8100e3ede705e9c35aabb06083b5bee95
 SHA512:
-  metadata.gz: 80c9d531f6c049b6a786127c3e1ed4826a1fe65a67a2d15464abe957827b270e01a1723792f5f279021853a8d17234b737b0e9a21d9ff70a61028ab88ddf1622
-  data.tar.gz: 49393e419f14a068b5cb92aec30ad00422195da412ffd6bdab43e4eead7e3ea726efd18d91e1c61d186614a0f351963db545e3751efff958a420ffb4647a9b18
+  metadata.gz: b22030c9411714d60f7d5a4331ebdb558801a4054844658179c82ce8df69cb7893d38ba704438df0092407e4708d3b7317ce83221aa82db768f90ba85e994a7f
+  data.tar.gz: c8f098eec3c4b877b86425f06bfc5d82c5b4e0dbd9472a75073ce18389d0ded1936923348d1d51050df38c663f8f3689e4bf72b3be7b5fc06a64d68b6308a825

data/README.adoc

@@ -1,7 +1,7 @@
 = metanorma-nist: Metanorma processor for the NIST SP 800 document classes
 
 image:https://img.shields.io/gem/v/metanorma-nist.svg["Gem Version", link="https://rubygems.org/gems/metanorma-nist"]
-image:https://img.shields.io/travis/riboseinc/metanorma-nist/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-nist"]
+image:https://img.shields.io/travis/riboseinc/metanorma-nist/master.svg["Build Status", link="https://travis-ci.com/riboseinc/metanorma-nist"]
 image:https://codeclimate.com/github/riboseinc/metanorma-nist/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-nist"]
 
 WARNING: This gem is still under development.
@@ -202,15 +202,7 @@ The following document attributes are specific to this document class:
 
 `:keywords:`:: Comma-delimited list of the keywords associated with the document.
 
-`:fullname{_i}:`:: The full name of a person who is a contributor to the document.
-A second person is indicated by using a numeric suffix: `:fullname:`, `:fullname_2:`, `fullname_3:`, &c.
-
-`:surname{_i}:`:: The surname of a person who is a contributor to the document.
-`:givenname{_i}:`:: The given name(s) of a person who is a contributor to the document.
-`:role{_i}:`:: The role of a a person who is a contributor to the document. By default,
-they are coded as an `editor`; they can also be represented as an `author`.
-
-`:email:`:: Email contact for document
+`:doc-email:`:: Email contact for document
 
 == Asciidoctor features specific to NIST
 

data/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/lib/asciidoctor/nist/biblio.rng

@@ -286,18 +286,23 @@
   </define>
   <define name="address">
     <element name="address">
-      <oneOrMore>
+      <choice>
         <!-- iso191606 TODO -->
-        <ref name="street"/>
-      </oneOrMore>
-      <ref name="city"/>
-      <optional>
-        <ref name="state"/>
-      </optional>
-      <ref name="country"/>
-      <optional>
-        <ref name="postcode"/>
-      </optional>
+        <group>
+          <oneOrMore>
+            <ref name="street"/>
+          </oneOrMore>
+          <ref name="city"/>
+          <optional>
+            <ref name="state"/>
+          </optional>
+          <ref name="country"/>
+          <optional>
+            <ref name="postcode"/>
+          </optional>
+        </group>
+        <ref name="formattedAddress"/>
+      </choice>
     </element>
   </define>
   <define name="street">
@@ -325,6 +330,11 @@
       <text/>
     </element>
   </define>
+  <define name="formattedAddress">
+    <element name="formattedAddress">
+      <text/>
+    </element>
+  </define>
   <define name="person-identifier">
     <element name="identifier">
       <attribute name="type">

data/lib/asciidoctor/nist/front.rb

@@ -20,46 +20,6 @@ module Asciidoctor
         personal_author(node, xml)
       end
 
-      def personal_author(node, xml)
-        personal_editor(node, xml)
-        if node.attr("fullname") || node.attr("surname")
-          personal_author1(node, xml, "")
-        end
-        i = 2
-        while node.attr("fullname_#{i}") || node.attr("surname_#{i}")
-          personal_author1(node, xml, "_#{i}")
-          i += 1
-        end
-      end
-
-      def personal_editor(node, xml)
-        return unless node.attr("editor")
-        xml.contributor do |c|
-          c.role **{ type: "editor" }
-          c.person do |p|
-            p.name do |n|
-              n.completename node.attr("editor")
-            end
-          end
-        end
-      end
-
-      def personal_author1(node, xml, suffix)
-        xml.contributor do |c|
-          c.role **{ type: node&.attr("role#{suffix}")&.downcase || "editor" }
-          c.person do |p|
-            p.name do |n|
-              if node.attr("fullname#{suffix}")
-                n.completename node.attr("fullname#{suffix}")
-              else
-                n.forename node.attr("givenname#{suffix}")
-                n.surname node.attr("surname#{suffix}")
-              end
-            end
-          end
-        end
-      end
-
       def metadata_publisher(node, xml)
         xml.contributor do |c|
           c.role **{ type: "publisher" }
@@ -122,7 +82,7 @@ module Asciidoctor
 
       def metadata_source(node, xml)
         super
-        node.attr("email") && xml.source(node.attr("email"), type: "email")
+        node.attr("doc-email") && xml.uri(node.attr("doc-email"), type: "email")
       end
 
       def title(node, xml)

data/lib/asciidoctor/nist/isodoc.rng

@@ -911,6 +911,9 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
     </element>
   </define>
   <define name="stem">

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

@@ -43,9 +43,11 @@
   <div class="rule-thick"></div>
 
   <div class="authors-container">
-    {% for author in authors %}
+    {% for affiliation in authors_affiliations %}
+    {% for author in affiliation[1] %}
 <div class="author">{{ author }}</div>
-<!-- <div class="affiliation"></div> -->
+{% endfor %} 
+<div class="affiliation">{{affiliation[0]}}</div>
 {% endfor %} 
     </div>
 

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

@@ -678,19 +678,21 @@ span.nistvariable {
     background-color: #e1eef1;
     padding: 1.2em;
     margin: 2em 0 1em 0;
+    padding-left: 2em;
 }
 
 .example .example-title {
     font-weight: 700;
     text-transform: uppercase;
-    text-align: center;
     margin-top:0;
+    margin-left:-1.5em;
 }
 
 .pseudocode {
     background-color: #dddddd;
     padding: 1.2em;
     margin: 2em 0 1em 0;
+    padding-left: 2em;
 }
 
 .pseudocode .example-title {
@@ -698,6 +700,7 @@ span.nistvariable {
     text-transform: uppercase;
     text-align: center;
     margin-top:0;
+    margin-left:-1.5em;
 }
 
 .recommend {

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

@@ -13,6 +13,22 @@ p.Author, li.Author, div.Author
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
 	mso-fareast-language:EN-US;}
+p.Affiliation, li.Affiliation, div.Affiliation
+        {mso-style-name:Author;
+        mso-style-unhide:no;
+        mso-style-qformat:yes;
+        margin:0cm;
+        margin-bottom:.0001pt;
+        text-align:right;
+        font-style:italic;
+        mso-pagination:widow-orphan;
+        mso-hyphenate:none;
+        font-size:14.0pt;
+        font-family:"Times New Roman",serif;
+        mso-fareast-font-family:"Times New Roman";
+        mso-bidi-font-family:"Times New Roman";
+        mso-ansi-language:EN-US;
+        mso-fareast-language:EN-US;}
 p.ReportNumber, li.ReportNumber, div.ReportNumber
 	{mso-style-name:"Report Number";
 	mso-style-unhide:no;
@@ -715,13 +731,17 @@ div.coverpage_warning
         aside {
           font-size:10.0pt;
 }
-div.example {
-  margin-left:70.9pt;
-  text-indent:-70.9pt;
+
+.example-title {
+font-weight: bold;
+margin-left: -36.0pt;
 }
-p.example, li.example, div.example, td.example
-        {       margin:0in;
-        margin-bottom:.0001pt;
+
+p.example, li.example, div.example, td.example {
+    margin-top: 0cm;
+  margin-right: 36.0pt;
+  margin-bottom: 0cm;
+  margin-left: 36.0pt;
         mso-pagination:none;
         font-size:10.0pt;
         font-family:$bodyfont;}
@@ -730,6 +750,10 @@ td.example p.MsoListParagraph {
   font-size: 10.0pt;
 }
 
+td.example p.MsoListParagraph {
+  font-size: 10.0pt;
+}
+
 span.note_label, span.example_label, td.example_label, td.note_label
 {
 font-size: 10.0pt;

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

@@ -152,13 +152,14 @@ mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-la
 EN-US;mso-bidi-language:AR-SA;margin-bottom:0.0pt'><br clear="all" style='page-break-before:auto;'/>
 </span>
 
-<div>
-
-{% for author in authors %}
-<p class="Author">{{ author }}</p>
+  <div class="authors-container">
+    {% for affiliation in authors_affiliations %}
+    {% for author in affiliation[1] %}
+<p class="Author">{{ author }}</div>
 {% endfor %}
-
-</div>
+<p class="Affiliation">{{affiliation[0]}}</div>
+{% endfor %}
+    </div>
 
 <span lang="EN-US" style='font-size:14.0pt;font-family:"Times New Roman",serif;
 mso-fareast-font-family:"Times New Roman";color:black;mso-ansi-language:EN-US;

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

@@ -348,6 +348,39 @@ h1
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+.h1Preface
+        {mso-style-priority:1;
+        mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-link:"Heading 1 Char";
+        mso-style-next:Normal;
+        margin-top:0in;
+        margin-right:0in;
+        margin-bottom:12.0pt;
+        margin-left:.4in;
+        text-align:center;
+        text-indent:-.4in;
+        mso-pagination:none;
+        page-break-after:avoid;
+        page-break-before:avoid;
+        mso-hyphenate:none;
+        tab-stops:list .4in;
+        background:white;
+        mso-layout-grid-align:none;
+        border:none;
+        mso-border-alt:none;
+        padding:0in;
+        mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
+        font-size:12.0pt;
+        mso-bidi-font-size:10.0pt;
+        font-family:$headerfont;
+        mso-fareast-font-family:$headerfont;
+        color:black;
+        mso-font-kerning:0pt;
+        mso-ansi-language:EN-GB;
+        mso-fareast-language:JA;
+        font-weight:bold;
+        mso-bidi-font-weight:normal;}
 
 h1.AbstractTitle, h1.IntroTitle {
   background:white;

data/lib/isodoc/nist/metadata.rb

@@ -22,25 +22,7 @@ module IsoDoc
       def author(isoxml, _out)
         tc = isoxml.at(ns("//bibdata/editorialgroup/committee"))
         set(:tc, tc.text.upcase) if tc
-        authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author' "\
-                                  "or xmlns:role/@type = 'editor']/person/name"))
-        set(:authors, extract_person_names(authors))
-      end
-
-      def extract_person_names(authors)
-        ret = []
-        authors.each do |a|
-          if a.at(ns("./completename"))
-            ret << a.at(ns("./completename")).text
-          else
-            fn = []
-            forenames = a.xpath(ns("./forename"))
-            forenames.each { |f| fn << f.text }
-            surname = a&.at(ns("./surname"))&.text
-            ret << fn.join(" ") + " " + surname
-          end
-        end
-        ret
+        personal_authors(isoxml)
       end
 
       def docid(isoxml, _out)
@@ -108,7 +90,7 @@ module IsoDoc
 
       def url(xml, _out)
         super
-        a = xml.at(ns("//bibdata/source[@type = 'email']")) and set(:email, a.text)
+        a = xml.at(ns("//bibdata/uri[@type = 'email']")) and set(:email, a.text)
       end
 
     end

data/lib/isodoc/nist/word_convert.rb

@@ -99,6 +99,19 @@ module IsoDoc
                 %{\\1#{WORD_TOC_PREFACE1}}) +  WORD_TOC_SUFFIX1
       end
 
+      def word_preface_cleanup(docxml)
+        docxml.xpath("//h1[@class = 'AbstractTitle'] | //h1[@class = 'IntroTitle']").each do |h2|
+          h2.name = "p"
+          h2["class"] = "h1Preface"
+        end
+      end
+
+      def word_cleanup(docxml)
+        super
+        word_preface_cleanup(docxml)
+        docxml
+      end
+
       # Henceforth identical to html
 
       def abstract(isoxml, out)

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/metanorma-nist.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
 
-  spec.add_dependency "metanorma-standoc", "~> 1.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.1.0"
   spec.add_dependency "isodoc", "~> 0.9.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +250,7 @@ files:
 - Gemfile
 - LICENSE
 - README.adoc
+- Rakefile
 - bin/console
 - bin/rspec
 - bin/setup