metanorma-standoc 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d40164559c6167d8a76a56feec14ad218ad6b3151419dd7f5069859daf39945
-  data.tar.gz: 55b683b4abb435f27648c042092526121b9235cebe9dfc95ce633efe9af3e057
+  metadata.gz: a96726969ceffd8d3d05779e0f81db28972e6932a670cf93745a5006e881f392
+  data.tar.gz: 2d042cb06685449297536817bf622421222e0de78f285ca7c4ceab8f847127bb
 SHA512:
-  metadata.gz: 94f95a9f73f40f7037fccda3c15f7608e570f3cef8903aa3f11e4540d370bf9f84809dd2566fdf27106a263c5cf16fcef2757be434ff9d85f7ee424224240012
-  data.tar.gz: 17579d0d6cd9d1401a847d0cc9fe519a95b6708d181f621a8592b615d2b09ef9376452c20aa8e8baaa55ca3b6630a1a28c26dc38d557304f10086ab369b23188
+  metadata.gz: 440f9483f3b0cfa94769d357b40a314d26068975371bf2b54c7a0689cdd2bfdd2fb1cc4c877e097666b3d6c36545c09b7e40809d80aa095a132e810de6a02ede
+  data.tar.gz: c39511c530a2530eb7ec4c430bc8917041d270f2643993609a844930415150e9b701a56ab31b550e79312f7a854205ff920e7d7e6f07acb90d995920681ee789

data/lib/asciidoctor/standoc/cleanup.rb

@@ -169,6 +169,15 @@ module Asciidoctor
         end
       end
 
+      def term_children_cleanup(xmldoc)
+        xmldoc.xpath("//term").each do |t|
+          ex = t.xpath("./termexample")
+          t.xpath("./termnote").each { |n| t << n.remove }
+          t.xpath("./termexample").each { |n| t << n.remove }
+          t.xpath("./termsource").each { |n| t << n.remove }
+        end
+      end
+
       def termdef_cleanup(xmldoc)
         termdef_unnest_cleanup(xmldoc)
         termdef_stem_cleanup(xmldoc)
@@ -176,6 +185,7 @@ module Asciidoctor
         termdefinition_cleanup(xmldoc)
         termdef_boilerplate_cleanup(xmldoc)
         termdef_subclause_cleanup(xmldoc)
+        term_children_cleanup(xmldoc)
         termdocsource_cleanup(xmldoc)
       end
 

data/lib/asciidoctor/standoc/section.rb

@@ -22,7 +22,8 @@ module Asciidoctor
 
       def sectiontype(node)
         ret = node&.attr("heading")&.downcase || node.title.downcase
-        return ret if ret == "symbols and abbreviated terms"
+        return ret if ["symbols and abbreviated terms", "abbreviations",
+                       "abbreviated terms", "symbols"].include? ret
         return nil unless node.level == 1
         return nil if @seen_headers.include? ret
         @seen_headers << ret
@@ -44,7 +45,10 @@ module Asciidoctor
             @term_def = true
             term_def_parse(a, xml, node, true)
             @term_def = false
-          when "symbols and abbreviated terms"
+          when "symbols and abbreviated terms",
+            "symbols",
+            "abbreviated terms",
+            "abbreviations"
             symbols_parse(a, xml, node)
           when "bibliography" then bibliography_parse(a, xml, node)
           else
@@ -110,6 +114,7 @@ module Asciidoctor
 
       # subclause contains subclauses
       def term_def_subclause_parse(attrs, xml, node)
+        return clause_parse(attrs, xml, node) if node.role == "nonterm"
         sub = node.find_by(context: :section) { |s| s.level == node.level + 1 }
         sub.empty? || (return term_def_parse(attrs, xml, node, false))
         node.title.casecmp("symbols and abbreviated terms").zero? &&

data/lib/asciidoctor/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.2".freeze
+    VERSION = "1.0.3".freeze
   end
 end

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -695,6 +695,52 @@ r = 1 %</stem>
     OUTPUT
   end
 
+    it "rearranges term note, term example, term source" do
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      #{ASCIIDOC_BLANK_HDR}
+
+      == Terms and definitions
+
+      === Term
+
+      [.source]
+      <<ISO2191,section=1>>
+
+      NOTE: Note
+
+      [example]
+      Example 1
+
+      NOTE: Note 2
+
+      [example]
+      Example 2
+    INPUT
+       #{BLANK_HDR}
+       <sections>
+       <terms id="_" obligation="normative">
+         <title>Terms and definitions</title>
+         <term id="_"><preferred>Term</preferred>
+
+
+
+       <termnote id="_">
+         <p id="_">Note</p>
+       </termnote><termnote id="_">
+         <p id="_">Note 2</p>
+       </termnote><termexample id="_">
+         <p id="_">Example 1</p>
+       </termexample><termexample id="_">
+         <p id="_">Example 2</p>
+       </termexample><termsource status="identical">
+         <origin bibitemid="ISO2191" type="inline" citeas=""><locality type="section"><referenceFrom>1</referenceFrom></locality></origin>
+       </termsource></term>
+       </terms>
+       </sections>
+       </standard-document>
+    OUTPUT
+  end
+
   it "extends clause levels past 5" do
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
     #{ASCIIDOC_BLANK_HDR}

data/spec/asciidoctor-standoc/section_spec.rb

@@ -24,6 +24,9 @@ RSpec.describe Asciidoctor::Standoc do
 
       == Terms, Definitions, Symbols and Abbreviated Terms
 
+      [.nonterm]
+      === Introduction
+
       === Normal Terms
 
       ==== Term2
@@ -53,10 +56,13 @@ RSpec.describe Asciidoctor::Standoc do
        <preface><foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">Text</p>
-       </foreword><introduction id="_" obligation="informative"><title>Introduction</title><clause id="_" inline-header="false" obligation="informative">
+       </foreword><introduction id="_" obligation="informative">
+         <title>Introduction</title>
+         <clause id="_" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
        </introduction></preface><sections>
+
        <clause id="_" inline-header="false" obligation="normative">
          <title>Scope</title>
          <p id="_">Text</p>
@@ -68,7 +74,10 @@ RSpec.describe Asciidoctor::Standoc do
          <preferred>Term1</preferred>
        </term>
        </terms>
-       <clause id="_" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="_" obligation="normative">
+       <clause id="_" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><clause id="_" inline-header="false" obligation="normative">
+         <title>Introduction</title>
+       </clause>
+       <terms id="_" obligation="normative">
          <title>Normal Terms</title>
          <term id="_">
          <preferred>Term2</preferred>
@@ -83,9 +92,8 @@ RSpec.describe Asciidoctor::Standoc do
          <title>Clause 4.2</title>
        </clause></clause>
        <clause id="_" inline-header="false" obligation="normative">
-        <title>Terms and Definitions</title>
-        </clause>
-
+         <title>Terms and Definitions</title>
+       </clause>
 
        </sections><annex id="_" inline-header="false" obligation="normative">
          <title>Annex</title>
@@ -99,8 +107,7 @@ RSpec.describe Asciidoctor::Standoc do
          <references id="_" obligation="informative">
          <title>Bibliography Subsection</title>
        </references>
-       </clause>
-       </bibliography>
+       </clause></bibliography>
        </standard-document>
     OUTPUT
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-25 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor