metanorma-nist 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f46b9b2842b8f2a8bd192bf8ed5355bfa1eb408e30e4e8f1f6e6e453e8dda0
-  data.tar.gz: d4cfc4b2e1e8975d7d6f2ec7d19dcd749997641edae4654fc71ef14511eaa2d5
+  metadata.gz: 2fe0b9d18da4d89a09e1c33a6299d1b7f222b00768421ac8a35d6cabae0fa2dd
+  data.tar.gz: 2dd93732ce0b519a0b6b11c75f52295cfa3f0dde1d21eb2916dc0c6c35d66cda
 SHA512:
-  metadata.gz: 0ddeda4c7bfb7a394608b2871f6afb8f8c269b4d223e7284586c9846b48bace911e5a86de5e7565206e3313620c5ba0ade85219de1280177a6ce4a9cfe09de5e
-  data.tar.gz: 2b1599c76ec2800b385afeda329b7331090964c32e762c5fe302b49866234c30270638bbbf6d368cbc165501461dd751bbd19ee2b1d0e57f274f383ecf381ec1
+  metadata.gz: d5e2dd3571dc44341fa1d4858221e0b1bb8d2107fd0f77a9bd30f28e73784a5a16b6387259d0302fff066798f034bbde36cebc336f4fafcb8918d737f809d97c
+  data.tar.gz: de51bd7ceed4f8869c0d9bcdb3c5ad8b860090ffb1ed450ab0e3dc996df6f9ffa655b644ef90b1c2d5c1ecf13bb5a4fe4eb898ec29b64208d4c1e89ab51862c3

data/lib/asciidoctor/nist/converter.rb

@@ -109,6 +109,7 @@ module Asciidoctor
           word_converter(node).convert filename unless node.attr("nodoc")
           pdf_converter(node).convert filename unless node.attr("nodoc")
         end
+        @log.write(@filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end
@@ -154,7 +155,7 @@ module Asciidoctor
         a = section_attributes(node)
         noko do |xml|
           case sectiontype(node)
-          #when "normative references" then norm_ref_parse(a, xml, node)
+            #when "normative references" then norm_ref_parse(a, xml, node)
           when "terms and definitions"
             if node.attr("style") == "appendix" && node.level == 1
               @term_def = true
@@ -163,7 +164,7 @@ module Asciidoctor
             else
               clause_parse(a, xml, node)
             end
-            when "acknowledgements"
+          when "acknowledgements"
             acknowledgements_parse(a, xml, node)
           else
             if @term_def 
@@ -220,7 +221,7 @@ module Asciidoctor
                   "\\1[NIST \\2 ")
         super
       end
-      
+
       def fetch_ref(xml, code, year, **opts)
         code.sub!(Regexp.new("^(#{NIST_PREFIX_REFS}) "), "NIST \\1 ")
         super

data/lib/asciidoctor/nist/isodoc.rng

@@ -645,6 +645,11 @@
     <optional>
       <attribute name="script"/>
     </optional>
+    <optional>
+      <attribute name="inline-header">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="obligation">
         <choice>

data/lib/asciidoctor/nist/validate.rb

@@ -21,26 +21,26 @@ module Asciidoctor
       def doctype_validate(xmldoc)
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         %w(standard).include? doctype or
-          warn "Document Attributes: #{doctype} is not a recognised document type"
+          @log.add("Document Attributes", nil, "#{doctype} is not a recognised document type")
       end
 
       def stage_validate(xmldoc)
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(draft-internal draft-wip draft-prelim draft-public draft-approval
         final final-review).include? stage or
-        warn "Document Attributes: #{stage} is not a recognised stage"
+        @log.add("Document Attributes", nil, "#{stage} is not a recognised stage")
       end
 
       def substage_validate(xmldoc)
         substage = xmldoc&.at("//bibdata/status/substage")&.text or return
         %w(active retired withdrawn).include? substage or
-          warn "Document Attributes: #{substage} is not a recognised substage"
+          @log.add("Document Attributes", nil, "#{substage} is not a recognised substage")
       end
 
       def iteration_validate(xmldoc)
         iteration = xmldoc&.at("//bibdata/status/iteration")&.text or return
         %w(final).include? iteration.downcase or /^\d+$/.match(iteration) or
-          warn "Document Attributes: #{iteration} is not a recognised iteration"
+          @log.add("Document Attributes", nil, "#{iteration} is not a recognised iteration")
       end
 
       def series_validate(xmldoc)
@@ -48,7 +48,7 @@ module Asciidoctor
         found = false
         SERIES.each { |_, v| found = true if v == series }
         found or
-          warn "Document Attributes: #{series} is not a recognised series"
+          @log.add("Document Attributes", nil, "#{series} is not a recognised series")
       end
 
       def validate(doc)
@@ -60,8 +60,8 @@ module Asciidoctor
       def introduction_validate(doc)
         intro = doc.at("//sections/clause/title")
         intro&.text == "Introduction" or
-          warn "First section of document body should be Introduction, "\
-          "not #{intro&.text}"
+          @log.add("Style", intro, "First section of document body should be Introduction, "\
+          "not #{intro&.text}")
       end
 
       REF_SECTIONS_TO_VALIDATE = "//references[not(parent::clause)]/title | "\
@@ -80,8 +80,8 @@ module Asciidoctor
         return if names == ["References"]
         return if names == ["Bibliography"]
         return if names == ["References", "Bibliography"]
-        warn "Reference clauses #{names.join(', ')} do not follow expected "\
-          "pattern in NIST"
+        @log.add("Style", nil, "Reference clauses #{names.join(', ')} do not follow expected "\
+          "pattern in NIST")
       end
     end
   end

data/lib/isodoc/nist/base_convert.rb

@@ -213,9 +213,6 @@ module IsoDoc
           clause_parse_title(node, div, node.at(ns("./title")), out) or
             div.h2 title, **{ class: "Section3" }
           end
-          node.elements.reject do |e|
-            %w(reference title bibitem note).include? e.name
-          end.each { |e| parse(e, div) }
           biblio_list(node, div, true)
         end
       end

data/lib/isodoc/nist/html_convert.rb

@@ -128,9 +128,6 @@ module IsoDoc
                 f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
               end
             end
-            f.elements.reject do |e|
-              ["reference", "title", "bibitem"].include? e.name
-            end.each { |e| parse(e, div) }
             biblio_list(f, div, false)
           end
         end

data/lib/isodoc/nist/pdf_convert.rb

@@ -121,9 +121,6 @@ module IsoDoc
                 f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
               end
             end
-            f.elements.reject do |e|
-              ["reference", "title", "bibitem"].include? e.name
-            end.each { |e| parse(e, div) }
             biblio_list(f, div, false)
           end
         end

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/metanorma-nist.gemspec

@@ -42,5 +42,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -220,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: metanorma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 description: 'Metanorma NIST gem.
 
   '