metanorma-standoc 1.9.0 → 1.9.1

data/lib/asciidoctor/standoc/validate.rb

@@ -1,5 +1,5 @@
 require "asciidoctor/standoc/utils"
-require_relative "./validate_section.rb"
+require_relative "./validate_section"
 require "nokogiri"
 require "jing"
 require "iev"
@@ -14,6 +14,7 @@ module Asciidoctor
       def init_iev
         return nil if @no_isobib
         return @iev if @iev
+
         @iev = Iev::Db.new(@iev_globalname, @iev_localname) unless @no_isobib
         @iev
       end
@@ -44,14 +45,14 @@ module Asciidoctor
         found = false
         doc.xpath("//references[@normative = 'true']/bibitem").each do |b|
           next unless docid = b.at("./docidentifier[@type = 'metanorma']")
-          next unless  /^\[\d+\]$/.match(docid.text)
-          @log.add("Bibliography", b, "Numeric reference in normative references")
+          next unless /^\[\d+\]$/.match?(docid.text)
+
+          @log.add("Bibliography", b,
+                   "Numeric reference in normative references")
           found = true
         end
-        if found
-          clean_exit
-          abort("Numeric reference in normative references")
-        end
+        found and
+          clean_abort("Numeric reference in normative references", doc.to_xml)
       end
 
       def repeat_id_validate1(ids, x)
@@ -72,8 +73,7 @@ module Asciidoctor
             ids = repeat_id_validate1(ids, x)
           end
         rescue StandardError => e
-          clean_exit
-          abort(e.message)
+          clean_abort(e.message, doc.to_xml)
         end
       end
 
@@ -90,8 +90,7 @@ module Asciidoctor
                        e[:message])
             end
           rescue Jing::Error => e
-            clean_exit
-            abort "Jing failed with error: #{e}"
+            clean_abort("Jing failed with error: #{e}", doc.to_xml)
           ensure
             f.close!
           end
@@ -104,7 +103,8 @@ module Asciidoctor
       def formattedstr_strip(doc)
         doc.xpath("//*[@format] | //stem | //bibdata//description | "\
                   "//formattedref | //bibdata//note | //bibdata/abstract | "\
-                  "//bibitem/abstract | //bibitem/note | //misc-container").each do |n|
+                  "//bibitem/abstract | //bibitem/note | //misc-container")
+          .each do |n|
           n.elements.each do |e|
             e.traverse do |e1|
               e1.element? and e1.each { |k, _v| e1.delete(k) }

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "1.9.0".freeze
+    VERSION = "1.9.1".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "iev", "~> 0.2.1"
   spec.add_dependency "isodoc", "~> 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct"
-  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.3.0"
+  spec.add_dependency "metanorma-plugin-lutaml"
   spec.add_dependency "ruby-jing"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
   spec.add_dependency "asciimath2unitsml", "~> 0.3.0"

data/spec/asciidoctor/base_spec.rb

@@ -240,6 +240,7 @@ OUTPUT
       :pub-uri: http://www.example.com
       :isbn: ISBN-13
       :isbn10: ISBN-10
+      :classification: a:b, c
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
 <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic" version="#{Metanorma::Standoc::VERSION}">
@@ -361,18 +362,51 @@ OUTPUT
   <role type="publisher"/>
   <organization>
     <name>Hanna Barbera</name>
+    <address>
+  <formattedAddress>
+    1 Infinity Loop
+    <br/>
+    California
+  </formattedAddress>
+</address>
+<phone>3333333</phone>
+<phone type='fax'>4444444</phone>
+<email>x@example.com</email>
+<uri>http://www.example.com</uri>
   </organization>
 </contributor>
 <contributor>
   <role type="publisher"/>
   <organization>
     <name>Cartoon Network</name>
+    <address>
+  <formattedAddress>
+    1 Infinity Loop
+    <br/>
+    California
+  </formattedAddress>
+</address>
+<phone>3333333</phone>
+<phone type='fax'>4444444</phone>
+<email>x@example.com</email>
+<uri>http://www.example.com</uri>
   </organization>
 </contributor>
 <contributor>
   <role type="publisher"/>
   <organization>
     <name>Ribose, Inc.</name>
+    <address>
+  <formattedAddress>
+    1 Infinity Loop
+    <br/>
+    California
+  </formattedAddress>
+</address>
+<phone>3333333</phone>
+<phone type='fax'>4444444</phone>
+<email>x@example.com</email>
+<uri>http://www.example.com</uri>
   </organization>
 </contributor>
 <edition>2</edition>
@@ -392,6 +426,17 @@ OUTPUT
        <owner>
      <organization>
        <name>Ribose, Inc.</name>
+        <address>
+   <formattedAddress>
+     1 Infinity Loop
+     <br/>
+     California
+   </formattedAddress>
+ </address>
+ <phone>3333333</phone>
+ <phone type='fax'>4444444</phone>
+ <email>x@example.com</email>
+ <uri>http://www.example.com</uri>
      </organization>
    </owner>
  </copyright>
@@ -400,6 +445,17 @@ OUTPUT
    <owner>
      <organization>
        <name>Hanna Barbera</name>
+        <address>
+   <formattedAddress>
+     1 Infinity Loop
+     <br/>
+     California
+   </formattedAddress>
+ </address>
+ <phone>3333333</phone>
+ <phone type='fax'>4444444</phone>
+ <email>x@example.com</email>
+ <uri>http://www.example.com</uri>
      </organization>
    </owner>
   </copyright>
@@ -421,6 +477,8 @@ OUTPUT
              <docidentifier>JKL MNO</docidentifier>
            </bibitem>
          </relation>
+         <classification type='a'>b</classification>
+         <classification type='default'>c</classification>
 <keyword>a</keyword>
 <keyword>b</keyword>
 <keyword>c</keyword>
@@ -469,6 +527,7 @@ OUTPUT
       :relaton-uri: F
       :title-eo: Dokumenttitolo
       :doctype: This is a DocType
+      :docsubtype: This is a DocSubType
       :subdivision: Subdivision
       :subdivision-abbr: SD
 
@@ -567,6 +626,7 @@ OUTPUT
          </copyright>
          <ext>
          <doctype>this-is-a-doctype</doctype>
+         <subdoctype>This is a DocSubType</subdoctype>
          </ext>
        </bibdata>
          <preface>
@@ -625,13 +685,6 @@ OUTPUT
         <name>International Standards Organization</name>
         <subdivision>Subdivision</subdivision>
         <abbreviation>SD</abbreviation>
-        <address>
-  <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
-</address>
-<phone>3333333</phone>
-<phone type='fax'>4444444</phone>
-<email>x@example.com</email>
-<uri>http://www.example.com</uri>
       </organization>
     </contributor>
     <contributor>

data/spec/asciidoctor/cleanup_spec.rb

@@ -44,9 +44,7 @@ RSpec.describe Asciidoctor::Standoc do
                  </svgmap>
                  <figure id='ref1'>
                  <name>SVG title</name>
-                   <?xml version="1.0" encoding="utf-8"??>
-      <!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-      <svg xmlns='http://www.w3.org/2000/svg' version='1.1' id='Layer_1' x='0px' y='0px' viewbox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve' xmlns:xlink='http://www.w3.org/1999/xlink'>
+                 <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1_000000001' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
         <style/>
         <image/>
         <a xlink:href='#ref1'>
@@ -62,9 +60,7 @@ RSpec.describe Asciidoctor::Standoc do
                  </figure>
                  <svgmap>
                    <figure id='ref2' unnumbered='true' number='8' subsequence='A' keep-with-next='true' keep-lines-together='true'>
-                   <?xml version="1.0" encoding="utf-8"??>
-        <!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-        <svg xmlns='http://www.w3.org/2000/svg' version='1.1' id='Layer_1' x='0px' y='0px' viewbox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve' xmlns:xlink='http://www.w3.org/1999/xlink'>
+        <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1_000000002' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
           <style/>
           <image/>
           <a xlink:href='#ref1'>

data/spec/asciidoctor/refs_spec.rb

@@ -3,7 +3,7 @@ require "relaton_iso"
 require "relaton_ietf"
 
 RSpec.describe Asciidoctor::Standoc do
-    it "processes simple ISO reference" do
+  it "processes simple ISO reference" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp( <<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]

data/spec/spec_helper.rb

@@ -25,7 +25,8 @@ require "metanorma/standoc"
 require "rexml/document"
 require "byebug"
 
-Dir[File.expand_path("./support/**/**/*.rb", __dir__)].each { |f| require f }
+Dir[File.expand_path("./support/**/**/*.rb", __dir__)]
+  .sort.each { |f| require f }
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
@@ -47,19 +48,20 @@ RSpec.configure do |config|
   end
 end
 
-def strip_guid(x)
-  x.gsub(%r{ id="_[^"]+"}, ' id="_"').gsub(%r{ target="_[^"]+"}, ' target="_"')
+def strip_guid(xml)
+  xml.gsub(%r{ id="_[^"]+"}, ' id="_"')
+    .gsub(%r{ target="_[^"]+"}, ' target="_"')
 end
 
 def strip_src(xml)
   xml.gsub(/\ssrc="[^"]+"/, ' src="_"')
 end
 
-def xmlpp(x)
+def xmlpp(xml)
   s = ""
   f = REXML::Formatters::Pretty.new(2)
   f.compact = true
-  f.write(REXML::Document.new(x), s)
+  f.write(REXML::Document.new(xml), s)
   s
 end
 
@@ -181,7 +183,7 @@ BLANK_METANORMA_HDR = <<~"HDR".freeze
   </bibdata>
 HDR
 
-HTML_HDR = <<~END.freeze
+HTML_HDR = <<~HDR.freeze
   <html xmlns:epub="http://www.idpf.org/2007/ops">
     <head>
       <title>test</title>
@@ -196,9 +198,9 @@ HTML_HDR = <<~END.freeze
       </div>
       <br/>
       <div class="main-section">
-END
+HDR
 
-WORD_HDR = <<~END.freeze
+WORD_HDR = <<~HDR.freeze
   <html xmlns:epub="http://www.idpf.org/2007/ops">
     <head>
       <title>test</title>
@@ -213,7 +215,7 @@ WORD_HDR = <<~END.freeze
       </div>
       <br clear="all" class="section"/>
       <div class="WordSection3">
-END
+HDR
 
 def examples_path(path)
   File.join(File.expand_path("./examples", __dir__), path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -70,16 +70,16 @@ dependencies:
   name: metanorma-plugin-lutaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -410,10 +410,12 @@ files:
 - lib/asciidoctor/standoc/cleanup_block.rb
 - lib/asciidoctor/standoc/cleanup_boilerplate.rb
 - lib/asciidoctor/standoc/cleanup_footnotes.rb
+- lib/asciidoctor/standoc/cleanup_image.rb
 - lib/asciidoctor/standoc/cleanup_inline.rb
 - lib/asciidoctor/standoc/cleanup_maths.rb
 - lib/asciidoctor/standoc/cleanup_ref.rb
 - lib/asciidoctor/standoc/cleanup_ref_dl.rb
+- lib/asciidoctor/standoc/cleanup_reqt.rb
 - lib/asciidoctor/standoc/cleanup_section.rb
 - lib/asciidoctor/standoc/cleanup_terms.rb
 - lib/asciidoctor/standoc/converter.rb
@@ -429,6 +431,7 @@ files:
 - lib/asciidoctor/standoc/macros_plantuml.rb
 - lib/asciidoctor/standoc/macros_terms.rb
 - lib/asciidoctor/standoc/ref.rb
+- lib/asciidoctor/standoc/ref_date_id.rb
 - lib/asciidoctor/standoc/ref_sect.rb
 - lib/asciidoctor/standoc/reqt.rb
 - lib/asciidoctor/standoc/reqt.rng