metanorma-iec 1.3.11 → 1.4.1

data/spec/asciidoctor/cleanup_spec.rb

@@ -96,94 +96,6 @@ end
     OUTPUT
   end
 
-  it "processes stem-only terms as admitted" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{ASCIIDOC_BLANK_HDR}
-      == Terms and Definitions
-
-      === stem:[t_90]
-
-      stem:[t_91]
-
-      Time
-    INPUT
-       #{@blank_hdr}
-              <sections>
-         <terms id="_" obligation="normative">
-         <title>Terms and definitions</title>
-         <p id="_">For the purposes of this document, 
-       the following terms and definitions apply.</p>
-        #{TERMS_BOILERPLATE}
-         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
-  <mi>t</mi>
-</mrow>
-<mrow>
-  <mn>90</mn>
-</mrow>
-</msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
-  <mi>t</mi>
-</mrow>
-<mrow>
-  <mn>91</mn>
-</mrow>
-</msub></math></stem></admitted>
-       <definition><p id="_">Time</p></definition></term>
-       </terms>
-       </sections>
-       </iec-standard>
-    OUTPUT
-  end
-
-  it "permits multiple blocks in term definition paragraph" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      = Document title
-      Author
-      :docfile: test.adoc
-      :nodoc:
-      :novalid:
-      :stem:
-      :no-isobib:
-
-      == Terms and Definitions
-
-      === stem:[t_90]
-
-      [stem]
-      ++++
-      t_A
-      ++++
-
-      This paragraph is extraneous
-    INPUT
-       #{@blank_hdr}
-              <sections>
-         <terms id="_" obligation="normative">
-         <title>Terms and definitions</title>
-         <p id="_">For the purposes of this document, 
-       the following terms and definitions apply.</p>
-        #{TERMS_BOILERPLATE}
-         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
-  <mi>t</mi>
-</mrow>
-<mrow>
-  <mn>90</mn>
-</mrow>
-</msub></math></stem></preferred><definition><formula id="_">
-         <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
-  <mi>t</mi>
-</mrow>
-<mrow>
-  <mi>A</mi>
-</mrow>
-</msub></math></stem>
-       </formula><p id="_">This paragraph is extraneous</p></definition>
-       </term>
-       </terms>
-       </sections>
-       </iec-standard>
-    OUTPUT
-  end
-
   it "keeps any initial boilerplate from terms and definitions" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -210,8 +122,8 @@ end
   </li>
 </ul>
        <term id="term-time">
-       <preferred>Time</preferred>
-         <definition><p id="_">This paragraph is extraneous</p></definition>
+       <preferred><expression><name>Time</name></expression></preferred>
+         <definition><verbaldefinition><p id="_">This paragraph is extraneous</p></verbaldefinition></definition>
        </term></terms>
        </sections>
        </iec-standard>
@@ -254,38 +166,6 @@ end
     OUTPUT
   end
 
-  it "processes localities in term sources" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{ASCIIDOC_BLANK_HDR}
-      == Terms and Definitions
-
-      === Term1
-
-      [.source]
-      <<ISO2191,section=1>>
-      INPUT
-              #{@blank_hdr}
-       <sections>
-         <terms id="_" obligation="normative">
-         <title>Terms and definitions</title>
-         <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-         #{TERMS_BOILERPLATE}
-         <term id="term-term1">
-         <preferred>Term1</preferred>
-         <termsource status="identical">
-         <origin bibitemid="ISO2191" type="inline" citeas="">
-         <localityStack>
-        <locality type="section"><referenceFrom>1</referenceFrom></locality>
-         </localityStack>
-        </origin>
-       </termsource>
-       </term>
-       </terms>
-       </sections>
-       </iec-standard>
-      OUTPUT
-  end
-
   it "removes extraneous material from Normative References" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}

data/spec/asciidoctor/iev_spec.rb

@@ -9,7 +9,7 @@ end
 
 
   it "generates reference boilerplate for IEV" do
-     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -90,7 +90,7 @@ end
   end
 
       it "generates terms boilerplate for IEV" do
-     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -157,7 +157,7 @@ INPUT
       <terms id='_' obligation='normative'>
         <title>General</title>
         <term id='term-term-1'>
-          <preferred>Term 1</preferred>
+          <preferred><expression><name>Term 1</name></expression></preferred>
         </term>
       </terms>
     </clause>
@@ -168,7 +168,7 @@ OUTPUT
   end
 
       it "uses IEV introduction title" do
-     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc

data/spec/asciidoctor/inline_spec.rb

@@ -5,51 +5,6 @@ RSpec.describe Asciidoctor::Iec do
   @blank_hdr = blank_hdr_gen
 end
 
-  it "processes inline_quoted formatting" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{ASCIIDOC_BLANK_HDR}
-      _emphasis_
-      *strong*
-      `monospace`
-      "double quote"
-      'single quote'
-      super^script^
-      sub~script~
-      stem:[a_90]
-      stem:[<mml:math><mml:msub xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"> <mml:mrow> <mml:mrow> <mml:mi mathvariant="bold-italic">F</mml:mi> </mml:mrow> </mml:mrow> <mml:mrow> <mml:mrow> <mml:mi mathvariant="bold-italic">&#x391;</mml:mi> </mml:mrow> </mml:mrow> </mml:msub> </mml:math>]
-      [alt]#alt#
-      [deprecated]#deprecated#
-      [domain]#domain#
-      [strike]#strike#
-      [smallcap]#smallcap#
-    INPUT
-            #{@blank_hdr}
-       <sections>
-         <em>emphasis</em>
-       <strong>strong</strong>
-       <tt>monospace</tt>
-       “double quote”
-       ‘single quote’
-       super<sup>script</sup>
-       sub<sub>script</sub>
-       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
-  <mi>a</mi>
-</mrow>
-<mrow>
-  <mn>90</mn>
-</mrow>
-</msub></math></stem>
-       <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>
-       <admitted>alt</admitted>
-       <deprecates>deprecated</deprecates>
-       <domain>domain</domain>
-       <strike>strike</strike>
-       <smallcap>smallcap</smallcap>
-       </sections>
-       </iec-standard>
-    OUTPUT
-  end
-
   it "processes breaks" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}

data/spec/asciidoctor/section_spec.rb

@@ -75,13 +75,13 @@ end
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          #{TERMS_BOILERPLATE}
          <term id="term-term1">
-         <preferred>Term1</preferred>
+         <preferred><expression><name>Term1</name></expression></preferred>
        </term>
        </terms>
        <clause id="_" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="_" obligation="normative">
          <title>Normal Terms</title>
          <term id="term-term2">
-         <preferred>Term2</preferred>
+         <preferred><expression><name>Term2</name></expression></preferred>
        </term>
        </terms>
        <definitions id="_" obligation="normative"><title>Symbols and abbreviated terms</title></definitions></clause>
@@ -197,7 +197,7 @@ end
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          #{TERMS_BOILERPLATE}
          <term id="term-term1">
-         <preferred>Term1</preferred>
+         <preferred><expression><name>Term1</name></expression></preferred>
        </term>
        </terms>
        <clause id='_' obligation='normative'>
@@ -205,7 +205,7 @@ end
              <terms id='_' obligation='normative'>
                <title>Normal Terms</title>
                <term id='term-term2'>
-                 <preferred>Term2</preferred>
+                 <preferred><expression><name>Term2</name></expression></preferred>
                </term>
              </terms>
              <definitions id='_' obligation="normative">

data/spec/isodoc/iev_spec.rb

@@ -242,7 +242,7 @@ RSpec.describe IsoDoc do
           <clause id="_terms_and_definitions" obligation="normative"><title>Terms and definitions</title>
           <terms id="_general" obligation="normative"><title>General</title>
       <term id="paddy1"><preferred>paddy</preferred>
-      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
       <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
         <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
         <ul>
@@ -264,7 +264,7 @@ RSpec.describe IsoDoc do
       <admitted>rough rice</admitted>
       <deprecates>cargo rice</deprecates>
       <domain>rice</domain>
-      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
       <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f893">
         <ul>
         <li>A</li>
@@ -452,7 +452,7 @@ RSpec.describe IsoDoc do
           <clause id="_terms_and_definitions" obligation="normative" displayorder="1"><title>Terms and definitions</title>
           <terms id="_general" obligation="normative"><title>General</title>
       <term id="paddy1"><preferred>paddy</preferred>
-      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
       <termsource status="modified">
         <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
           <modification>

data/spec/isodoc/terms_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe IsoDoc do
 
 <term id="paddy1"><preferred>paddy</preferred>
 <domain>rice</domain>
-<definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+<definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
 <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
   <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
   <ul>
@@ -33,7 +33,7 @@ RSpec.describe IsoDoc do
 <preferred>paddy</preferred><admitted>paddy rice</admitted>
 <admitted>rough rice</admitted>
 <deprecates>cargo rice</deprecates>
-<definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+<definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
 <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74e">
   <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
 </termnote>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: metanorma-iec lets you write IEC standards in AsciiDoc.