metanorma-iec 1.3.13 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b51046ee2b4e5d29d837265595d89d6f6601c73f15beaeba18625912619e5fdb
-  data.tar.gz: 619dd4dcbafc822109e7ff0c84027979aeb85f0abbce9c5a0e8aa1ad2c09e23d
+  metadata.gz: d63b1b7e31287d36e98cca120f39a2c42d3a035f1d25c4005f5201dc61cf6d7c
+  data.tar.gz: be21b434afd61f1b7e3f203e3971927f84cf1cf86aed5a61bceb47deffba5182
 SHA512:
-  metadata.gz: cc584b9bfcb447f04e734635663cd78352cf50ca68017c9680e9120519c53ec9ad64f439233ae6f808800a741412dfbd24c76831086808399b1716556bdd471d
-  data.tar.gz: bf17ef358d040747a3b43754533609c7cfe5e6aedf35bd397eb06a669e8b97de8ee8dd7b8d446b2694aef619dc48fe77b22eb45058200319c310d43982d36d2a
+  metadata.gz: 67174492842cb02df5b2c32b4298f031e47eb838fad2899acdb2ef9cc5ca4cb14734fdccd9b0ab51b34805ae0b299b41ce119c605175b5e3da6d2c1dd4db951f
+  data.tar.gz: 6c64500d6a2b77c1324d22b04a0e3fee36e4c5f5b4c12aa604fde222691bbbc01ee2455bddc86471fcd16b82b287e15fccb83608ddee93b0c3d568626ca3cdff

data/lib/asciidoctor/iec/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <!-- include "biblio.rnc" { } -->
   <include href="basicdoc.rng">
@@ -1803,17 +1803,20 @@
         <ref name="admitted"/>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="related"/>
+        <ref name="deprecates"/>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="deprecates"/>
+        <ref name="related"/>
       </zeroOrMore>
       <optional>
         <ref name="termdomain"/>
       </optional>
-      <zeroOrMore>
-        <ref name="termgrammar"/>
-      </zeroOrMore>
+      <optional>
+        <ref name="termsubject"/>
+      </optional>
+      <optional>
+        <ref name="termusage"/>
+      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1830,41 +1833,200 @@
   </define>
   <define name="preferred">
     <element name="preferred">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="Designation"/>
     </element>
   </define>
   <define name="admitted">
     <element name="admitted">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="Designation"/>
     </element>
   </define>
   <define name="related">
     <element name="related">
+      <attribute name="type">
+        <ref name="RelatedTermType"/>
+      </attribute>
+      <element name="preferred">
+        <ref name="Designation"/>
+      </element>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
+  <define name="RelatedTermType">
+    <choice>
+      <value>deprecates</value>
+      <value>supersedes</value>
+      <value>narrower</value>
+      <value>broader</value>
+      <value>equivalent</value>
+      <value>compare</value>
+      <value>contrast</value>
+      <value>see</value>
+    </choice>
+  </define>
+  <define name="deprecates">
+    <element name="deprecates">
+      <ref name="Designation"/>
+    </element>
+  </define>
+  <define name="Designation">
+    <optional>
+      <attribute name="absent">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="geographicArea"/>
+    </optional>
+    <choice>
+      <ref name="expression_designation"/>
+      <ref name="letter_symbol_designation"/>
+      <ref name="graphical_symbol_designation"/>
+    </choice>
+    <zeroOrMore>
+      <ref name="termsource"/>
+    </zeroOrMore>
+  </define>
+  <define name="letter_symbol_designation">
+    <element name="letter-symbol">
       <optional>
-        <attribute name="type">
+        <attribute name="isInternational">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <element name="name">
+        <oneOrMore>
           <choice>
-            <value>compare</value>
-            <value>contrast</value>
-            <value>see</value>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
           </choice>
+        </oneOrMore>
+      </element>
+    </element>
+  </define>
+  <define name="graphical_symbol_designation">
+    <element name="graphical-symbol">
+      <optional>
+        <attribute name="isInternational">
+          <data type="boolean"/>
         </attribute>
       </optional>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="figure"/>
     </element>
   </define>
-  <define name="deprecates">
-    <element name="deprecates">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+  <define name="expression_designation">
+    <element name="expression">
+      <optional>
+        <attribute name="language">
+          <a:documentation>ISO-639</a:documentation>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="script">
+          <a:documentation>ISO-15924</a:documentation>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="type">
+          <ref name="ExpressionDesignationType"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="isInternational">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <element name="name">
+        <zeroOrMore>
+          <ref name="PureTextElement"/>
+        </zeroOrMore>
+      </element>
+      <optional>
+        <element name="abbreviationType">
+          <ref name="AbbreviationType"/>
+        </element>
+      </optional>
+      <optional>
+        <element name="pronunciation">
+          <ref name="LocalizedString"/>
+        </element>
+      </optional>
+      <optional>
+        <element name="grammarInfo">
+          <ref name="Grammar"/>
+        </element>
+      </optional>
     </element>
   </define>
+  <define name="ExpressionDesignationType">
+    <choice>
+      <value>prefix</value>
+      <value>suffix</value>
+      <value>abbreviation</value>
+      <value>full</value>
+    </choice>
+  </define>
+  <define name="AbbreviationType">
+    <choice>
+      <value>truncation</value>
+      <value>acronym</value>
+      <value>initialism</value>
+    </choice>
+  </define>
+  <define name="Grammar">
+    <zeroOrMore>
+      <element name="gender">
+        <ref name="GrammarGender"/>
+      </element>
+    </zeroOrMore>
+    <optional>
+      <element name="isPreposition">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isParticiple">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isAdjective">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isVerb">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isAdverb">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <optional>
+      <element name="isNoun">
+        <data type="boolean"/>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <element name="grammarvalue">
+        <text/>
+      </element>
+    </zeroOrMore>
+  </define>
+  <define name="GrammarGender">
+    <choice>
+      <value>masculine</value>
+      <value>feminine</value>
+      <value>neuter</value>
+      <value>common</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -1872,18 +2034,47 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termgrammar">
-    <element name="grammar">
+  <define name="termsubject">
+    <element name="subject">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
     </element>
   </define>
+  <define name="termusage">
+    <element name="usageinfo">
+      <oneOrMore>
+        <ref name="BasicBlock"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="termdefinition">
     <element name="definition">
+      <choice>
+        <ref name="verbaldefinition"/>
+        <ref name="nonverbalrep"/>
+        <group>
+          <ref name="verbaldefinition"/>
+          <ref name="nonverbalrep"/>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="verbaldefinition">
+    <element name="verbaldefinition">
+      <oneOrMore>
+        <ref name="paragraph"/>
+      </oneOrMore>
+      <zeroOrMore>
+        <ref name="termsource"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="nonverbalrep">
+    <element name="nonverbalrepresentation">
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="table"/>
           <ref name="figure"/>
           <ref name="formula"/>
         </choice>

data/lib/isodoc/iec/base_convert.rb

@@ -56,10 +56,10 @@ module IsoDoc
         return super unless @is_iev
       end
 
-      def biblio_list(f, div, biblio)
+      def biblio_list(elem, div, biblio)
         return super unless @is_iev
 
-        f.children.each do |b|
+        elem.children.each do |b|
           parse(b, div) unless %w(title bibitem).include? b.name
         end
       end

data/lib/isodoc/iec/iec.international-standard.xsl

@@ -2597,6 +2597,8 @@
 		
 		<title-list-figures lang="en">List of Figures</title-list-figures>
 		
+		<title-table-figures lang="en">Table of Figures</title-table-figures>
+		
 		<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
 		
 		<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -5487,6 +5489,7 @@
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="image-style">
 					
+					
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -5853,7 +5856,7 @@
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="node()" mode="contents">
 		<xsl:apply-templates mode="contents"/>
@@ -5951,6 +5954,8 @@
 				
 				
 				
+				
+				
 			</fo:bookmark-tree>
 		</xsl:if>
 	</xsl:template><xsl:template name="insertFigureBookmarks">
@@ -6501,6 +6506,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.3.13".freeze
+    VERSION = "1.4.0".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-iso", "~> 1.9.0"
+  spec.add_dependency "metanorma-iso", "~> 1.10.0"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "byebug"

data/spec/asciidoctor/base_spec.rb

@@ -1,8 +1,6 @@
 require "spec_helper"
 require "fileutils"
 
-OPTIONS = [backend: :iec, header_footer: true].freeze
-
 RSpec.describe Asciidoctor::Iec do
   before(:all) do
     @blank_hdr = blank_hdr_gen

data/spec/asciidoctor/blocks_spec.rb

@@ -133,7 +133,7 @@ RSpec.describe Asciidoctor::Iec do
         <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>
         <termnote id="_">
         <p id="_">This is a note</p>
       </termnote>
@@ -255,7 +255,7 @@ RSpec.describe Asciidoctor::Iec do
          <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>
          <termexample id="_">
          <p id="_">This is an example</p>
        </termexample>
@@ -467,77 +467,4 @@ RSpec.describe Asciidoctor::Iec do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
-
-  it "processes unmodified term sources" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-      == Terms and Definitions
-
-      === Term1
-
-      [.source]
-      <<ISO2191,section=1>>
-    INPUT
-    output = <<~OUTPUT
-      #{@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
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-
-  it "processes modified term sources" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-      == Terms and Definitions
-
-      === Term1
-
-      [.source]
-      <<ISO2191,section=1>>, with adjustments
-    INPUT
-    output = <<~OUTPUT
-      #{@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="modified">
-         <origin bibitemid="ISO2191" type="inline" citeas="">
-         <localityStack>
-        <locality type="section"><referenceFrom>1</referenceFrom></locality>
-         </localityStack>
-        </origin>
-         <modification>
-           <p id="_">with adjustments</p>
-         </modification>
-       </termsource>
-       </term>
-       </terms>
-       </sections>
-       </iec-standard>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
 end

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.13
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-25 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.