metanorma-csd 1.3.15 → 1.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84ae0501c0278282d5c4fbefeabfc4e395570b277eb68aebac44bd75fe4750dd
-  data.tar.gz: bd69beeef7d0da34d6c732946e369383b80fcf3540d9e7316373d39ab3dfbdca
+  metadata.gz: 8e97b0d1ef2901121fffd7fff111a20f956228cf43fabd7b9c0ae128abfafc9a
+  data.tar.gz: 7582ce91df455fc1b2b6746c71834edf2b2da563ea5b3cfafa89b674b888523e
 SHA512:
-  metadata.gz: d3d39e017db7c701bd7aa91ab5a691c8da518d0e6dfd6b6ef8f71a72a78db20694f68871d9cfd6516fbc7f571795c7faf7063e879ccd6541245a9f7853264f91
-  data.tar.gz: 4825bc55e1255e977336e41abd435a1ac2b4a655b25f9e1ca99e3113f04e94acb61acd8f4531f33f894f71bfbc4627b65bebe817cafd6dd48e805c2106680efc
+  metadata.gz: f58c72f802fa14ba50ee4c36057cb17756684b495640f8b6e41d90104e84a089193c92caeb238a88ac668c791113e6ac3c6d25f3324ffc4e7e4ce838f919bccc
+  data.tar.gz: 243ff39f1ca569e2d2a3e47cc0848fd65f48b584bb73be038cff2834359230637c83551a65a77ab01d1c3cae9a5562542f7ff12b08abf7f5fe8a10a53d9e67cb

data/lib/asciidoctor/csd/converter.rb

@@ -35,6 +35,7 @@ module Asciidoctor
           word_converter(node).convert filename
           pdf_converter(node).convert filename
         end
+        @log.write(@filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end

data/lib/asciidoctor/csd/front.rb

@@ -43,7 +43,7 @@ module Asciidoctor
       def metadata_status(node, xml)
         status = node.attr("status")
         unless status && ::Metanorma::Csd::DOCSTATUS.keys.include?(status)
-          warn "#{status} is not a legal status"
+          @log.add("Document Attributes", nil, "#{status} is not a legal status")
         end
         super
       end
@@ -70,7 +70,8 @@ module Asciidoctor
       def doctype(node)
         d = node.attr("doctype")
         unless ::Metanorma::Csd::DOCSUFFIX.keys.include?(d)
-          warn "#{d} is not a legal document type: reverting to 'standard'"
+          @log.add("Document Attributes", nil,
+                   "#{d} is not a legal document type: reverting to 'standard'")
           d = "standard"
         end
         d

data/lib/asciidoctor/csd/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/csd/validate.rb

@@ -14,15 +14,15 @@ module Asciidoctor
       def doctype_validate(xmldoc)
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         %w(directive guide specification standard report administrative amendment
-        technical-corrigendum advisory).include? doctype or
-          warn "Document Attributes: #{doctype} is not a recognised document type"
+        technical-corrigendum advisory).include?(doctype) or
+        @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(proposal working-draft committee-draft draft-standard final-draft
-        published withdrawn).include? stage or
-          warn "Document Attributes: #{stage} is not a recognised status"
+        published withdrawn).include?(stage) or
+        @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
       end
     end
   end

data/lib/asciidoctor/csd/validate_section.rb

@@ -10,19 +10,19 @@ module Asciidoctor
         super
       end
 
-      ONE_SYMBOLS_WARNING = "ISO style: only one Symbols and Abbreviated "\
+      ONE_SYMBOLS_WARNING = "Only one Symbols and Abbreviated "\
         "Terms section in the standard".freeze
 
-      NON_DL_SYMBOLS_WARNING = "ISO style: Symbols and Abbreviated Terms can "\
+      NON_DL_SYMBOLS_WARNING = "Symbols and Abbreviated Terms can "\
         "only contain a definition list".freeze
 
       def symbols_validate(root)
         f = root.xpath("//definitions")
         f.empty? && return
-        (f.size == 1) || warn(ONE_SYMBOLS_WARNING)
+        (f.size == 1) || @log.add("Style", f.first, ONE_SYMBOLS_WARNING)
         f.first.elements.each do |e|
           unless e.name == "dl"
-            warn(NON_DL_SYMBOLS_WARNING)
+            @log.add("Style", f.first, NON_DL_SYMBOLS_WARNING)
             return
           end
         end
@@ -31,7 +31,7 @@ module Asciidoctor
       def seqcheck(names, msg, accepted)
         n = names.shift
         unless accepted.include? n
-          warn "ISO style: #{msg}"
+          @log.add("Style", nil, msg)
           names = []
         end
         names
@@ -92,46 +92,46 @@ module Asciidoctor
           n = names.shift || return
         end
         unless n
-          warn "ISO style: Document must contain at least one clause"
+          @log.add("Style", nil, "Document must contain at least one clause")
           return
         end
         n[:tag] == "clause" ||
-          warn("ISO style: Document must contain clause after "\
+          @log.add("Style", nil, "Document must contain clause after "\
                "Terms and Definitions")
         n == { tag: "clause", title: "Scope" } &&
-          warn("ISO style: Scope must occur before Terms and Definitions")
+          @log.add("Style", nil, "Scope must occur before Terms and Definitions")
         n = names.shift || return
         while n[:tag] == "clause"
           n[:title] == "Scope" &&
-            warn("ISO style: Scope must occur before Terms and Definitions")
+            @log.add("Style", nil, "Scope must occur before Terms and Definitions")
           n = names.shift || return
         end
         unless n[:tag] == "annex" || n[:tag] == "references"
-          warn "ISO style: Only annexes and references can follow clauses"
+          @log.add("Style", nil, "Only annexes and references can follow clauses")
         end
         while n[:tag] == "annex"
           n = names.shift
           if n.nil?
-            warn("ISO style: Document must include (references) "\
+            @log.add("Style", nil, "Document must include (references) "\
                  "Normative References")
             return
           end
         end
         n == { tag: "references", title: "Normative References" } ||
-          warn("ISO style: Document must include (references) "\
+          @log.add("Style", nil, "Document must include (references) "\
                "Normative References")
         n = names.shift
         n == { tag: "references", title: "Bibliography" } ||
-          warn("ISO style: Final section must be (references) Bibliography")
+          @log.add("Style", nil, "Final section must be (references) Bibliography")
         names.empty? ||
-          warn("ISO style: There are sections after the final Bibliography")
+          @log.add("Style", nil, "There are sections after the final Bibliography")
       end
 
       def style_warning(node, msg, text = nil)
         return if @novalid
-        w = "ISO style: WARNING (#{Standoc::Utils::current_location(node)}): #{msg}"
+        w = msg
         w += ": #{text}" if text
-        warn w
+        @log.add("Style", node, w)
       end
     end
   end

data/lib/metanorma/csd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csd
-    VERSION = "1.3.15"
+    VERSION = "1.3.16"
   end
 end

data/metanorma-csd.gemspec

@@ -40,5 +40,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-csd
 version: !ruby/object:Gem::Version
-  version: 1.3.15
+  version: 1.3.16
 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: metanorma-standoc
@@ -164,20 +164,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-csd lets you write CSD in AsciiDoc syntax.