metanorma-standoc 1.3.13 → 1.3.14

data/spec/asciidoctor-standoc/macros_spec.rb

@@ -18,6 +18,144 @@ RSpec.describe Asciidoctor::Standoc do
     OUTPUT
   end
 
+    it "processes the Asciidoctor::Standoc concept macros" do
+          expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+      {{clause1}}
+      {{clause1,w\[o\]rd}}
+      {{clause1,w\[o\]rd,term}}
+      {{blah}}
+      {{blah,word}}
+      {{blah,word,term}}
+      {{blah,clause=3.1}}
+      {{blah,clause=3.1,word}}
+      {{blah,clause=3.1,word,term}}
+      {{blah,clause=3.1,figure=a}}
+      {{blah,clause=3.1,figure=a,word}}
+      {{blah,clause=3.1,figure=a,word,term}}
+      {{IEV:135-13-13}}
+      {{IEV:135-13-13,word}}
+      {{IEV:135-13-13,word,term}}
+
+      [[clause1]]
+      == Clause
+      Terms are defined here
+
+      [bibliography]
+      == Bibliography
+      * [[[blah,blah]]] _Blah_
+INPUT
+#{BLANK_HDR}
+<preface>
+  <foreword obligation='informative'>
+    <title>Foreword</title>
+    <p id='_'>
+      <concept>
+        <xref target='clause1'/>
+      </concept>
+      <concept>
+        <xref target='clause1'>w[o]rd</xref>
+      </concept>
+      <concept term='term'>
+        <xref target='clause1'>w[o]rd</xref>
+      </concept>
+      <concept>
+        <eref/>
+      </concept>
+      <concept>
+        <eref>word</eref>
+      </concept>
+      <concept term='term'>
+        <eref>word</eref>
+      </concept>
+      <concept>
+        <eref>
+          <locality type='clause'>
+            <referenceFrom>3.1</referenceFrom>
+          </locality>
+        </eref>
+      </concept>
+      <concept>
+        <eref>
+          <locality type='clause'>
+            <referenceFrom>3.1</referenceFrom>
+          </locality>
+          word
+        </eref>
+      </concept>
+      <concept term='term'>
+        <eref>
+          <locality type='clause'>
+            <referenceFrom>3.1</referenceFrom>
+          </locality>
+          word
+        </eref>
+      </concept>
+      <concept>
+        <eref>
+          <locality type='clause'>
+            <referenceFrom>3.1</referenceFrom>
+          </locality>
+          <locality type='figure'>
+            <referenceFrom>a</referenceFrom>
+          </locality>
+        </eref>
+      </concept>
+      <concept>
+        <eref>
+          <locality type='clause'>
+            <referenceFrom>3.1</referenceFrom>
+          </locality>
+          <locality type='figure'>
+            <referenceFrom>a</referenceFrom>
+          </locality>
+          word
+        </eref>
+      </concept>
+      <concept term='term'>
+        <eref>
+          <locality type='clause'>
+            <referenceFrom>3.1</referenceFrom>
+          </locality>
+          <locality type='figure'>
+            <referenceFrom>a</referenceFrom>
+          </locality>
+          word
+        </eref>
+      </concept>
+      <concept>
+        <termref base='IEV' target='135-13-13'/>
+      </concept>
+      <concept>
+        <termref base='IEV' target='135-13-13'>word</termref>
+      </concept>
+      <concept term='term'>
+        <termref base='IEV' target='135-13-13'>word</termref>
+      </concept>
+    </p>
+  </foreword>
+</preface>
+<sections>
+  <clause id='clause1' inline-header='false' obligation='normative'>
+    <title>Clause</title>
+    <p id='_'>Terms are defined here</p>
+  </clause>
+</sections>
+<bibliography>
+  <references id='_' obligation='informative'>
+    <title>Bibliography</title>
+    <bibitem id='blah'>
+      <formattedref format='application/x-isodoc+xml'>
+        <em>Blah</em>
+      </formattedref>
+      <docidentifier>blah</docidentifier>
+    </bibitem>
+  </references>
+</bibliography>
+</standard-document>
+OUTPUT
+    end
+
   it "processes the TODO custom admonition" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -114,9 +252,9 @@ RSpec.describe Asciidoctor::Standoc do
        </standard-document>
     OUTPUT
   end
-
+  
   it "processes the PlantUML macro" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).gsub(%r{plantuml/[^.]{36}\.}, "plantuml/_."))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).gsub(%r{plantuml/plantuml[^.]+\.}, "plantuml/_."))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
 
       [plantuml]

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -188,6 +188,7 @@ RSpec.describe Asciidoctor::Standoc do
              <formattedref format="text/plain">ISO 123:1985</formattedref>
            </bibitem>
          </relation>
+         <place>Geneva</place>
          </bibitem> </references></bibliography>
        </standard-document>
        OUTPUT
@@ -339,6 +340,7 @@ RSpec.describe Asciidoctor::Standoc do
               </organization>
             </owner>
           </copyright>
+          <place>Geneva</place>
         </bibitem>
           <bibitem type="standard" id="iso124">
           <fetched>#{Date.today}</fetched>
@@ -387,6 +389,7 @@ RSpec.describe Asciidoctor::Standoc do
               <formattedref format="text/plain">ISO 124:2011</formattedref>
             </bibitem>
           </relation>
+          <place>Geneva</place>
         </bibitem>
         </references></bibliography>
         </standard-document>
@@ -464,6 +467,7 @@ RSpec.describe Asciidoctor::Standoc do
                    <formattedref format='text/plain'>ISO 124:2011</formattedref>
                  </bibitem>
                </relation>
+                 <place>Geneva</place>
              </bibitem>
         </references></bibliography></standard-document>
 OUTPUT

data/spec/asciidoctor-standoc/section_spec.rb

@@ -75,7 +75,7 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Bibliography Subsection
     INPUT
-             #{BLANK_HDR.sub(/<status>/, "<abstract> <p id='_'>Text</p> </abstract><status>")}
+             #{BLANK_HDR.sub(/<status>/, "<abstract> <p>Text</p> </abstract><status>")}
     <preface><abstract id="_">
   <p id="_">Text</p>
 </abstract><foreword obligation="informative">
@@ -96,7 +96,7 @@ RSpec.describe Asciidoctor::Standoc do
 
 <terms id="_" obligation="normative">
   <title>Terms and definitions</title>
-  <p>For the purposes of this document,
+  <p id="_">For the purposes of this document,
        the following terms and definitions apply.</p>
   <term id="_">
   <preferred>Term1</preferred>
@@ -155,7 +155,7 @@ RSpec.describe Asciidoctor::Standoc do
 </clause>
 </annex><bibliography><references id="_" obligation="informative">
   <title>Normative References</title>
-  <p>There are no normative references in this document.</p>
+  <p id="_">There are no normative references in this document.</p>
 </references><clause id="_" obligation="informative">
   <title>Bibliography</title>
   <references id="_" obligation="informative">
@@ -263,7 +263,7 @@ RSpec.describe Asciidoctor::Standoc do
       [language=en,script=Latn]
       === Bibliography Subsection
     INPUT
-             #{BLANK_HDR.sub(/<status>/, "<abstract> <p id='_'>Text</p> </abstract><status>")}
+             #{BLANK_HDR.sub(/<status>/, "<abstract> <p>Text</p> </abstract><status>")}
      <preface><abstract id="_" language="en" script="Latn">
          <p id="_">Text</p>
        </abstract><foreword obligation="informative">
@@ -284,7 +284,7 @@ RSpec.describe Asciidoctor::Standoc do
 
        <terms id="_" language="en" script="Latn" obligation="normative">
          <title>Terms and definitions</title>
-         <p>For the purposes of this document,
+         <p id="_">For the purposes of this document,
        the following terms and definitions apply.</p>
          <term id="_" language="en" script="Latn">
          <preferred>Term1</preferred>
@@ -343,7 +343,7 @@ RSpec.describe Asciidoctor::Standoc do
        </clause>
        </annex><bibliography><references id="_" language="en" script="Latn" obligation="informative">
          <title>Normative References</title>
-         <p>There are no normative references in this document.</p>
+         <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">
@@ -408,7 +408,7 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Bibliography Subsection
     INPUT
-             #{BLANK_HDR.sub(/<status>/, "<abstract> <p id='_'>Text</p> </abstract><status>")}
+             #{BLANK_HDR.sub(/<status>/, "<abstract> <p>Text</p> </abstract><status>")}
       <preface>
     <abstract id='_'>
       <p id='_'>Text</p>
@@ -427,7 +427,7 @@ RSpec.describe Asciidoctor::Standoc do
   <sections>
     <terms id='_' obligation='normative'>
       <title>Terms and definitions</title>
-      <p>For the purposes of this document, the following terms and definitions apply.</p>
+      <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
       <term id='_'>
         <preferred>Term1</preferred>
       </term>
@@ -466,7 +466,7 @@ RSpec.describe Asciidoctor::Standoc do
   <bibliography>
     <references id='_' obligation='informative'>
       <title>Normative References</title>
-      <p>There are no normative references in this document.</p>
+      <p id="_">There are no normative references in this document.</p>
     </references>
     <clause id='_' obligation='informative'>
       <title>Bibliography</title>
@@ -580,7 +580,7 @@ RSpec.describe Asciidoctor::Standoc do
          <p id="_">Foreword</p>
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
-          <title>Terms and definitions</title><p>For the purposes of this document, the terms and definitions 
+          <title>Terms and definitions</title><p id="_">For the purposes of this document, the terms and definitions 
   given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> and the following apply.</p>
   <term id="_">
   <preferred>Term1</preferred>
@@ -607,7 +607,7 @@ RSpec.describe Asciidoctor::Standoc do
          <p id="_">Foreword</p>
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
-          <title>Terms and definitions</title><p>No terms and definitions are listed in this document.</p>
+          <title>Terms and definitions</title><p id="_">No terms and definitions are listed in this document.</p>
        </terms></sections>
        </standard-document>
 
@@ -633,7 +633,7 @@ RSpec.describe Asciidoctor::Standoc do
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
-         <p>For the purposes of this document,
+         <p id="_">For the purposes of this document,
         the terms and definitions given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> apply.</p>
 
 
@@ -667,7 +667,7 @@ RSpec.describe Asciidoctor::Standoc do
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
-        <p>Pour les besoins du présent document, les termes et définitions de <eref bibitemid="iso1234"/> et <eref bibitemid="iso5678"/> s'appliquent.</p>
+        <p id="_">Pour les besoins du présent document, les termes et définitions de <eref bibitemid="iso1234"/> et <eref bibitemid="iso5678"/> s'appliquent.</p>
 
 
        </terms></sections>
@@ -699,7 +699,7 @@ RSpec.describe Asciidoctor::Standoc do
          <p id="_">Foreword</p>
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
-         <title>Terms and definitions</title><p><eref bibitemid="iso1234"/>和<eref bibitemid="iso5678"/>界定的术语和定义适用于本文件。</p>
+         <title>Terms and definitions</title><p id="_"><eref bibitemid="iso1234"/>和<eref bibitemid="iso5678"/>界定的术语和定义适用于本文件。</p>
      
          
          

data/spec/asciidoctor-standoc/validate_spec.rb

@@ -140,4 +140,13 @@ it "No warning if French term matches IEV" do
   FileUtils.mv File.expand_path("~/.iev.pstore1"), File.expand_path("~/.iev/cache"), force: true
 end
 
+it "No warning if attributes on formatted strong or stem extraneous to Metanomra XML" do
+  expect { Asciidoctor::Standoc::Converter.new(nil,nil).validate(Nokogiri::XML(<<~INPUT)) }.not_to output('found attribute "close", but no attributes allowed here').to_stderr
+  <standard-document>
+  <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mfenced open="(" close=")"><mi>r</mi></mfenced></stem>
+  </standard-document>
+INPUT
+
+end
+
 end

data/spec/spec_helper.rb

@@ -123,7 +123,7 @@ VALIDATING_BLANK_HDR = <<~"HDR"
 HDR
 
 NORM_REF_BOILERPLATE = <<~"HDR"
-<p>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>
+<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>
 HDR
 
 BLANK_HDR = <<~"HDR"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement
@@ -372,9 +372,12 @@ files:
 - lib/asciidoctor/standoc/cleanup_block.rb
 - lib/asciidoctor/standoc/cleanup_boilerplate.rb
 - lib/asciidoctor/standoc/cleanup_footnotes.rb
+- lib/asciidoctor/standoc/cleanup_inline.rb
 - lib/asciidoctor/standoc/cleanup_ref.rb
+- lib/asciidoctor/standoc/cleanup_section.rb
 - lib/asciidoctor/standoc/converter.rb
 - lib/asciidoctor/standoc/front.rb
+- lib/asciidoctor/standoc/front_contributor.rb
 - lib/asciidoctor/standoc/i18n.rb
 - lib/asciidoctor/standoc/inline.rb
 - lib/asciidoctor/standoc/isodoc.rng