metanorma-iec 1.3.12 → 1.4.2

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

@@ -2223,7 +2223,7 @@
 		</xsl:variable>
 		<fo:block line-height="1.1" space-before="14pt" role="H{$levelTerm}">
 			<fo:block font-weight="bold" keep-with-next="always">
-				<xsl:apply-templates select="ancestor::iec:term/iec:name" mode="presentation"/>				
+				<xsl:apply-templates select="ancestor::iec:term[1]/iec:name" mode="presentation"/>				
 			</fo:block>
 			<fo:block font-weight="bold" keep-with-next="always">
 				<xsl:apply-templates/>
@@ -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>
@@ -2873,6 +2875,11 @@
 		
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
+		
+		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-p-style">
 		
 		
@@ -4023,9 +4030,8 @@
 				
 				<!-- Table's note name (NOTE, for example) -->
 
-				<fo:inline padding-right="2mm">
+				<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
 					
-				
 					
 					
 					
@@ -4569,6 +4575,7 @@
 			<fo:table-cell>
 				
 				<fo:block margin-top="6pt">
+					<xsl:copy-of select="@id"/>
 					
 					
 						<xsl:attribute name="margin-top">0pt</xsl:attribute>
@@ -4676,6 +4683,8 @@
 			<xsl:if test="$font-size != ''">
 				<xsl:attribute name="font-size">
 					<xsl:choose>
+						<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+						<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 						<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
 						<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
 					</xsl:choose>
@@ -5412,14 +5421,18 @@
 	</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'terms']">
+		<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']">
+		<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
 		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
 			
 			
-			
+			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
+				
+			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -5481,6 +5494,7 @@
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="image-style">
 					
+					
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -5847,7 +5861,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"/>
@@ -5945,6 +5959,8 @@
 				
 				
 				
+				
+				
 			</fo:bookmark-tree>
 		</xsl:if>
 	</xsl:template><xsl:template name="insertFigureBookmarks">
@@ -6138,12 +6154,16 @@
 				<xsl:if test="$font-size != ''">
 					<xsl:attribute name="font-size">
 						<xsl:choose>
+							<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+							<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 							<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
 							<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
 				</xsl:if>
 				
+				
+				
 				<xsl:apply-templates/>			
 			</fo:block>
 				
@@ -6386,7 +6406,8 @@
 			</fo:block>			
 		</fo:table-cell>
 	</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
-		<fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center"  -->
+		<fo:block font-size="11pt">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -6491,6 +6512,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/>
@@ -6501,13 +6523,15 @@
 					<!-- <xsl:apply-templates /> -->
 					<xsl:copy-of select="$termsource_text"/>
 				</xsl:when>
-				<xsl:otherwise>					
+				<xsl:otherwise>
+					
 					
 						<xsl:text>[</xsl:text>
 					
 					<!-- <xsl:apply-templates />					 -->
 					<xsl:copy-of select="$termsource_text"/>
 					
+					
 						<xsl:text>]</xsl:text>
 					
 				</xsl:otherwise>
@@ -6591,12 +6615,20 @@
 	</xsl:template><xsl:template match="*[local-name() = 'author']">
 		<xsl:text>— </xsl:text>
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'eref']">
+	</xsl:template><xsl:variable name="bibitem_hidden_">
+		<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+		<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
 	
 		<xsl:variable name="bibitemid">
 			<xsl:choose>
-				<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
-				<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
+				<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
+				<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
+				<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
 				<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -6687,10 +6719,10 @@
 			</xsl:choose>
 		</xsl:variable>
 		
-		<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+		<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
 		
 		<xsl:choose>
-			<xsl:when test="$language = 'zh'">
+			<xsl:when test="$lang = 'zh'">
 				<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
 			</xsl:when>
 			<xsl:when test="../../@inline-header = 'true'">
@@ -7670,12 +7702,15 @@
 		<xsl:param name="default">left</xsl:param>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+		<xsl:if test="@align = 'indent'">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

data/lib/isodoc/iec/word_convert.rb

@@ -215,7 +215,7 @@ module IsoDoc
 
       def para_class(_node)
         classtype = nil
-        classtype = "MsoCommentText" if in_comment
+        classtype = "MsoCommentText" if @in_comment
         classtype = "Sourcecode" if @annotation
         classtype
       end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.3.12".freeze
+    VERSION = "1.4.2".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>