asciidoctor-iso 0.9.7 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 225229b725b0ffc73cc5acc93152e63dc14393642e70760091d26f018a7ca329
-  data.tar.gz: 8268c280a53388ca060ddc42756bd0ca548a90caceb5c75ea9d376a52ead3516
+  metadata.gz: 1cb66e36c45b81ea74df0f2f99014369c36ee1910425fbfe258034da6498b6de
+  data.tar.gz: 5967537b4c5ecf61bc2cdf3a6ce85219df2f92b03caa447b6c0594b07300fc82
 SHA512:
-  metadata.gz: 2c3b97e89a0663e6df5127339c71f3cd437bf6ddc0eeb19a38679474d59bc7072fe5de846493d99c2e02807e12d39734c3e4b08a97a8fde29215537d887701be
-  data.tar.gz: eddf671a4b9e67b78ca10a7cd708e089455512bd7f4427c4452903aee178bf601ff80a815393d28e3a45360021d9cfa9d6a2bd57b9420ee1fbc1a119ba670e70
+  metadata.gz: 26da20f2117a447051df311f61145aa0f5841d78adad3ebfcef08b3c97208c353e19add9151f5eda043d27621822b4b09440bfe51aca92dad754452e7ad8ad2e
+  data.tar.gz: 2cd75fbdd50c9858a0b1ed81d4f1a77e59cbdac4eccb315be14b06ff50a4a621d5f3bf7363c4940cfe9fcd9e1dfda224f4349e35202b1d82c1bdd7a66f5695aa

data/Gemfile

@@ -1,6 +1,7 @@
-source "https://rubygems.org"
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
 
-gem "relaton", github: "riboseinc/relaton"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in gemspec
 gemspec

data/README.adoc

@@ -452,6 +452,69 @@ from the image.
 image::logo.jpg
 --
 
+=== Sections embedded more than 5 levels
+
+Asciidoctor permits only 5 levels of section embedding (not counting the document title).
+Standards do contain more levels of embedding; ISO/IEC DIR 2 only considers it a problem
+if there are more than 7 levels of embedding. To realise higher levels of embedding,
+prefix a 5-level section title with the attribute `level=`:
+
+[source,asciidoctor]
+--
+====== Clause 5
+
+[level=6]
+===== Clause 6
+
+[level=7]
+====== Clause 7A
+
+[level=7]
+====== Clause 7B
+
+[level=6]
+====== Clause 6B
+
+====== Clause 5B
+--
+
+This generates the following ISO XML:
+
+[source,xml]
+--
+<clause id="_" inline-header="false" obligation="normative">
+	<title>
+		Clause 5 
+	</title>
+	<clause id="_" inline-header="false" obligation="normative">
+		<title>
+			Clause 6 
+		</title>
+		<clause id="_" inline-header="false" obligation="normative">
+			<title>
+				Clause 7A 
+			</title>
+		</clause>
+		<clause id="_" inline-header="false" obligation="normative">
+			<title>
+				Clause 7B 
+			</title>
+		</clause>
+	</clause>
+	<clause id="_" inline-header="false" obligation="normative">
+		<title>
+			Clause 6B 
+		</title>
+	</clause>
+</clause>
+<clause id="_" inline-header="false" obligation="normative">
+	<title>
+		Clause 5B 
+	</title>
+</clause>
+--
+
+
 === Features not visible in HTML preview
 
 The gem uses built-in Asciidoc formatting as much as possible, so that users

data/asciidoctor-iso.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", ">= 0.8"
   spec.add_dependency "iev", "~> 0.1.0"
-  spec.add_dependency "relaton", "~> 0.1.1"
+  spec.add_dependency "relaton", "~> 0.1.3"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/asciidoctor/iso/base.rb

@@ -104,7 +104,7 @@ module Asciidoctor
         init(node)
         ret = makexml(node).to_xml(indent: 2)
         unless node.attr("nodoc") || !node.attr("docfile")
-          File.open(@filename + ".xml", "w") { |f| f.write(ret) }
+          File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
           html_converter_alt(node).convert(@filename + ".xml")
           system "mv #{@filename}.html #{@filename}_alt.html"
           html_converter(node).convert(@filename + ".xml")

data/lib/asciidoctor/iso/cleanup_block.rb

@@ -123,17 +123,43 @@ module Asciidoctor
       def make_bibliography(x, s)
         if x.at("//sections/references")
           biblio = s.add_next_sibling("<bibliography/>").first
-          x.xpath("//sections/references").each { |r| biblio.add_child r.remove }
+          x.xpath("//sections/references").each do |r|
+            biblio.add_child r.remove
+          end
         end
       end
 
-      def sections_cleanup(x)
+      def sections_order_cleanup(x)
         s = x.at("//sections")
         make_preface(x, s)
         make_bibliography(x, s)
         x.xpath("//sections/annex").reverse_each { |r| s.next = r.remove }
       end
 
+      def maxlevel(x)
+        max = 5
+        x.xpath("//clause[@level]").each do |c|
+          max = c["level"].to_i if max < c["level"].to_i
+        end
+        max
+      end
+
+      def sections_level_cleanup(x)
+        m = maxlevel(x)
+        return if m < 6
+        m.downto(6).each do |l|
+          x.xpath("//clause[@level = '#{l}']").each do |c|
+            c.delete("level")
+            c.previous_element << c.remove
+          end
+        end
+      end
+
+      def sections_cleanup(x)
+        sections_order_cleanup(x)
+        sections_level_cleanup(x)
+      end
+
       def obligations_cleanup(x)
         obligations_cleanup_info(x)
         obligations_cleanup_norm(x)

data/lib/asciidoctor/iso/ref.rb

@@ -88,12 +88,7 @@ module Asciidoctor
         nil # Render reference without an Internet connection.
       end
 
-      # TODO: alternative where only title is available
-      def refitem(xml, item, node)
-        unless m = NON_ISO_REF.match(item)
-          Utils::warning(node, "no anchor on reference", item)
-          return
-        end
+      def refitem_render(xml, m)
         xml.bibitem **attr_code(id: m[:anchor]) do |t|
           t.formattedref **{ format: "application/x-isodoc+xml" } do |i|
             i << ref_normalise_no_format(m[:text])
@@ -102,6 +97,20 @@ module Asciidoctor
         end
       end
 
+      # TODO: alternative where only title is available
+      def refitem(xml, item, node)
+        unless m = NON_ISO_REF.match(item)
+          Utils::warning(node, "no anchor on reference", item) 
+          return
+        end
+        unless m[:code] && /^\d+$/.match?(m[:code])
+          ref = fetch_ref xml, m[:code], 
+            m.named_captures.has_key?("year") ? m[:year] : nil, {}
+          return use_my_anchor(ref, m[:anchor]) if ref
+        end
+        refitem_render(xml, m)
+      end
+
       def ref_normalise(ref)
         ref.
           # gsub(/&#8201;&#8212;&#8201;/, " -- ").
@@ -130,7 +139,7 @@ module Asciidoctor
       (?<text>.*)$}xm
 
       NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>[^\]]+)\]</ref>,?\s
+      \[(?<code>[^\]]+?)([:-](?<year>(19|20)[0-9][0-9]))?\]</ref>,?\s
       (?<text>.*)$}xm
 
       # @param item [String]
@@ -165,8 +174,8 @@ module Asciidoctor
       end
 
       def bibliocache_name(global)
-        global ?  "#{Dir.home}/.relaton-bib.json" :
-          "#{@filename}.relaton.json"
+        global ?  "#{Dir.home}/.relaton-bib.pstore" :
+          "#{@filename}.relaton.pstore"
       end
     end
   end

data/lib/asciidoctor/iso/section.rb

@@ -74,13 +74,11 @@ module Asciidoctor
                              end
       end
 
-      # Not testing max depth of sections: Asciidoctor already limits
-      # it to 5 levels of nesting
       def clause_parse(attrs, xml, node)
         attrs["inline-header".to_sym] = node.option? "inline-header"
+        attrs[:level] = node.attr("level")
         set_obligation(attrs, node)
-        sect = node.level == 1 ? "clause" : "clause"
-        xml.send sect, **attr_code(attrs) do |xml_section|
+        xml.send "clause", **attr_code(attrs) do |xml_section|
           xml_section.title { |n| n << node.title } unless node.title.nil?
           xml_section << node.content
         end

data/lib/asciidoctor/iso/validate.rb

@@ -194,7 +194,7 @@ module Asciidoctor
   end
 
   def schema_validate(doc, filename)
-    File.open(".tmp.xml", "w") { |f| f.write(doc.to_xml) }
+    File.open(".tmp.xml", "w:UTF-8") { |f| f.write(doc.to_xml) }
     begin
       errors = Jing.new(filename).validate(".tmp.xml")
     rescue Jing::Error => e

data/lib/asciidoctor/iso/validate_section.rb

@@ -9,6 +9,7 @@ module Asciidoctor
         symbols_validate(doc.root)
         sections_sequence_validate(doc.root)
         section_style(doc.root)
+        subclause_validate(doc.root)
         sourcecode_style(doc.root)
         asset_style(doc.root)
       end
@@ -196,6 +197,12 @@ module Asciidoctor
         asset_title_style(root)
         norm_bibitem_style(root)
       end
+
+      def subclause_validate(root)
+        root.xpath("//clause/clause/clause/clause/clause/clause/clause/clause").each do |c|
+          style_warning(c, "Exceeds the maximum clause depth of 7", nil)
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "0.9.7".freeze
+    VERSION = "0.9.9".freeze
   end
 end

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -699,4 +699,67 @@ r = 1 %</stem>
        </iso-standard>
     OUTPUT
   end
+
+  it "extends clause levels past 5" do
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    #{ASCIIDOC_BLANK_HDR}
+
+    == Clause1
+
+    === Clause2
+
+    ==== Clause3
+
+    ===== Clause4
+
+    ====== Clause 5
+
+    [level=6]
+    ====== Clause 6
+
+    [level=7]
+    ====== Clause 7A
+
+    [level=7]
+    ====== Clause 7B
+
+    [level=6]
+    ====== Clause 6B
+
+    ====== Clause 5B
+
+    INPUT
+    #{BLANK_HDR}
+    <sections>
+  <clause id="_" inline-header="false" obligation="normative">
+  <title>Clause1</title>
+  <clause id="_" inline-header="false" obligation="normative">
+  <title>Clause2</title>
+  <clause id="_" inline-header="false" obligation="normative">
+  <title>Clause3</title>
+  <clause id="_" inline-header="false" obligation="normative"><title>Clause4</title><clause id="_" inline-header="false" obligation="normative">
+  <title>Clause 5</title>
+<clause id="_" inline-header="false" obligation="normative">
+  <title>Clause 6</title>
+<clause id="_" inline-header="false" obligation="normative">
+  <title>Clause 7A</title>
+</clause><clause id="_" inline-header="false" obligation="normative">
+  <title>Clause 7B</title>
+</clause></clause><clause id="_" inline-header="false" obligation="normative">
+  <title>Clause 6B</title>
+</clause></clause>
+
+
+
+
+<clause id="_" inline-header="false" obligation="normative">
+  <title>Clause 5B</title>
+</clause></clause>
+</clause>
+</clause>
+</clause>
+</sections>
+</iso-standard>
+    OUTPUT
+  end
 end

data/spec/asciidoctor-iso/isobib_cache_spec.rb

@@ -44,8 +44,8 @@ EOS
 EOS
 
   it "does not activate biblio caches if isobib disabled" do
-    system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
-    system "rm -f test.relaton.json"
+    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
+    system "rm -f test.relaton.pstore"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
@@ -53,16 +53,16 @@ EOS
 
       * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
-    expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be false
-    expect(File.exist?("test.relaton.json")).to be false
+    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be false
+    expect(File.exist?("test.relaton.pstore")).to be false
 
-    system "rm ~/.relaton-bib.json"
-    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
+    system "rm ~/.relaton-bib.pstore"
+    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
   end
 
   it "does not activate biblio caches if isobib caching disabled" do
-    system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
-    system "rm -f test.relaton.json"
+    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
+    system "rm -f test.relaton.pstore"
     mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{ISOBIB_BLANK_HDR}
@@ -71,17 +71,17 @@ EOS
 
       * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
-    expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be false
-    expect(File.exist?("test.relaton.json")).to be false
+    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be false
+    expect(File.exist?("test.relaton.pstore")).to be false
 
-    system "rm ~/.relaton-bib.json"
-    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
+    system "rm ~/.relaton-bib.pstore"
+    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
   end
 
   it "flushes biblio caches" do
-    system "cp ~/.relaton-bib.json ~/.relaton-bib.json1"
+    system "cp ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
 
-    File.open("#{Dir.home}/.relaton-bib.json", "w") do |f|
+    File.open("#{Dir.home}/.relaton-bib.pstore", "w") do |f|
       f.write "XXX"
     end
 
@@ -93,21 +93,21 @@ EOS
 
       * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
-    expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be true
+    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be true
 
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
     entry = db.load_entry("ISO 123:2001")
     expect(entry["fetched"].to_s).to eq(Date.today.to_s)
     expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_123_DATED)
 
-    system "rm ~/.relaton-bib.json"
-    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
+    system "rm ~/.relaton-bib.pstore"
+    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
   end
 
 
   it "activates global cache" do
-    system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
-    system "rm -f test.relaton.json"
+    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
+    system "rm -f test.relaton.pstore"
     mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{CACHED_ISOBIB_BLANK_HDR}
@@ -116,20 +116,20 @@ EOS
 
       * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
-    expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be true
-    expect(File.exist?("test.relaton.json")).to be false
+    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be true
+    expect(File.exist?("test.relaton.pstore")).to be false
 
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
     entry = db.load_entry("ISO 123:2001")
     expect(entry).to_not be nil
 
-    system "rm ~/.relaton-bib.json"
-    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
+    system "rm ~/.relaton-bib.pstore"
+    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
   end
 
   it "activates local cache" do
-    system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
-    system "rm -f test.relaton.json"
+    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
+    system "rm -f test.relaton.pstore"
     mock_isobib_get_123
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{LOCAL_CACHED_ISOBIB_BLANK_HDR}
@@ -138,25 +138,25 @@ EOS
 
       * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
-    expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be true
-    expect(File.exist?("test.relaton.json")).to be true
+    expect(File.exist?("#{Dir.home}/.relaton-bib.pstore")).to be true
+    expect(File.exist?("test.relaton.pstore")).to be true
 
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
     entry = db.load_entry("ISO 123:2001")
     expect(entry).to_not be nil
 
-    db = Relaton::Db.new "test.relaton.json", nil
+    db = Relaton::Db.new "test.relaton.pstore", nil
     entry = db.load_entry("ISO 123:2001")
     expect(entry).to_not be nil
 
-    system "rm ~/.relaton-bib.json"
-    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
+    system "rm ~/.relaton-bib.pstore"
+    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
   end
 
 
   it "fetches uncached references" do
-    system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
+    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
     db.save_entry("ISO 123:2001",
         {
           "fetched" => Date.today.to_s,
@@ -182,17 +182,17 @@ EOS
     expect(entry["fetched"].to_s).to eq(Date.today.to_s)
     expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_124_DATED)
 
-    system "rm ~/.relaton-bib.json"
-    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
+    system "rm ~/.relaton-bib.pstore"
+    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
   end
 
   it "expires stale undated references" do
-    system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
+    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
 
-        db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+        db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
         db.save_entry("ISO 123",
         {
-          "fetched" => (Date.today - 90).to_s,
+          "fetched" => (Date.today - 90),
           "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
         }
       )
@@ -211,17 +211,17 @@ EOS
             expect(entry["fetched"].to_s).to eq(Date.today.to_s)
     expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_123_UNDATED)
 
-    system "rm ~/.relaton-bib.json"
-    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
+    system "rm ~/.relaton-bib.pstore"
+    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
   end
 
   it "does not expire stale dated references" do
-    system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
+    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
 
-            db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+            db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
             db.save_entry("ISO 123:2001",
         {
-          "fetched" => (Date.today - 90).to_s,
+          "fetched" => (Date.today - 90),
           "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
         }
       )
@@ -238,32 +238,32 @@ EOS
             expect(entry["fetched"].to_s).to eq((Date.today - 90).to_s)
     expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
 
-    system "rm ~/.relaton-bib.json"
-    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
+    system "rm ~/.relaton-bib.pstore"
+    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
   end
 
   it "prioritises local over global cache values" do
-    system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
-    system "rm test.relaton.json"
+    system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
+    system "rm test.relaton.pstore"
 
-    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
     db.save_entry("ISO 123:2001",
         {
-          "fetched" => Date.today.to_s,
+          "fetched" => Date.today,
           "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
         }
       )
     db.save_entry("ISO 124",
         {
-          "fetched" => Date.today.to_s,
+          "fetched" => Date.today,
           "bib" => IsoBibItem.from_xml(ISO_124_SHORT)
         }
       )
 
-    localdb = Relaton::Db.new "test.relaton.json", nil
+    localdb = Relaton::Db.new "test.relaton.pstore", nil
     localdb.save_entry("ISO 124",
         {
-          "fetched" => Date.today.to_s,
+          "fetched" => Date.today,
           "bib" => IsoBibItem.from_xml(ISO_124_SHORT_ALT)
         }
       )
@@ -297,8 +297,8 @@ EOS
     expect(localdb.load_entry("ISO 123:2001")["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
     expect(localdb.load_entry("ISO 124")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT_ALT)
 
-    system "rm ~/.relaton-bib.json"
-    system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
+    system "rm ~/.relaton-bib.pstore"
+    system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
   end
 
 private

data/spec/asciidoctor-iso/refs_spec.rb

@@ -345,6 +345,34 @@ RSpec.describe Asciidoctor::ISO do
     OUTPUT
   end
 
+  it "processes RFC reference in Normative References" do
+    mock_rfcbib_get_rfc8341
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      #{ISOBIB_BLANK_HDR}
+      [bibliography]
+      == Normative References
+
+      * [[[iso123,IETF RFC 8341]]] _Standard_
+    INPUT
+       #{BLANK_HDR}
+              <sections>
+
+       </sections><bibliography><references id="_" obligation="informative">
+         <title>Normative References</title>
+               <bibitem type="" id="iso123">
+  <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
+  <docidentifier>8341</docidentifier>
+  <date type="published">
+    <on>2018</on>
+  </date>
+  <status>published</status>
+</bibitem>
+       </references>
+       </bibliography>
+       </iso-standard>
+    OUTPUT
+  end
+
   it "processes non-ISO reference in Normative References" do
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
@@ -597,4 +625,19 @@ OUTPUT
     end
 end
 
+       def mock_rfcbib_get_rfc8341
+      expect(RfcBib::RfcBibliography).to receive(:get).with("RFC 8341", nil, {}) do
+      IsoBibItem.from_xml(<<~"OUTPUT")
+      <bibitem id="RFC8341">
+  <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
+  <docidentifier>8341</docidentifier>
+  <date type="published">
+    <on>2018</on>
+  </date>
+  <status>published</status>
+</bibitem>
+OUTPUT
+    end
+end
+
 end

data/spec/asciidoctor-iso/validate_spec.rb

@@ -828,4 +828,62 @@ RSpec.describe "No warning if French term matches IEV" do
   INPUT
 end
 
+RSpec.describe "Warn if more than 7 levels of subclause" do
+  specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(%r{exceeds the maximum clause depth of 7}).to_stderr }
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :language: fr
+
+  == Clause
+
+  === Clause
+
+  ==== Clause
+
+  ===== Clause
+
+  ====== Clause
+
+  [level=6]
+  ====== Clause
+
+  [level=7]
+  ====== Clause
+
+  [level=8]
+  ====== Clause
+
+  INPUT
+end
+
+RSpec.describe "Do not warn if not more than 7 levels of subclause" do
+  specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.not_to output(%r{exceeds the maximum clause depth of 7}).to_stderr }
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :language: fr
+
+  == Clause
+
+  === Clause
+
+  ==== Clause
+
+  ===== Clause
+
+  ====== Clause
+
+  [level=6]
+  ====== Clause
+
+  [level=7]
+  ====== Clause
+
+  INPUT
+end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-iso
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +268,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - Makefile
 - README.adoc

data/Gemfile.lock

@@ -1,190 +0,0 @@
-GIT
-  remote: git://github.com/riboseinc/relaton.git
-  revision: 3daaf6fa4cd85eb4e1ea8141e520b4350a944975
-  specs:
-    relaton (0.1.0)
-      algoliasearch
-      gbbib (~> 0.1.0)
-      iev (~> 0.1.0)
-      isobib (~> 0.2.0)
-      rfcbib (~> 0.1.0)
-
-PATH
-  remote: .
-  specs:
-    asciidoctor-iso (0.9.6)
-      asciidoctor (~> 1.5.7)
-      iev (~> 0.1.0)
-      isodoc (>= 0.8)
-      relaton (~> 0.1.0)
-      ruby-jing
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    algoliasearch (1.23.2)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
-    asciidoctor (1.5.7.1)
-    asciimath (1.0.4)
-    ast (2.4.0)
-    byebug (9.1.0)
-    cnccs (0.1.1)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    equivalent-xml (0.6.0)
-      nokogiri (>= 1.4.3)
-    ffi (1.9.25)
-    formatador (0.2.5)
-    gbbib (0.1.4)
-      cnccs
-      iso-bib-item
-    guard (2.14.2)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.2)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      mime-types
-      nokogiri
-      ruby-xslt
-      thread_safe
-      uuidtools
-    htmlentities (4.3.4)
-    httpclient (2.8.3)
-    iev (0.1.0)
-      nokogiri
-    image_size (2.0.0)
-    iso-bib-item (0.2.0)
-      isoics (~> 0.1.6)
-      nokogiri (~> 1.8.4)
-      ruby_deep_clone (~> 0.8.0)
-    isobib (0.2.0)
-      algoliasearch
-      iso-bib-item (~> 0.2.0)
-    isodoc (0.8.4)
-      asciimath
-      html2doc (~> 0.8.1)
-      htmlentities (~> 4.3.4)
-      liquid
-      nokogiri
-      roman-numerals
-      ruby-xslt
-      sass
-      thread_safe
-      uuidtools
-    isoics (0.1.6)
-    jaro_winkler (1.5.1)
-    json (2.1.0)
-    liquid (4.0.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
-    metanorma (0.2.6)
-    method_source (0.9.0)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.3.0)
-    nenv (0.3.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    optout (0.0.2)
-    parallel (1.12.1)
-    parser (2.5.1.2)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rainbow (3.0.0)
-    rake (12.3.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rfcbib (0.1.1)
-      iso-bib-item (~> 0.2.0)
-    roman-numerals (0.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.58.1)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-jing (0.0.1)
-      optout (>= 0.0.2)
-    ruby-progressbar (1.9.0)
-    ruby-xslt (0.9.10)
-    ruby_deep_clone (0.8.0)
-    ruby_dep (1.5.0)
-    sass (3.5.6)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    shellany (0.0.1)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    timecop (0.9.1)
-    unicode-display_width (1.4.0)
-    uuidtools (2.1.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  asciidoctor-iso!
-  bundler (~> 1.15)
-  byebug (~> 9.1)
-  equivalent-xml (~> 0.6)
-  guard (~> 2.14)
-  guard-rspec (~> 4.7)
-  isobib (~> 0.2.0)
-  metanorma (~> 0.2.6)
-  rake (~> 12.0)
-  relaton!
-  rspec (~> 3.6)
-  rubocop (~> 0.50)
-  simplecov (~> 0.15)
-  timecop (~> 0.9)
-
-BUNDLED WITH
-   1.16.2