metanorma-standoc 1.3.26 → 1.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 775bf1c752d3200f542014ac45b50d4d71cf4f660a8c25e80cae21f234cbf219
-  data.tar.gz: 50d5cdbbdf778a7a470c2e58bd9c1c6a46c0c7d522f7ac80c984511540ac0325
+  metadata.gz: 3532b7b46d28cfd680ed255546a5a9fb9ba5658b3c05d9df3de9e1a31a03ab08
+  data.tar.gz: 549dc05067472220e8a60846620ec2d778803ead8303aaded1196a58a2f51247
 SHA512:
-  metadata.gz: 3d427d6d3525c635a5303b1f4ac2078bd789ada7268f8493c26e112f985ff249a4b9d74fe466d14177962132c7903a64162a52f41d8e439a5170e2c96e3b1380
-  data.tar.gz: 7e052c9a72d6f530fd0de026012e3cfaed6813256ed7e979076af4da02fc05f04884e30fc69e27eb2246d721e200c6a4d368a19d1d32cd9c6344a9fbf3e6b7cf
+  metadata.gz: 3539ca5c4d4c5807a4981fbfc4705e8810834ea500ae3636a713b307456758c2ad5a24956e317ea34b52a4f06d23abb6a55ab16c7aea69c04ce685b3b0975b53
+  data.tar.gz: 46f2361f7f9d5d544bfb098940af446719276422d31310444d6b2d13b6f754c49e93e71d8d959cd4dc5e5740cca6fc66071e0231abc69cef1f0464dcc0b55e31

data/lib/asciidoctor/standoc/base.rb

@@ -43,7 +43,7 @@ module Asciidoctor
       def skip(node, name = nil)
         name = name || node.node_name
         w = "converter missing for #{name} node in Metanorma backend"
-        @log.add("Asciidoctor Input", node, w)
+        @log.add("AsciiDoc Input", node, w)
         nil
       end
 
@@ -109,7 +109,7 @@ module Asciidoctor
         @fontheader = default_fonts(node)
         @files_to_delete = []
         @filename = node.attr("docfile") ?
-          node.attr("docfile").gsub(/\.adoc$/, "").gsub(%r{^.*/}, "") : ""
+          File.basename(node.attr("docfile")).gsub(/\.adoc$/, "") : ""
         @localdir = Utils::localdir(node)
         @no_isobib_cache = node.attr("no-isobib-cache")
         @no_isobib = node.attr("no-isobib")
@@ -241,7 +241,7 @@ module Asciidoctor
       def extract_termsource_refs(text, node)
         matched = TERM_REFERENCE_RE.match text
         matched.nil? and
-          @log.add("Asciidoctor Input", node, "term reference not in expected format: #{text}")
+          @log.add("AsciiDoc Input", node, "term reference not in expected format: #{text}")
         matched
       end
 

data/lib/asciidoctor/standoc/blocks.rb

@@ -244,7 +244,11 @@ module Asciidoctor
       end
 
       def pass(node)
-        node.content
+        noko do |xml|
+          xml.passthrough **attr_code(formats: node.attr("format")) do |p|
+            p << HTMLEntities.new.encode(node.content, :basic, :hexadecimal)
+          end
+        end
       end
     end
   end

data/lib/asciidoctor/standoc/cleanup.rb

@@ -64,6 +64,7 @@ module Asciidoctor
         boilerplate_cleanup(xmldoc)
         smartquotes_cleanup(xmldoc)
         para_cleanup(xmldoc)
+        img_cleanup(xmldoc)
         xmldoc
       end
 
@@ -158,6 +159,13 @@ module Asciidoctor
           x.replace(x.children)
         end
       end
+
+      def img_cleanup(xmldoc)
+        return xmldoc unless @datauriimage
+        xmldoc.xpath("//image").each do |i|
+          i["src"] = datauri(i["src"])
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/cleanup_boilerplate.rb

@@ -18,7 +18,6 @@ module Asciidoctor
         source.each do |s|
           @anchors[s["bibitemid"]] or
             @log.add("Crossreferences", nil, "term source #{s['bibitemid']} not referenced")
-                      #warn "term source #{s['bibitemid']} not referenced" 
         end
         if source.empty? && term.nil?
           div.next = @no_terms_boilerplate
@@ -49,8 +48,7 @@ module Asciidoctor
       TERM_CLAUSE = "//sections/terms | "\
         "//sections/clause[descendant::terms]".freeze
 
-      NORM_REF = "//bibliography/references[title = 'Normative References' or "\
-        "title = 'Normative references']".freeze
+      NORM_REF = "//bibliography/references[@normative = 'true']".freeze
 
       def boilerplate_isodoc(xmldoc)
         x = xmldoc.dup

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -5,7 +5,7 @@ module Asciidoctor
   module Standoc
     module Cleanup
       def biblio_reorder(xmldoc)
-        xmldoc.xpath("//references[title = 'Bibliography']").each do |r|
+        xmldoc.xpath("//references[@normative = 'false']").each do |r|
           biblio_reorder1(r)
         end
       end
@@ -49,8 +49,8 @@ module Asciidoctor
       # consecutively, but that standards codes are preserved as is:
       # only numeric references are renumbered
       def biblio_renumber(xmldoc)
-        r = xmldoc.at("//references[title = 'Bibliography'] | "\
-                      "//clause[title = 'Bibliography'][.//bibitem]") or return
+        r = xmldoc.at("//references[@normative = 'false'] | "\
+                      "//clause[.//references[@normative = 'false']]") or return
         r.xpath(".//bibitem[not(ancestor::bibitem)]").each_with_index do |b, i|
           next unless docid = b.at("./docidentifier[@type = 'metanorma']")
           next unless  /^\[\d+\]$/.match(docid.text)
@@ -67,18 +67,23 @@ module Asciidoctor
       end
 
       def normref_cleanup(xmldoc)
-        r = xmldoc.at(NORM_REF) || return
-        #return if r.at("./bibitem[1]/preceding-sibling::*[1][local-name()='title']")
-        preface = r.xpath("./title/following-sibling::*") &
+        r = xmldoc.at(self.class::NORM_REF) || return
+        preface = r.xpath("./title/following-sibling::*") & # intersection
           r.xpath("./bibitem[1]/preceding-sibling::*")
         preface.each { |n| n.remove }
       end
 
       def biblio_cleanup(xmldoc)
         biblio_reorder(xmldoc)
+        biblio_nested(xmldoc)
         biblio_renumber(xmldoc)
+      end
+
+      def biblio_nested(xmldoc)
         xmldoc.xpath("//references[references]").each do |t|
           t.name = "clause"
+          t.xpath("./references").each { |r| r["normative"] = t["normative"] }
+          t.delete("normative")
         end
       end
 

data/lib/asciidoctor/standoc/cleanup_section.rb

@@ -11,7 +11,7 @@ module Asciidoctor
     module Cleanup
       def make_preface(x, s)
         if x.at("//foreword | //introduction | //acknowledgements | "\
-            "//clause[@preface]")
+            "//*[@preface]")
           preface = s.add_previous_sibling("<preface/>").first
           f = x.at("//foreword") and preface.add_child f.remove
           f = x.at("//introduction") and preface.add_child f.remove
@@ -22,7 +22,7 @@ module Asciidoctor
       end
 
       def move_clauses_into_preface(x, preface)
-        x.xpath("//clause[@preface]").each do |c|
+        x.xpath("//*[@preface]").each do |c|
           c.delete("preface")
           preface.add_child c.remove
         end
@@ -66,9 +66,22 @@ module Asciidoctor
       def sections_order_cleanup(x)
         s = x.at("//sections")
         make_preface(x, s)
+        make_annexes(x)
         make_bibliography(x, s)
         x.xpath("//sections/annex").reverse_each { |r| s.next = r.remove }
       end
+      
+      def make_annexes(x)
+        x.xpath("//*[@annex]").each do |y|
+          y.delete("annex")
+          next if y.name == "annex"
+          y.wrap("<annex/>")
+          y.parent["id"] = "_#{UUIDTools::UUID.random_create}"
+          y.parent["obligation"] = y["obligation"]
+          y.parent["language"] = y["language"]
+          y.parent["script"] = y["script"]
+        end
+      end
 
       def maxlevel(x)
         max = 5

data/lib/asciidoctor/standoc/inline.rb

@@ -197,7 +197,7 @@ module Asciidoctor
         types = /^data:/.match(uri) ? datauri2mime(uri) : MIME::Types.type_for(uri)
         type = types.first.to_s
         uri = uri.sub(%r{^data:image/\*;}, "data:#{type};")
-        attr_code(src: @datauriimage ? datauri(uri) : uri,
+        attr_code(src: uri, #@datauriimage ? datauri(uri) : uri,
                   id: Utils::anchor_or_uuid,
                   mimetype: type,
                   height: node.attr("height") || "auto",

data/lib/asciidoctor/standoc/isodoc.rng

@@ -129,6 +129,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -303,11 +306,11 @@
         <ref name="paragraph"/>
       </element>
     </define>
-    <define name="TextElement" combine="choice">
-      <ref name="concept"/>
-    </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/asciidoctor/standoc/ref.rb

@@ -153,7 +153,7 @@ module Asciidoctor
       # TODO: alternative where only title is available
       def refitem(xml, item, node)
         unless m = NON_ISO_REF.match(item)
-          @log.add("Asciidoctor Input", node, "#{MALFORMED_REF}: #{item}")
+          @log.add("AsciiDoc Input", node, "#{MALFORMED_REF}: #{item}")
           return
         end
         unless m[:code] && /^\d+$/.match(m[:code])

data/lib/asciidoctor/standoc/section.rb

@@ -53,7 +53,15 @@ module Asciidoctor
       def section_attributes(node)
         { id: Utils::anchor_or_uuid(node),
           language: node.attributes["language"],
-          script: node.attributes["script"] }
+          script: node.attributes["script"],
+          annex: (
+            ((node.attr("style") == "appendix" || node.role == "appendix") && 
+             node.level == 1) ? true : nil
+          ),
+          preface: (
+            (node.role == "preface" || node.attr("style") == "preface") ?
+            true : nil),
+        }
       end
 
       def section(node)
@@ -75,7 +83,12 @@ module Asciidoctor
           else
             if @term_def then term_def_subclause_parse(a, xml, node)
             elsif @definitions then symbols_parse(a, xml, node)
+            elsif @norm_ref then norm_ref_parse(a, xml, node)
             elsif @biblio then bibliography_parse(a, xml, node)
+            elsif node.attr("style") == "bibliography" && sectiontype(node, false) == "normative references"
+              norm_ref_parse(a, xml, node)
+            elsif node.attr("style") == "bibliography" && sectiontype(node, false) == "bibliography"
+              bibliography_parse(a, xml, node)
             elsif node.attr("style") == "bibliography"
               bibliography_parse(a, xml, node)
             elsif node.attr("style") == "abstract" 
@@ -118,7 +131,6 @@ module Asciidoctor
       def clause_parse(attrs, xml, node)
         attrs["inline-header".to_sym] = node.option? "inline-header"
         attrs[:bibitem] = true if node.option? "bibitem"
-        attrs[:preface] = true if node.role == "preface" || node.attr("style") == "preface"
         attrs[:level] = node.attr("level")
         set_obligation(attrs, node)
         xml.send "clause", **attr_code(attrs) do |xml_section|
@@ -137,11 +149,11 @@ module Asciidoctor
       end
 
       def bibliography_parse(attrs, xml, node)
+        node.option? "bibitem" and return bibitem_parse(attrs, xml, node)
         node.attr("style") == "bibliography" or
-          #warn "Section not marked up as [bibliography]!"
-          @log.add("Asciidoctor Input", node, "Section not marked up as [bibliography]!")
+          @log.add("AsciiDoc Input", node, "Section not marked up as [bibliography]!")
         @biblio = true
-        xml.references **attr_code(attrs) do |xml_section|
+        xml.references **attr_code(attrs.merge(normative: false)) do |xml_section|
           title = node.level == 1 ? "Bibliography" : node.title
           xml_section.title { |t| t << title }
           xml_section << node.content
@@ -180,14 +192,16 @@ module Asciidoctor
 
       # subclause contains subclauses
       def term_def_subclause_parse(attrs, xml, node)
-        node.role == "nonterm" ||
-          sectiontype(node, false) == "terms and definitions" and
+        node.role == "nonterm"  and
           return nonterm_term_def_subclause_parse(attrs, xml, node)
+        st = sectiontype(node, false)
         return symbols_parse(attrs, xml, node) if @definitions
         sub = node.find_by(context: :section) { |s| s.level == node.level + 1 }
         sub.empty? || (return term_def_parse(attrs, xml, node, false))
-        sectiontype(node, false) == "symbols and abbreviated terms" and
+        st == "symbols and abbreviated terms" and
           (return symbols_parse(attrs, xml, node))
+        st == "terms and definitions" and
+          return clause_parse(attrs, xml, node)
         term_def_subclause_parse1(attrs, xml, node)
       end
 
@@ -222,9 +236,22 @@ module Asciidoctor
         end
       end
 
+      def bibitem_parse(attrs, xml, node)
+        norm_ref = @norm_ref
+        biblio = @biblio
+        @biblio = false
+        @norm_ref = false
+        clause_parse(attrs, xml, node)
+        @biblio = biblio
+        @norm_ref = norm_ref
+      end
+
       def norm_ref_parse(attrs, xml, node)
+        node.option? "bibitem" and return bibitem_parse(attrs, xml, node)
+        node.attr("style") == "bibliography" or
+          @log.add("AsciiDoc Input", node, "Section not marked up as [bibliography]!")
         @norm_ref = true
-        xml.references **attr_code(attrs) do |xml_section|
+        xml.references **attr_code(attrs.merge(normative: true)) do |xml_section|
           xml_section.title { |t| t << "Normative References" }
           xml_section << node.content
         end

data/lib/asciidoctor/standoc/validate_section.rb

@@ -15,7 +15,7 @@ module Asciidoctor
           annotations = x.elements.select { |e| e.name == "annotation" }
           if callouts.size != annotations.size
             #warn "#{x['id']}: mismatch of callouts and annotations"
-        @log.add("Asciidoctor Input", x, "mismatch of callouts and annotations")
+        @log.add("AsciiDoc Input", x, "mismatch of callouts and annotations")
           end
         end
       end

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-   VERSION = "1.3.26".freeze
+   VERSION = "1.3.27".freeze
   end
 end

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -6,13 +6,14 @@ RSpec.describe Asciidoctor::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       
+      [format="rfc,html"]
       ++++
       <abc>X &gt; Y</abc>
       ++++
     INPUT
         #{BLANK_HDR}
        <sections>
-       <abc>X &gt; Y</abc>
+       <passthrough formats='rfc,html'>&lt;abc&gt;X &gt; Y&lt;/abc&gt;</passthrough>
        </sections>
        </standard-document>
     OUTPUT

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -330,7 +330,7 @@ RSpec.describe Asciidoctor::Standoc do
         <eref type="inline" bibitemid="iso216" citeas="ISO 216:2001"/>
       </p>
       </foreword></preface><sections>
-      </sections><bibliography><references id="_" obligation="informative">
+      </sections><bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso216" type="standard">
@@ -408,7 +408,7 @@ RSpec.describe Asciidoctor::Standoc do
 
         </p>
       </foreword></preface><sections>
-      </sections><bibliography><references id="_" obligation="informative">
+      </sections><bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso216" type="standard">
@@ -446,7 +446,7 @@ RSpec.describe Asciidoctor::Standoc do
          <eref type="inline" bibitemid="iso216" citeas="ISO 216"/>
        </p>
        </foreword></preface><sections>
-       </sections><bibliography><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative" normative="false">
   <title>Bibliography</title>
   <bibitem id="iso216" type="standard">
   <title format="text/plain">Reference</title>
@@ -509,7 +509,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
       #{BLANK_HDR}
       <sections></sections>
-      <bibliography><references id="_" obligation="informative"><title>Normative References</title>
+      <bibliography><references id="_" obligation="informative" normative="true"><title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
              <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -556,7 +556,7 @@ RSpec.describe Asciidoctor::Standoc do
       #{BLANK_HDR}
       <sections> </sections>
          <bibliography>
-           <references id='_' obligation='informative'>
+           <references id='_' obligation='informative' normative="false">
              <title>Bibliography</title>
              <p id='_'>This is extraneous information</p>
              <bibitem id='iso216' type='standard'>
@@ -937,7 +937,7 @@ end
         <p id="_">Footnote2</p>
       </fn>
       </p>
-      </clause></sections><bibliography><references id="_" obligation="informative">
+      </clause></sections><bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso123" type="standard">
@@ -1168,7 +1168,7 @@ end
           </localityStack>
         </origin>
         </termsource>
-        </term></terms></sections><bibliography><references id="_" obligation="informative">
+        </term></terms></sections><bibliography><references id="_" obligation="informative" normative="true">
           <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
           <bibitem type="standard" id="IEC60050-102">
@@ -1338,21 +1338,16 @@ end
   end
 
     it "cleans up text MathML" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      = Document title
-      Author
-      :docfile: test.adoc
-      :nodoc:
-      :novalid:
-      :no-isobib:
-
-      ++++
+      expect(Asciidoctor::Standoc::Converter.new(nil, backend: :standoc, header_footer: true).cleanup(Nokogiri::XML(<<~"INPUT")).to_xml).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{BLANK_HDR}
+      <sections>
       <stem type="MathML">&lt;math xmlns="http://www.w3.org/1998/Math/MathML"&gt;&lt;mfrac&gt;&lt;mn&gt;1&lt;/mn&gt;&lt;mi&gt;r&lt;/mi&gt;&lt;/mfrac&gt;&lt;/math&gt;</stem>
-      ++++
+      </sections>
+      </standard-document>
     INPUT
        #{BLANK_HDR}
        <sections>
-       <stem type="MathML"><math><mfrac><mn>1</mn><mi>r</mi></mfrac></math></stem>
+       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mfrac><mn>1</mn><mi>r</mi></mfrac></math></stem>
 </sections>
 
 
@@ -1380,7 +1375,7 @@ end
   <p id="_"><eref type="inline" bibitemid="iso123" citeas="[2]"/>
 <eref type="inline" bibitemid="iso124" citeas="ISO 124"/></p>
 </clause>
-</sections><bibliography><references id="_" obligation="informative">
+</sections><bibliography><references id="_" obligation="informative" normative="false">
   <title>Bibliography</title>
   <bibitem id="iso124" type="standard">
   <title format="text/plain">Standard 124</title>
@@ -1436,7 +1431,7 @@ OUTPUT
        <eref type="inline" bibitemid="iso125" citeas="ISO 125"/>
        <eref type="inline" bibitemid="iso126" citeas="[4]"/></p>
        </clause>
-       </sections><bibliography><clause id="_" obligation="informative"><title>Bibliography</title><references id="_" obligation="informative">
+       </sections><bibliography><clause id="_" obligation="informative"><title>Bibliography</title><references id="_" obligation="informative" normative="false">
          <title>Clause 1</title>
          <bibitem id="iso124" type="standard">
          <title format="text/plain">Standard 124</title>
@@ -1456,8 +1451,7 @@ OUTPUT
          <docidentifier type="metanorma">[2]</docidentifier>
        </bibitem>
        </references>
-       <references id="_" obligation="informative">
-         
+       <references id="_" obligation="informative" normative="false">
          <bibitem id="iso125" type="standard">
          <title format="text/plain">Standard 124</title>
          <docidentifier>ISO 125</docidentifier>
@@ -1491,7 +1485,7 @@ OUTPUT
       #{BLANK_HDR}
       <sections>
 
-</sections><bibliography><references id="_" obligation="informative">
+</sections><bibliography><references id="_" obligation="informative" normative="true">
   <title>Normative References</title><p id="_">There are no normative references in this document.</p>
 </references></bibliography>
 </standard-document>
@@ -1510,7 +1504,7 @@ OUTPUT
     #{BLANK_HDR}
     <sections>
 
-       </sections><bibliography><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative References</title><p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <bibitem id="a">
          <formattedref format="application/x-isodoc+xml">A</formattedref>
@@ -1539,7 +1533,7 @@ it "inserts boilerplate before empty Normative References in French" do
     #{BLANK_HDR.sub(/<language>en/, "<language>fr")}
     <sections>
 
-</sections><bibliography><references id="_" obligation="informative">
+</sections><bibliography><references id="_" obligation="informative" normative="true">
   <title>Normative References</title><p id="_">Le présent document ne contient aucune référence normative.</p>
 </references></bibliography>
 </standard-document>
@@ -1584,7 +1578,7 @@ it "removes bibdata bibitem IDs" do
   </bibdata>
   <sections> </sections>
   <bibliography>
-    <references id='_' obligation='informative'>
+    <references id='_' obligation='informative' normative="true">
       <title>Normative References</title>
       <p id="_">There are no normative references in this document.</p>
     </references>

data/spec/asciidoctor-standoc/inline_spec.rb

@@ -227,7 +227,7 @@ text, including <strong><em>nest</em></strong>ed markup.</p>
             #{BLANK_HDR}
        <sections>
 
-       </sections><bibliography><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative References</title>
          <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <bibitem id="ISO712">

data/spec/asciidoctor-standoc/macros_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Asciidoctor::Standoc do
 </preface>
 <sections> </sections>
 <bibliography>
-  <references id='_' obligation='informative'>
+  <references id='_' obligation='informative' normative="false">
     <title>Bibliography</title>
     <bibitem id='ref1'>
       <formattedref format='application/x-isodoc+xml'>
@@ -178,7 +178,7 @@ INPUT
   </clause>
 </sections>
 <bibliography>
-  <references id='_' obligation='informative'>
+  <references id='_' obligation='informative' normative="false">
     <title>Bibliography</title>
     <bibitem id='blah'>
       <formattedref format='application/x-isodoc+xml'>

data/spec/asciidoctor-standoc/refs_dl_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
       #{BLANK_HDR}
       <sections>
-      </sections><bibliography><references id="_" obligation="informative">
+      </sections><bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso123" type="standard">
@@ -287,7 +287,7 @@ formattedref::
     INPUT
       #{BLANK_HDR}
       <sections>
-      </sections><bibliography><references id="_" obligation="informative">
+      </sections><bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="TC211" type="standard">
@@ -605,7 +605,7 @@ series.formattedref.script:: Latn
     INPUT
       #{BLANK_HDR}
       <sections>
-      </sections><bibliography><references id="_" obligation="informative">
+      </sections><bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="TC211" type="standard">
@@ -757,4 +757,92 @@ home run record in 1998.</note>
 OUTPUT
        end
 
+   it "processes mix of dl and default references" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+      
+      == Section
+
+      === Subsection
+
+      [bibliography]
+      === Normative References
+
+      * [[[A, B]]], Title
+
+      [%bibitem]
+      ==== Standard
+      id:: iso123
+      docid::
+        type::: ISO
+        id::: ISO 123
+      type:: standard
+      contributor::
+        role::: publisher
+        organization:::
+          name:::: ISO
+      contributor::
+        role::: author
+        person:::
+          name::::
+      +
+      --
+      completename::
+        language::: en
+        content::: Fred
+      --
+      contributor::
+        role::: author
+        person:::
+        name::::
+          completename::::: Jack
+
+    INPUT
+          #{BLANK_HDR}
+     <sections>
+   <clause id='_' inline-header='false' obligation='normative'>
+     <title>Section</title>
+     <clause id='_' inline-header='false' obligation='normative'>
+       <title>Subsection</title>
+     </clause>
+     <references id='_' obligation='informative'  normative="true">
+       <title>Normative References</title>
+       <bibitem id='A'>
+         <formattedref format='application/x-isodoc+xml'>Title</formattedref>
+         <docidentifier>B</docidentifier>
+       </bibitem>
+       <bibitem id='iso123' type='standard'>
+         <fetched>#{Date.today.to_s}</fetched>
+         <title type='main' format='text/plain' language='en' script='Latn'>Standard</title>
+         <docidentifier type='ISO'>ISO 123</docidentifier>
+         <contributor>
+           <role type='publisher'/>
+           <organization>
+             <name>ISO</name>
+           </organization>
+         </contributor>
+         <contributor>
+           <role type='author'/>
+           <person>
+             <name>
+               <completename language='en'>Fred</completename>
+             </name>
+           </person>
+         </contributor>
+         <contributor>
+           <role type='author'/>
+           <person>
+             <name>
+               <completename>Jack</completename>
+             </name>
+           </person>
+         </contributor>
+       </bibitem>
+     </references>
+   </clause>
+ </sections>
+</standard-document>
+OUTPUT
+
+end
 end

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
       #{BLANK_HDR}
       <sections>
-      </sections><bibliography><references id="_" obligation="informative">
+      </sections><bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso123" type="standard">
@@ -57,7 +57,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
       #{BLANK_HDR}
       <sections>
-      </sections><bibliography><references id="_" obligation="informative">
+      </sections><bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso123" type="standard">
@@ -125,7 +125,7 @@ RSpec.describe Asciidoctor::Standoc do
   </foreword>
 </preface>
        <sections>
-       </sections><bibliography><references id="_" obligation="informative"><title>Normative References</title>
+       </sections><bibliography><references id="_" obligation="informative" normative="true"><title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
 <bibitem type="standard" id="iso123">
   <uri type="src">https://www.iso.org/standard/23281.html</uri>
@@ -236,7 +236,7 @@ RSpec.describe Asciidoctor::Standoc do
         #{BLANK_HDR}
        <sections>
 
-       </sections><bibliography><references id="_" obligation="informative"><title>Normative References</title>
+       </sections><bibliography><references id="_" obligation="informative" normative="true"><title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
          <bibitem id='iso123' type='standard'>
                <fetched>#{Date.today}</fetched>
@@ -469,7 +469,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
        #{BLANK_HDR}
               <sections>
-       </sections><bibliography><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
          <bibitem id="iso123" type="standard">
@@ -518,7 +518,7 @@ RSpec.describe Asciidoctor::Standoc do
         #{BLANK_HDR}
         <sections>
 
-        </sections><bibliography><references id="_" obligation="informative">
+        </sections><bibliography><references id="_" obligation="informative" normative="true">
           <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
           <bibitem type="standard" id="iso123">
@@ -741,7 +741,7 @@ RSpec.describe Asciidoctor::Standoc do
         #{BLANK_HDR}
         <sections>
 
-        </sections><bibliography><references id="_" obligation="informative">
+        </sections><bibliography><references id="_" obligation="informative" normative="true">
           <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id='iso123'>
@@ -820,7 +820,7 @@ OUTPUT
     INPUT
        #{BLANK_HDR}
        <sections>
-              </sections><bibliography><references id="_" obligation="informative">
+              </sections><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
          <bibitem id="iso123" type="standard">
@@ -901,7 +901,7 @@ OUTPUT
     INPUT
       #{BLANK_HDR}
       <sections>
-      </sections><bibliography><references id="_" obligation="informative">
+      </sections><bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso123" type="standard">
@@ -968,7 +968,7 @@ OUTPUT
     <eref type="inline" bibitemid="iso123" citeas="RFC 8341"/>
   </p>
   </clause>
-  </sections><bibliography><references id="_" obligation="informative">
+  </sections><bibliography><references id="_" obligation="informative" normative="true">
   <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
   <bibitem id="iso123" type="standard">
@@ -1095,7 +1095,7 @@ OUTPUT
        #{BLANK_HDR}
               <sections>
 
-       </sections><bibliography><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
          <bibitem id="iso123">
@@ -1135,7 +1135,7 @@ OUTPUT
               <sections>
 
        </sections>
-       <bibliography><references id="_" obligation="informative">
+       <bibliography><references id="_" obligation="informative" normative="false">
          <title>Bibliography</title><bibitem id="iso123">
          <formattedref format="application/x-isodoc+xml">
            <em>Standard</em>
@@ -1199,7 +1199,7 @@ OUTPUT
       </bibdata>
       <sections>
 
-      </sections><bibliography><references id="_" obligation="informative">
+      </sections><bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso123" type="standard">

data/spec/asciidoctor-standoc/section_spec.rb

@@ -167,12 +167,12 @@ RSpec.describe Asciidoctor::Standoc do
   <clause id="_" inline-header="false" obligation="normative">
   <title>Annex A.1</title>
 </clause>
-</annex><bibliography><references id="_" obligation="informative">
+</annex><bibliography><references id="_" obligation="informative" normative="true">
   <title>Normative References</title>
   <p id="_">There are no normative references in this document.</p>
 </references><clause id="_" obligation="informative">
   <title>Bibliography</title>
-  <references id="_" obligation="informative">
+  <references id="_" obligation="informative" normative="false">
   <title>Bibliography Subsection</title>
 </references>
 </clause></bibliography>
@@ -372,12 +372,12 @@ RSpec.describe Asciidoctor::Standoc do
          <clause id="_" language="en" script="Latn" inline-header="false" obligation="normative">
          <title>Annex A.1</title>
        </clause>
-       </annex><bibliography><references id="_" language="en" script="Latn" obligation="informative">
+       </annex><bibliography><references id="_" language="en" script="Latn" obligation="informative" normative="true">
          <title>Normative References</title>
          <p id="_">There are no normative references in this document.</p>
        </references><clause id="_" language="en" script="Latn" obligation="informative">
          <title>Bibliography</title>
-         <references id="_" language="en" script="Latn" obligation="informative">
+         <references id="_" language="en" script="Latn" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause></bibliography>
@@ -502,13 +502,13 @@ RSpec.describe Asciidoctor::Standoc do
     </clause>
   </annex>
   <bibliography>
-    <references id='_' obligation='informative'>
+    <references id='_' obligation='informative' normative="true">
       <title>Normative References</title>
       <p id="_">There are no normative references in this document.</p>
     </references>
     <clause id='_' obligation='informative'>
       <title>Bibliography</title>
-      <references id='_' obligation='informative'>
+      <references id='_' obligation='informative' normative="false">
         <title>Bibliography Subsection</title>
       </references>
     </clause>
@@ -843,4 +843,137 @@ RSpec.describe Asciidoctor::Standoc do
         INPUT
     end
 
+    it "treats terminal terms subclause named as terms clause as a normal clause" do
+           expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+#{ASCIIDOC_BLANK_HDR}
+[[tda]]
+== Terms, definitions, symbols and abbreviations
+
+[[terms]]
+=== Terms and definitions
+
+=== Symbols
+
+INPUT
+#{BLANK_HDR}
+  <sections>
+    <terms id='tda' obligation='normative'>
+      <title>Terms, definitions, symbols and abbreviated terms</title>
+      <p id='_'>No terms and definitions are listed in this document.</p>
+      <clause id='terms' inline-header='false' obligation='normative'>
+        <title>Terms and definitions</title>
+      </clause>
+      <definitions id='_'>
+        <title>Symbols</title>
+      </definitions>
+    </terms>
+  </sections>
+</standard-document>
+
+OUTPUT
+    end
+
+    it "treats non-terminal terms subclause named as terms clause as a terms clause" do
+           expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+#{ASCIIDOC_BLANK_HDR}
+== Scope
+
+[[tda]]
+== Terms, definitions, symbols and abbreviations
+
+[[terms]]
+=== Terms and definitions
+
+[[terms-concepts]]
+==== Basic concepts
+
+[[term-date]]
+===== date
+
+_time_ (<<term-time>>) on the _calendar_ (<<term-calendar>>) _time scale_ (<<term-time-scale>>)
+
+INPUT
+#{BLANK_HDR}
+ <sections>
+   <clause id='_' inline-header='false' obligation='normative'>
+     <title>Scope</title>
+   </clause>
+   <clause id='tda' obligation='normative'>
+     <title>Terms and definitions</title>
+     <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+     <clause id='terms' obligation='normative'>
+       <title>Terms and definitions</title>
+       <terms id='terms-concepts' obligation='normative'>
+         <title>Basic concepts</title>
+         <term id='term-date'>
+           <preferred>date</preferred>
+           <definition>
+             <p id='_'>
+               <em>time</em>
+                (
+               <xref target='term-time'/>
+               ) on the
+               <em>calendar</em>
+                (
+               <xref target='term-calendar'/>
+               )
+               <em>time scale</em>
+                (
+               <xref target='term-time-scale'/>
+               )
+             </p>
+           </definition>
+         </term>
+       </terms>
+     </clause>
+   </clause>
+ </sections>
+</standard-document>
+OUTPUT
+    end
+
+    it "leaves alone special titles in preface or appendix" do
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(strip_guid(<<~"OUTPUT"))
+#{ASCIIDOC_BLANK_HDR}
+
+[.preface]
+[[t1]]
+== Terms and definitions
+
+[[t2]]
+=== Term1
+
+[appendix,language=fr]
+[[sym]]
+== Symbols and abbreviated terms
+
+[.appendix]
+[[app]]
+[bibliography]
+== Normative Reference
+INPUT
+#{BLANK_HDR}
+  <preface>
+    <terms id='t1' obligation='normative'>
+      <title>Terms and definitions</title>
+      <term id='t2'>
+        <preferred>Term1</preferred>
+      </term>
+    </terms>
+  </preface>
+  <sections> </sections>
+  <annex id='_' obligation='' language='fr' script=''>
+    <definitions id='sym' language='fr'>
+      <title>Symbols and abbreviated terms</title>
+    </definitions>
+  </annex>
+  <annex id='_' obligation='' language='' script=''>
+    <references id='app' obligation='informative' normative="false">
+      <title>Bibliography</title>
+    </references>
+  </annex>
+</standard-document>
+OUTPUT
+    end
+
 end

data/spec/asciidoctor-standoc/validate_spec.rb

@@ -237,5 +237,22 @@ it "warns if id used twice" do
   expect(File.read("test.err")).to include "Anchor abc has already been used at line"
 end
 
+it "err file succesfully created for docfile path" do
+  FileUtils.rm_rf "test"
+  FileUtils.mkdir_p "test"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+  = Document title
+  Author
+  :docfile: test#{File::ALT_SEPARATOR || File::SEPARATOR}test.adoc
+  :nodoc:
+
+  [[abc]]
+  == Clause 1
+
+  [[abc]]
+  == Clause 2
+  INPUT
+  expect(File.read("test/test.err")).to include "Anchor abc has already been used at line"
+end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.3.26
+  version: 1.3.27
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor