metanorma-iec 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd21e4886d8c7426dd1e57de8b2b9a5ab7084ba8531511b3c0f0de3a45bf4a3
-  data.tar.gz: 9f79a235ac0257bb71402e21dc68db605550bdafc8c9147a559ed2c687e1fad0
+  metadata.gz: 9269b3c3d3cbca9003e0cd77a30cd9a8e2c170236c43ff5d75621aaac3c3a49d
+  data.tar.gz: e942d482fb73842b2f1334219a99c1e90ac385e9451d96e4898c731caf601d9b
 SHA512:
-  metadata.gz: 27946ec01bc3ed4506e848ba8595fee579e9e071cb994995ef658cd93c44e943f62487e1d5b458abde6024acb376adc48154030e0367e382a29f40540cc56abb
-  data.tar.gz: 21bd7b1f85dafbc5da6994884c38119efa661fd3eca7f8b5e81f61e7f311ccca0dd5e983b3f929c5638011580563a344b4cec1602e7a3ed535408be187d6c8b0
+  metadata.gz: e90aa07d513f24ed78748662e3fc40e581ca5fddcf66a6f20d05bf54014f7c2803e64dfd02e67cb05b82125783e14915ea04ade4e23245ecf989c5eb941397eb
+  data.tar.gz: 633db8ee4bd8e6b36643523a54c9683f789b7da74f6394be682dee63d4666ba3f9503dbcc62087753d41977a60b56743f6a57dc859c9691452fed278fe9eb738

data/README.adoc

@@ -1,11 +1,11 @@
 = metanorma-iec: Metanorma processor for the International Electrotechnical Commission
 
 image:https://img.shields.io/gem/v/metanorma-iec.svg["Gem Version", link="https://rubygems.org/gems/metanorma-iec"]
-image:https://img.shields.io/travis/metanorma/metanorma-iec/master.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma-iec"]
-image:https://ci.appveyor.com/api/projects/status/odgc3ltblokvd6e7?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/metanorma-iec"]
+image:https://travis-ci.com/metanorma/metanorma-iec.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma-iec"]
+image:https://ci.appveyor.com/api/projects/status/030ike7d50201e7m?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/metanorma/metanorma-iec"]
 image:https://codeclimate.com/github/metanorma/metanorma-iec/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-iec"]
-
-WARNING: This gem is still under development.
+image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-iec.svg["Pull Requests", link="https://github.com/metanorma/metanorma-iec/pulls"]
+image:https://img.shields.io/github/commits-since/metanorma/metanorma-iec/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-iec/releases"]
 
 == Functionality
 

data/lib/asciidoctor/iec/basicdoc.rng

@@ -341,11 +341,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="tclass">
-    <element name="name">
-      <text/>
-    </element>
-  </define>
   <define name="thead">
     <element name="thead">
       <ref name="tr"/>
@@ -515,19 +510,22 @@
         <attribute name="subsequence"/>
       </optional>
       <optional>
-        <ref name="source"/>
+        <attribute name="class"/>
       </optional>
       <optional>
-        <ref name="tname"/>
+        <ref name="source"/>
       </optional>
       <optional>
-        <ref name="tclass"/>
+        <ref name="tname"/>
       </optional>
       <choice>
         <ref name="image"/>
         <ref name="video"/>
         <ref name="audio"/>
         <ref name="pre"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </oneOrMore>
         <zeroOrMore>
           <ref name="figure"/>
         </zeroOrMore>

data/lib/isodoc/iec/html/html_iec_titlepage.html

@@ -43,11 +43,11 @@ name="CVP_Secretariat_Loca">Secretariat</a>: {{ secretariat }}</p>
 {% if unpublished %}
 <div class="coverpage_warning">
 
-<p>Warning for WDs
-and CDs<o:p></o:p></span></b></p>
+<p>Warning for CDs, CDVs
+and FDISs<o:p></o:p></span></b></p>
 
 <p>This
-document is not an ISO International Standard. It is distributed for review and
+document is not an IEC International Standard. It is distributed for review and
 comment. It is subject to change without notice and may not be referred to as
 an International Standard.</p>
 

data/lib/isodoc/iec/html/htmlstyle.scss

@@ -626,7 +626,7 @@ font-family: $monospacefont;
 font-variant-ligatures: none;
 }
 
-.figure, .Sourcecode {
+.figure, .Sourcecode, .pseudocode {
 background-color: #f7f7f7;
 line-height: 1.6em;
 padding: 1.5em;
@@ -691,7 +691,7 @@ margin-top:0;
 }
 
 
-.example .Sourcecode {
+.example .Sourcecode, .example .pseudocode {
       background: none;
 }
 

data/lib/isodoc/iec/html/isodoc.scss

@@ -19,6 +19,26 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:ZH-CN;
 	mso-no-proof:yes;}
+p.pseudocode, li.pseudocode, div.pseudocode
+        {mso-style-unhide:no;
+        mso-style-unhide:no;
+        margin-top:5.0pt;
+        margin-right:0cm;
+        margin-bottom:5.0pt;
+        margin-left:0cm;
+        mso-add-space:auto;
+        text-align:left;
+        mso-pagination:widow-orphan;
+        layout-grid-mode:char;
+        font-size:9.0pt;
+        mso-bidi-font-size:10.0pt;
+        font-family:"Arial",sans-serif;
+        mso-fareast-font-family:"Times New Roman";
+        mso-bidi-font-family:Arial;
+        letter-spacing:-.1pt;
+        mso-ansi-language:EN-GB;
+        mso-fareast-language:ZH-CN;
+        mso-no-proof:yes;}
 p.CODE-TableCell, li.CODE-TableCell, div.CODE-TableCell, pre.CODE-TableCell
 	{mso-style-name:CODE-TableCell;
 	mso-style-unhide:no;
@@ -783,6 +803,10 @@ div.example p.MsoListParagraph {
   font-size: 10.0pt;
 }
 
+div.Note p.MsoListParagraph {
+  font-size: 8.0pt;
+}
+
 div.example, td.example {
   margin:0in;
         margin-bottom:12.0pt;

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end
 

data/metanorma-iec.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", "~> 1.0.0"
   spec.add_dependency "metanorma-iso", "~> 1.3.0"

data/spec/asciidoctor-iec/base_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Asciidoctor::Iec do
   #end
 
   it "processes a blank document" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     #{ASCIIDOC_BLANK_HDR}
     INPUT
     #{BLANK_HDR}
@@ -29,7 +29,7 @@ RSpec.describe Asciidoctor::Iec do
 
   it "converts a blank document" do
     FileUtils.rm_f "test.doc"
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -45,7 +45,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "processes default metadata" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -169,7 +169,7 @@ RSpec.describe Asciidoctor::Iec do
 
 
   it "processes complex metadata" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -323,7 +323,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "defaults substage" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -386,7 +386,7 @@ OUTPUT
     end
 
         it "defaults substage for stage 60" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -449,7 +449,7 @@ OUTPUT
     end
 
   it "populates metadata for PRF" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc

data/spec/asciidoctor-iec/blocks_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::Iec do
   it "processes open blocks" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       --
       x
@@ -21,7 +21,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "processes stem blocks" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [stem]
       ++++
@@ -42,7 +42,6 @@ RSpec.describe Asciidoctor::Iec do
 
        <formula id="_">
          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub> <mrow> <mrow> <mi mathvariant="bold-italic">F</mi> </mrow> </mrow> <mrow> <mrow> <mi mathvariant="bold-italic">Α</mi> </mrow> </mrow> </msub> </math></stem>
-       </stem>
        </formula>
        </sections>
        </iso-standard>
@@ -50,7 +49,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
     it "ignores review blocks unless document is in draft mode" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [[foreword]]
       .Foreword
@@ -71,7 +70,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
   it "processes review blocks if document is in draft mode" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)).sub(/^.+<sections>/m, "")).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)).sub(/^.+<sections>/m, "<sections>").sub(%r{</sections>.*$}m, "</sections>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -91,16 +90,16 @@ RSpec.describe Asciidoctor::Iec do
       For further information on the Foreword, see *ISO/IEC Directives, Part 2, 2016, Clause 12.*
       ****
       INPUT
+      <sections>
        <p id="foreword">Foreword</p>
        <review reviewer="ISO" id="_" date="20170101T00:00:00Z" from="foreword" to="foreword"><p id="_">A Foreword shall appear in each document. The generic text is shown here. It does not contain requirements, recommendations or permissions.</p>
        <p id="_">For further information on the Foreword, see <strong>ISO/IEC Directives, Part 2, 2016, Clause 12.</strong></p></review></sections>
-       </iso-standard>
 
       OUTPUT
   end
 
   it "processes term notes" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
@@ -127,7 +126,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
     it "processes notes" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       NOTE: This is a note
       INPUT
@@ -143,7 +142,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "processes literals" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       ....
       LITERAL
@@ -160,7 +159,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "processes simple admonitions with Asciidoc names" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       CAUTION: Only use paddy or parboiled rice for the determination of husked rice yield.
       INPUT
@@ -177,7 +176,7 @@ RSpec.describe Asciidoctor::Iec do
 
 
     it "processes complex admonitions with non-Asciidoc names" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [CAUTION,type=Safety Precautions]
       .Safety Precautions
@@ -210,7 +209,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "processes term examples" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
@@ -239,7 +238,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "processes examples" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [example]
       ====
@@ -258,7 +257,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "processes preambles" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       This is a preamble
 
@@ -277,7 +276,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "processes images" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       .Split-it-right sample divider
       image::spec/examples/rice_images/rice_image1.png[]
@@ -295,7 +294,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "accepts width and height attributes on images" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [height=4,width=3]
       image::spec/examples/rice_images/rice_image1.png[]
@@ -312,7 +311,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "accepts auto for width and height attributes on images" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [height=4,width=auto]
       image::spec/examples/rice_images/rice_image1.png[]
@@ -329,7 +328,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "accepts alignment attribute on paragraphs" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [align=right]
       This para is right-aligned.
@@ -343,7 +342,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "processes blockquotes" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [quote, ISO, "ISO7301,section 1"]
       ____
@@ -363,7 +362,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "processes source code" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [source,ruby]
       --
@@ -385,7 +384,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "processes callouts" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [source,ruby]
       --
@@ -412,7 +411,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "processes unmodified term sources" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
@@ -440,7 +439,7 @@ RSpec.describe Asciidoctor::Iec do
     end
 
     it "processes modified term sources" do
-      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 

data/spec/asciidoctor-iec/cleanup_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::Iec do
   it "removes empty text elements" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == {blank}
     INPUT
@@ -17,7 +17,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "processes stem-only terms as admitted" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
@@ -43,7 +43,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "moves term domains out of the term definition paragraph" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
@@ -69,7 +69,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "permits multiple blocks in term definition paragraph" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -107,7 +107,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "strips any initial boilerplate from terms and definitions" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
@@ -135,84 +135,8 @@ RSpec.describe Asciidoctor::Iec do
     OUTPUT
   end
 
-  it "converts xrefs to references into erefs" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      <<iso216>>
-
-      [bibliography]
-      == Normative References
-      * [[[iso216,ISO 216:2001]]], _Reference_
-    INPUT
-      #{BLANK_HDR}
-        <preface><foreword obligation="informative">
-        <title>Foreword</title>
-        <p id="_">
-        <eref type="inline" bibitemid="iso216" citeas="ISO 216:2001"/>
-      </p>
-      </foreword></preface><sections>
-      </sections><bibliography><references id="_" obligation="informative">
-        <title>Normative References</title>
-        <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>
-        <bibitem id="iso216" type="standard">
-         <title format="text/plain">Reference</title>
-         <docidentifier>ISO 216:2001</docidentifier>
-         <date type="published">
-           <on>2001</on>
-         </date>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-             <abbreviation>ISO</abbreviation>
-           </organization>
-         </contributor>
-       </bibitem>
-      </references>
-      </bibliography
-      </iso-standard>
-    OUTPUT
-  end
-
-  it "extracts localities from erefs" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      <<iso216,whole,clause=3,example=9-11,locality:prelude=33,locality:entirety:the reference>>
-
-      [bibliography]
-      == Normative References
-      * [[[iso216,ISO 216]]], _Reference_
-    INPUT
-      #{BLANK_HDR}
-      <preface><foreword obligation="informative">
-        <title>Foreword</title>
-        <p id="_">
-        <eref type="inline" bibitemid="iso216" citeas="ISO 216"><locality type="whole"/><locality type="clause"><referenceFrom>3</referenceFrom></locality><locality type="example"><referenceFrom>9</referenceFrom><referenceTo>11</referenceTo></locality><locality type="locality:prelude"><referenceFrom>33</referenceFrom></locality><locality type="locality:entirety"/>the reference</eref>
-        </p>
-      </foreword></preface><sections>
-      </sections><bibliography><references id="_" obligation="informative">
-        <title>Normative References</title>
-        <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>
-        <bibitem id="iso216" type="standard">
-         <title format="text/plain">Reference</title>
-         <docidentifier>ISO 216</docidentifier>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-             <abbreviation>ISO</abbreviation>
-           </organization>
-         </contributor>
-       </bibitem>
-      </references>
-      </bibliography>
-      </iso-standard>
-    OUTPUT
-  end
-
-
   it "strips type from xrefs" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       <<iso216>>
 
@@ -247,7 +171,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "processes localities in term sources" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
@@ -275,7 +199,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "removes extraneous material from Normative References" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Normative References
@@ -306,7 +230,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "inserts IDs into paragraphs" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       Paragraph
     INPUT
@@ -319,7 +243,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "inserts IDs into notes" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [example]
       ====
@@ -339,7 +263,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "moves table key inside table" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       |===
       |a |b |c
@@ -371,7 +295,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "processes headerrows attribute for table without header rows" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [headerrows=3]
       |===
@@ -410,7 +334,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "processes headerrows attribute for table with header rows" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [headerrows=3]
       |===
@@ -454,38 +378,8 @@ RSpec.describe Asciidoctor::Iec do
     OUTPUT
   end
 
-  it "moves table notes inside table" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      |===
-      |a |b |c
-      |===
-
-      NOTE: Note 1
-
-      NOTE: Note 2
-    INPUT
-       #{BLANK_HDR}
-              <sections><table id="_">
-         <tbody>
-           <tr>
-             <td align="left">a</td>
-             <td align="left">b</td>
-             <td align="left">c</td>
-           </tr>
-         </tbody>
-       <note id="_">
-         <p id="_">Note 1</p>
-       </note><note id="_">
-         <p id="_">Note 2</p>
-       </note></table>
-
-       </sections>
-    OUTPUT
-  end
-
   it "moves formula key inside formula" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [stem]
       ++++
@@ -512,7 +406,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "moves footnotes inside figures" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       image::spec/examples/rice_images/rice_image1.png[]
 
@@ -536,7 +430,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "moves figure key inside figure" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       image::spec/examples/rice_images/rice_image1.png[]
 
@@ -561,7 +455,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "numbers bibliographic notes and footnotes sequentially" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       footnote:[Footnote]
 
@@ -613,7 +507,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "defaults section obligations" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
 
       == Clause
@@ -638,7 +532,7 @@ RSpec.describe Asciidoctor::Iec do
   end
 
   it "extends clause levels past 5" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     #{ASCIIDOC_BLANK_HDR}
 
     == Clause1