metanorma-iec 2.0.5 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d7748699d6414de9def85acc9298a31f507492ca7a1fb5bc94b19264fdbbbba
-  data.tar.gz: 342bcbd3c66cd744bd8c1a63f4a2867f6cb024c504ce9b4a45e90b0d1d50ba8c
+  metadata.gz: efffb1911ccc40c61913ea1afe4711abff6eba4396b9fc46a24cb78a24434f51
+  data.tar.gz: 6895a2259cc7cabaee3f175cb4186232c29ceca5282a6e8ef81d1d8123c8faf4
 SHA512:
-  metadata.gz: 583090be4e32cfcb95eed3071775b35959703175e3821623a43c5e46c3e279d2b7519e7e5367513759f4765298a7edbe32d4efbf7d05ff1d9d8e7e880c925381
-  data.tar.gz: ccbeaecab184817d9e92d5767e7ce2ed6b53d7dfb3745048570489747cf986f16abdf6607672cf66d57c2702d3234bd321ae5022f9725986754d2f52e514fa3a
+  metadata.gz: 2fbec035d589c6a49df172d36a4a37399962f1526e842fdc3303ae7f593c676311c620797105e5a76200cb293992d3c89f1997d8ed3ecd094798211c3662fde0
+  data.tar.gz: fc71ae2e1bce8b2f099d488f1448340978ba4b7ab4d3cdcb2b7dfac1b007e07a42cbab7cd9647e85bc9aea5086f6664ae32d388d5ee69f65cbb9af5411fadd4b

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

@@ -114,7 +114,13 @@
 		<xsl:call-template name="namespaceCheck"/>
 		<!-- https://stackoverflow.com/questions/25261949/xsl-fo-letter-spacing-with-text-align -->
 		<!-- https://xmlgraphics.apache.org/fop/knownissues.html -->
-		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
+		<fo:root xml:lang="{$lang}">
+			<xsl:variable name="root-style">
+				<root-style xsl:use-attribute-sets="root-style"/>
+			</xsl:variable>
+			<xsl:call-template name="insertRootStyle">
+				<xsl:with-param name="root-style" select="$root-style"/>
+			</xsl:call-template>
 			<fo:layout-master-set>
 				<!-- cover pages -->
 				<fo:simple-page-master master-name="cover" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
@@ -1922,7 +1928,7 @@
 		</xsl:copy>
 	</xsl:template> -->
 	
-<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:key name="bibitems" match="*[local-name() = 'bibitem']" use="@id"/><xsl:key name="bibitems_hidden" match="*[local-name() = 'bibitem'][@hidden='true'] | *[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']" use="@id"/><xsl:variable name="lang">
+<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
 		<xsl:call-template name="getLang"/>
 	</xsl:variable><xsl:variable name="pageWidth_">
 		210
@@ -2078,7 +2084,30 @@
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-style">
+	</xsl:attribute-set><xsl:template name="insertRootStyle">
+		<xsl:param name="root-style"/>
+		<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
+		
+		<xsl:variable name="additional_fonts_">
+			<xsl:for-each select="//*[local-name() = 'misc-container'][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
+				<xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
+		
+		<xsl:for-each select="$root-style_/root-style/@*">
+			<xsl:choose>
+				<xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
+					<xsl:attribute name="{local-name()}">
+						<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
+					</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+	</xsl:template><xsl:attribute-set name="copyright-statement-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style">
 		
@@ -2620,7 +2649,7 @@
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
+	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
 		
 				
 		
@@ -3343,8 +3372,27 @@
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
-	</xsl:template><xsl:template match="text()">
-		<xsl:value-of select="."/>
+	</xsl:template><xsl:variable name="tag_open">###fo:inline###</xsl:variable><xsl:variable name="tag_close">###/fo:inline###</xsl:variable><xsl:template match="text()" name="text">
+		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
+		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_open,'$1',$tag_close))"/>
+		<xsl:call-template name="replace_fo_inline">
+			<xsl:with-param name="text" select="$text"/>
+		</xsl:call-template>
+	</xsl:template><xsl:template name="replace_fo_inline">
+		<xsl:param name="text"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $tag_open)">
+				<xsl:value-of select="substring-before($text, $tag_open)"/>
+				<xsl:text disable-output-escaping="yes">&lt;fo:inline keep-together.within-line="always"&gt;</xsl:text>
+				<xsl:variable name="text_after" select="substring-after($text, $tag_open)"/>
+				<xsl:value-of select="substring-before($text_after, $tag_close)"/>
+				<xsl:text disable-output-escaping="yes">&lt;/fo:inline&gt;</xsl:text>
+				<xsl:call-template name="replace_fo_inline">
+					<xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name()='br']">
 		<xsl:value-of select="$linebreak"/>
 	</xsl:template><xsl:template match="*[local-name()='copyright-statement']">
@@ -5037,24 +5085,28 @@
 	</xsl:template><xsl:template name="add-zero-spaces-equal">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-equals">==========</xsl:variable>
+		<xsl:variable name="regex_zero-space-after-equals">(==========)</xsl:variable>
 		<xsl:variable name="zero-space-after-equal">=</xsl:variable>
+		<xsl:variable name="regex_zero-space-after-equal">(=)</xsl:variable>
 		<xsl:variable name="zero-space">​</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="contains($text, $zero-space-after-equals)">
-				<xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
+				<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
 				<xsl:value-of select="$zero-space-after-equals"/>
 				<xsl:value-of select="$zero-space"/>
 				<xsl:call-template name="add-zero-spaces-equal">
 					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equals)"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equals,concat('$1',$zero_width_space))"/>
 			</xsl:when>
 			<xsl:when test="contains($text, $zero-space-after-equal)">
-				<xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
+				<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
 				<xsl:value-of select="$zero-space-after-equal"/>
 				<xsl:value-of select="$zero-space"/>
 				<xsl:call-template name="add-zero-spaces-equal">
 					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equal)"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equal,concat('$1',$zero_width_space))"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="$text"/>
@@ -5534,7 +5586,12 @@
 			
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 			
+				<xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
+					<xsl:attribute name="padding-right">1mm</xsl:attribute>
+				</xsl:if>
+			
 				
+
 				
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
@@ -6515,7 +6572,73 @@
 				<xsl:with-param name="text" select="$text_step1"/>
 			</xsl:call-template>
 		</xsl:variable>
-		<xsl:value-of select="$text_step2"/>
+		
+		<!-- <xsl:value-of select="$text_step2"/> -->
+		
+		<!-- add zero-width space after space -->
+		<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ​')"/>
+		
+		<!-- split text by zero-width space -->
+		<xsl:variable name="text_step4">
+			<xsl:call-template name="split_for_interspers">
+				<xsl:with-param name="pText" select="$text_step3"/>
+				<xsl:with-param name="sep" select="$zero_width_space"/>
+			</xsl:call-template>
+		</xsl:variable>
+		
+		<xsl:for-each select="xalan:nodeset($text_step4)/node()">
+			<xsl:choose>
+				<xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
+					<xsl:call-template name="interspers">
+						<xsl:with-param name="str" select="."/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+		
+	</xsl:template><xsl:variable name="interspers_tag_open">###interspers123###</xsl:variable><xsl:variable name="interspers_tag_close">###/interspers123###</xsl:variable><xsl:template name="split_for_interspers">
+		<xsl:param name="pText" select="."/>
+		<xsl:param name="sep" select="','"/>
+		<!-- word with length more than 30 will be interspersed with zero-width space -->
+		<xsl:variable name="regex" select="concat('([^', $zero_width_space, ']{31,})')"/> <!-- sequence of characters (more 31), that doesn't contains zero-width space -->
+		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new($pText),$regex,concat($interspers_tag_open,'$1',$interspers_tag_close))"/>
+		<xsl:call-template name="replace_tag_interspers">
+			<xsl:with-param name="text" select="$text"/>
+		</xsl:call-template>
+	</xsl:template><xsl:template name="replace_tag_interspers">
+		<xsl:param name="text"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $interspers_tag_open)">
+				<xsl:value-of select="substring-before($text, $interspers_tag_open)"/>
+				<xsl:variable name="text_after" select="substring-after($text, $interspers_tag_open)"/>
+				<interspers>
+					<xsl:value-of select="substring-before($text_after, $interspers_tag_close)"/>
+				</interspers>
+				<xsl:call-template name="replace_tag_interspers">
+					<xsl:with-param name="text" select="substring-after($text_after, $interspers_tag_close)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="interspers">
+		<xsl:param name="str"/>
+		<xsl:param name="char" select="$zero_width_space"/>
+		<xsl:if test="$str != ''">
+			<xsl:value-of select="substring($str, 1, 1)"/>
+			
+			<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
+			<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
+				<xsl:value-of select="$char"/>
+			</xsl:if>
+			
+			<xsl:call-template name="interspers">
+				<xsl:with-param name="str" select="substring($str, 2)"/>
+				<xsl:with-param name="char" select="$char"/>
+			</xsl:call-template>
+		</xsl:if>
 	</xsl:template><xsl:template match="*" mode="syntax_highlight">
 		<xsl:apply-templates mode="syntax_highlight"/>
 	</xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -6953,7 +7076,7 @@
 				</xsl:otherwise>
 			</xsl:choose> -->
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ') or     starts-with(., '[SOURCE: Quoted from: ') or     starts-with(., '[SOURCE: Modified from: ')]" priority="2">
 		<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
 		<xsl:if test="normalize-space() != ''">
@@ -6989,7 +7112,8 @@
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'modification']/text()">
 		<xsl:if test="normalize-space() != ''">
-			<xsl:value-of select="."/>
+			<!-- <xsl:value-of select="."/> -->
+			<xsl:call-template name="text"/>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'quote']">		
 		<fo:block-container margin-left="0mm">
@@ -7029,11 +7153,24 @@
 	</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="bibitems_">
+		<xsl:for-each select="//*[local-name() = 'bibitem']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_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="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
-		<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
+		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
+		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
 		<xsl:choose>
-			<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
+			<!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
+			<xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
 				<fo:inline xsl:use-attribute-sets="eref-style">
 					<xsl:if test="@type = 'footnote'">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -8160,7 +8297,7 @@
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
-			<xsl:for-each select="*[not(@normative='true') and not(*[*[@normative='true']])]">
+			<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
 				<xsl:sort select="@displayorder" data-type="number"/>
 				<xsl:apply-templates select="." mode="update_xml_step1"/>
 			</xsl:for-each>
@@ -8409,22 +8546,25 @@
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>
 		<xsl:param name="normalize-space" select="'true'"/>
+		<xsl:param name="keep_sep" select="'false'"/>
 		<xsl:if test="string-length($pText) &gt;0">
-		<item>
-			<xsl:choose>
-				<xsl:when test="$normalize-space = 'true'">
-					<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</item>
-		<xsl:call-template name="split">
-			<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
-			<xsl:with-param name="sep" select="$sep"/>
-			<xsl:with-param name="normalize-space" select="$normalize-space"/>
-		</xsl:call-template>
+			<item>
+				<xsl:choose>
+					<xsl:when test="$normalize-space = 'true'">
+						<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</item>
+			<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
+				<xsl:with-param name="sep" select="$sep"/>
+				<xsl:with-param name="normalize-space" select="$normalize-space"/>
+				<xsl:with-param name="keep_sep" select="$keep_sep"/>
+			</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getDocumentId">		
 		<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>

data/lib/metanorma/iec/biblio.rng

@@ -527,7 +527,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -922,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/lib/metanorma/iec/front.rb

@@ -46,7 +46,7 @@ module Metanorma
 
         part, subpart = node&.attr("partnumber")&.split(/-/)
         dn = add_id_parts(node.attr("docnumber"), part, subpart)
-        dn = id_stage_prefix(dn, node, false)
+        dn = id_stage_prefix(dn, node)
         dn = id_edition_suffix(dn, node)
         xml.docidentifier dn, **attr_code(type: "ISO")
       end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.0.5".freeze
+    VERSION = "2.0.8".freeze
   end
 end
 

data/spec/isodoc/iev_spec.rb

@@ -859,7 +859,7 @@ RSpec.describe IsoDoc do
                    <dd language='zh' script='Hans'>
                      <preferred>
                        <strong>&#x4EA7;&#x54C1;</strong>
-                       &#x3001;&#x3c;&#x5728;&#x53EF;&#x9760;&#x6027;&#x65B9;&#x9762;&#x3e;
+                       , &#x3c;&#x5728;&#x53EF;&#x9760;&#x6027;&#x65B9;&#x9762;&#x3e;
                      </preferred>
                    </dd>
                  </dl>

data/spec/isodoc/ref_spec.rb

@@ -220,7 +220,7 @@ RSpec.describe IsoDoc::Iec do
           <note><name>NOTE</name><p>This is another annotation of document ISSN.</p></note>
           <bibitem id="ISO3696" type="standard">
             <title format="text/plain">Water for analytical laboratory use</title>
-            <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
+            <docidentifier type='metanorma-ordinal'>[3]</docidentifier>
             <docidentifier type="ISO">ISO 3696</docidentifier>
             <contributor>
               <role type="publisher"/>
@@ -235,7 +235,7 @@ RSpec.describe IsoDoc::Iec do
           </bibitem>
           <bibitem id="ref11">
             <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
-            <docidentifier type='metanorma-ordinal'>[2]</docidentifier>
+            <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
             <docidentifier type="IETF">IETF RFC 10</docidentifier>
           </bibitem>
           <bibitem id="ref12">
@@ -337,7 +337,7 @@ RSpec.describe IsoDoc::Iec do
                 </p>
               </div>
               <p id='ISO3696' class='Biblio'>
-                [1]&#160; ISO 3696,
+                [3]&#160; ISO 3696,
                 <i>Water for analytical laboratory use</i>
               </p>
               <p id='ref10' class='Biblio'>
@@ -354,7 +354,7 @@ RSpec.describe IsoDoc::Iec do
                 )
               </p>
               <p id='ref11' class='Biblio'>
-                [2]&#160; IETF RFC 10,
+                [4]&#160; IETF RFC 10,
                 <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
               </p>
               <p id='ref12' class='Biblio'>

data/spec/metanorma/blocks_spec.rb

@@ -132,7 +132,7 @@ RSpec.describe Metanorma::Iec do
         <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">
+        <term id="term-Term1">
         <preferred><expression><name>Term1</name></expression></preferred>
         <termnote id="_">
         <p id="_">This is a note</p>
@@ -254,7 +254,7 @@ RSpec.describe Metanorma::Iec do
          <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">
+         <term id="term-Term1">
          <preferred><expression><name>Term1</name></expression></preferred>
          <termexample id="_">
          <p id="_">This is an example</p>

data/spec/metanorma/cleanup_spec.rb

@@ -127,7 +127,7 @@ RSpec.describe Metanorma::Iec do
           <p id='_'>So am I</p>
         </li>
       </ul>
-             <term id="term-time">
+             <term id="term-Time">
              <preferred><expression><name>Time</name></expression></preferred>
                <definition><verbal-definition><p id="_">This paragraph is extraneous</p></verbal-definition></definition>
              </term></terms>

data/spec/metanorma/iev_spec.rb

@@ -164,7 +164,7 @@ RSpec.describe Metanorma::Iec do
             <title>Terms and definitions</title>
             <terms id='_' obligation='normative'>
               <title>General</title>
-              <term id='term-term-1'>
+              <term id='term-Term-1'>
                 <preferred><expression><name>Term 1</name></expression></preferred>
               </term>
             </terms>

data/spec/metanorma/inline_spec.rb

@@ -1,12 +1,12 @@
 require "spec_helper"
 
 RSpec.describe Metanorma::Iec do
-   before(:all) do
-  @blank_hdr = blank_hdr_gen
-end
+  before(:all) do
+    @blank_hdr = blank_hdr_gen
+  end
 
   it "processes breaks" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       Line break +
       line break
@@ -15,47 +15,56 @@ end
 
       <<<
     INPUT
-            #{@blank_hdr}
-       <sections><p id="_">Line break<br/>
-       line break</p>
-       <hr/>
-       <pagebreak/></sections>
-       </iec-standard>
+    output = <<~OUTPUT
+           #{@blank_hdr}
+      <sections><p id="_">Line break<br/>
+      line break</p>
+      <hr/>
+      <pagebreak/></sections>
+      </iec-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes links" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       mailto:fred@example.com
       http://example.com[]
       http://example.com[Link]
     INPUT
-            #{@blank_hdr}
-       <sections>
-         <p id="_">mailto:fred@example.com
-       <link target="http://example.com"/>
-       <link target="http://example.com">Link</link></p>
-       </sections>
-       </iec-standard>
+    output = <<~OUTPUT
+           #{@blank_hdr}
+      <sections>
+        <p id="_">mailto:fred@example.com
+      <link target="http://example.com"/>
+      <link target="http://example.com">Link</link></p>
+      </sections>
+      </iec-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
-    it "processes bookmarks" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes bookmarks" do
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       Text [[bookmark]] Text
     INPUT
-            #{@blank_hdr}
-       <sections>
-         <p id="_">Text <bookmark id="bookmark"/> Text</p>
-       </sections>
-       </iec-standard>
+    output = <<~OUTPUT
+           #{@blank_hdr}
+      <sections>
+        <p id="_">Text <bookmark id="bookmark"/> Text</p>
+      </sections>
+      </iec-standard>
     OUTPUT
-    end
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
 
-    it "processes crossreferences" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes crossreferences" do
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [[reference]]
       == Section
@@ -65,22 +74,25 @@ end
       Inline Reference with Text to <<reference,text>>
       Footnoted Reference with Text to <<reference,fn: text>>
     INPUT
-       #{@blank_hdr}
-        <sections>
-         <clause id="reference" inline-header="false" obligation="normative">
-         <title>Section</title>
-         <p id="_">Inline Reference to <xref target="reference"/>
-       Footnoted Reference to <xref target="reference"/>
-       Inline Reference with Text to <xref target="reference">text</xref>
-       Footnoted Reference with Text to <xref target="reference">text</xref></p>
-       </clause>
-       </sections>
-       </iec-standard>
-      OUTPUT
-    end
+    output = <<~OUTPUT
+      #{@blank_hdr}
+       <sections>
+        <clause id="reference" inline-header="false" obligation="normative">
+        <title>Section</title>
+        <p id="_">Inline Reference to <xref target="reference"/>
+      Footnoted Reference to <xref target="reference"/>
+      Inline Reference with Text to <xref target="reference">text</xref>
+      Footnoted Reference with Text to <xref target="reference">text</xref></p>
+      </clause>
+      </sections>
+      </iec-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
 
-    it "processes bibliographic anchors" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes bibliographic anchors" do
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Normative References
@@ -89,41 +101,45 @@ end
       * [[[ISO713]]] Reference
 
     INPUT
-            #{@blank_hdr}
-       <sections>
+    output = <<~OUTPUT
+           #{@blank_hdr}
+      <sections>
 
-       </sections><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative references</title>
-         <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
-         <bibitem id="ISO712">
-         <formattedref format="application/x-isodoc+xml">Reference</formattedref>
-         <docidentifier>x</docidentifier>
-       </bibitem>
-         <bibitem id="ISO713">
-         <formattedref format="application/x-isodoc+xml">Reference</formattedref>
-         <docidentifier>ISO713</docidentifier>
-         <docnumber>713</docnumber>
-       </bibitem>
-       </references>
-       </bibliography>
-       </iec-standard>
+      </sections><bibliography><references id="_" obligation="informative" normative="true">
+        <title>Normative references</title>
+        <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+        <bibitem id="ISO712">
+        <formattedref format="application/x-isodoc+xml">Reference</formattedref>
+        <docidentifier>x</docidentifier>
+      </bibitem>
+        <bibitem id="ISO713">
+        <formattedref format="application/x-isodoc+xml">Reference</formattedref>
+        <docidentifier>ISO713</docidentifier>
+        <docnumber>713</docnumber>
+      </bibitem>
+      </references>
+      </bibliography>
+      </iec-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes footnotes" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       Hello!footnote:[Footnote text]
     INPUT
-            #{@blank_hdr}
-       <sections>
-         <p id="_">Hello!<fn reference="1">
-         <p id="_">Footnote text</p>
-       </fn></p>
-       </sections>
-       </iec-standard>
+    output = <<~OUTPUT
+           #{@blank_hdr}
+      <sections>
+        <p id="_">Hello!<fn reference="1">
+        <p id="_">Footnote text</p>
+      </fn></p>
+      </sections>
+      </iec-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
-
-
 end

data/spec/metanorma/section_spec.rb

@@ -1,12 +1,12 @@
 require "spec_helper"
 
 RSpec.describe Metanorma::Iec do
-   before(:all) do
-  @blank_hdr = blank_hdr_gen
-end
+  before(:all) do
+    @blank_hdr = blank_hdr_gen
+  end
 
   it "processes sections" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       .Foreword
 
@@ -56,69 +56,72 @@ end
 
       === Bibliography Subsection
     INPUT
-            #{@blank_hdr}
-       <preface><foreword id="_" obligation="informative">
-         <title>FOREWORD</title>
-         <p id="_">Text</p>
-       </foreword><introduction id="_" obligation="informative">
-<title>INTRODUCTION</title><clause id="_" inline-header="false" obligation="informative">
-         <title>Introduction Subsection</title>
-       </clause>
-       </introduction></preface><sections>
-       <clause id="_" obligation="normative" type="scope" inline-header='false'>
-         <title>Scope</title>
-         <p id="_">Text</p>
-       </clause>
-
-       <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><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><expression><name>Term2</name></expression></preferred>
-       </term>
-       </terms>
-       <definitions id="_" obligation="normative"><title>Symbols and abbreviated terms</title></definitions></clause>
-       <definitions id="_" obligation="normative"><title>Symbols and abbreviated terms</title></definitions>
-       <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" inline-header="false" obligation="normative">
-         <title>Introduction</title>
-       </clause>
-       <clause id="_" inline-header="false" obligation="normative">
-         <title>Clause 4.2</title>
-       </clause></clause>
-       <clause id="_" inline-header="false" obligation="normative">
-          <title>Terms and Definitions</title>
-       </clause>
-
-
-       </sections><annex id="_" inline-header="false" obligation="normative">
-         <title>Annex</title>
-         <clause id="_" inline-header="false" obligation="normative">
-         <title>Annex A.1</title>
-       </clause>
-       <appendix id="_" inline-header="false" obligation="normative">
-          <title>Appendix 1</title>
-       </appendix></annex><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative references</title><p id="_">There are no normative references in this document.</p>
-       </references><clause id="_" obligation="informative">
-         <title>Bibliography</title>
-         <references id="_" obligation="informative" normative="false">
-         <title>Bibliography Subsection</title>
-       </references>
-       </clause>
-       </bibliography>
-       </iec-standard>
+    output = <<~OUTPUT
+                  #{@blank_hdr}
+             <preface><foreword id="_" obligation="informative">
+               <title>FOREWORD</title>
+               <p id="_">Text</p>
+             </foreword><introduction id="_" obligation="informative">
+      <title>INTRODUCTION</title><clause id="_" inline-header="false" obligation="informative">
+               <title>Introduction Subsection</title>
+             </clause>
+             </introduction></preface><sections>
+             <clause id="_" obligation="normative" type="scope" inline-header='false'>
+               <title>Scope</title>
+               <p id="_">Text</p>
+             </clause>
+
+             <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><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><expression><name>Term2</name></expression></preferred>
+             </term>
+             </terms>
+             <definitions id="_" obligation="normative"><title>Symbols and abbreviated terms</title></definitions></clause>
+             <definitions id="_" obligation="normative"><title>Symbols and abbreviated terms</title></definitions>
+             <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" inline-header="false" obligation="normative">
+               <title>Introduction</title>
+             </clause>
+             <clause id="_" inline-header="false" obligation="normative">
+               <title>Clause 4.2</title>
+             </clause></clause>
+             <clause id="_" inline-header="false" obligation="normative">
+                <title>Terms and Definitions</title>
+             </clause>
+
+
+             </sections><annex id="_" inline-header="false" obligation="normative">
+               <title>Annex</title>
+               <clause id="_" inline-header="false" obligation="normative">
+               <title>Annex A.1</title>
+             </clause>
+             <appendix id="_" inline-header="false" obligation="normative">
+                <title>Appendix 1</title>
+             </appendix></annex><bibliography><references id="_" obligation="informative" normative="true">
+               <title>Normative references</title><p id="_">There are no normative references in this document.</p>
+             </references><clause id="_" obligation="informative">
+               <title>Bibliography</title>
+               <references id="_" obligation="informative" normative="false">
+               <title>Bibliography Subsection</title>
+             </references>
+             </clause>
+             </bibliography>
+             </iec-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes sections with title attributes" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       .Foreword
 
@@ -174,84 +177,86 @@ end
 
       === Bibliography Subsection
     INPUT
-            #{@blank_hdr}
-       <preface>     
-       <foreword id="_" obligation="informative">
-         <title>FOREWORD</title>
-         <p id="_">Text</p>
-       </foreword>
-       <introduction id="_" obligation="informative">
-<title>INTRODUCTION</title><clause id="_" inline-header="false" obligation="informative">
-         <title>Introduction Subsection</title>
-       </clause>
-       </introduction>
-       </preface>
-       <sections>
-       <clause id="_" obligation="normative" type="scope" inline-header='false'>
-         <title>Scope</title>
-         <p id="_">Text</p>
-       </clause>
-     
-       <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><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><expression><name>Term2</name></expression></preferred>
-               </term>
-             </terms>
-             <definitions id='_' obligation="normative">
-               <title>Symbols and abbreviated terms</title>
-             </definitions>
-           </clause>
-           <definitions id='_' obligation="normative">
-             <title>Symbols and abbreviated terms</title>
-           </definitions>
-           <clause id='_' inline-header='false' obligation='normative'>
-             <title>Clause 4</title>
-             <clause id='_' inline-header='false' obligation='normative'>
-               <title>Introduction</title>
+    output = <<~OUTPUT
+                  #{@blank_hdr}
+             <preface>
+             <foreword id="_" obligation="informative">
+               <title>FOREWORD</title>
+               <p id="_">Text</p>
+             </foreword>
+             <introduction id="_" obligation="informative">
+      <title>INTRODUCTION</title><clause id="_" inline-header="false" obligation="informative">
+               <title>Introduction Subsection</title>
              </clause>
-             <clause id='_' inline-header='false' obligation='normative'>
-               <title>Clause 4.2</title>
+             </introduction>
+             </preface>
+             <sections>
+             <clause id="_" obligation="normative" type="scope" inline-header='false'>
+               <title>Scope</title>
+               <p id="_">Text</p>
              </clause>
-           </clause>
-         </sections>
-         <annex id='_' inline-header='false' obligation='normative'>
-           <title>Annex</title>
-           <clause id='_' inline-header='false' obligation='normative'>
-             <title>Annex A.1</title>
-           </clause>
-           <appendix id='_' inline-header='false' obligation='normative'>
-             <title>Appendx 1</title>
-           </appendix>
-         </annex>
-         <bibliography>
-           <references id='_' obligation='informative' normative="true">
-             <title>Normative references</title>
-             <p id="_">There are no normative references in this document.</p>
-           </references>
-           <clause id='_' obligation='informative'>
-             <title>Bibliography</title>
-             <references id='_' obligation='informative' normative="false">
-               <title>Bibliography Subsection</title>
-             </references>
-           </clause>
-         </bibliography>
-       </iec-standard>
+             <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><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><expression><name>Term2</name></expression></preferred>
+                     </term>
+                   </terms>
+                   <definitions id='_' obligation="normative">
+                     <title>Symbols and abbreviated terms</title>
+                   </definitions>
+                 </clause>
+                 <definitions id='_' obligation="normative">
+                   <title>Symbols and abbreviated terms</title>
+                 </definitions>
+                 <clause id='_' inline-header='false' obligation='normative'>
+                   <title>Clause 4</title>
+                   <clause id='_' inline-header='false' obligation='normative'>
+                     <title>Introduction</title>
+                   </clause>
+                   <clause id='_' inline-header='false' obligation='normative'>
+                     <title>Clause 4.2</title>
+                   </clause>
+                 </clause>
+               </sections>
+               <annex id='_' inline-header='false' obligation='normative'>
+                 <title>Annex</title>
+                 <clause id='_' inline-header='false' obligation='normative'>
+                   <title>Annex A.1</title>
+                 </clause>
+                 <appendix id='_' inline-header='false' obligation='normative'>
+                   <title>Appendx 1</title>
+                 </appendix>
+               </annex>
+               <bibliography>
+                 <references id='_' obligation='informative' normative="true">
+                   <title>Normative references</title>
+                   <p id="_">There are no normative references in this document.</p>
+                 </references>
+                 <clause id='_' obligation='informative'>
+                   <title>Bibliography</title>
+                   <references id='_' obligation='informative' normative="false">
+                     <title>Bibliography Subsection</title>
+                   </references>
+                 </clause>
+               </bibliography>
+             </iec-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes section obligations" do
-     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [obligation=informative]
       == Clause 1
@@ -263,26 +268,29 @@ end
 
       [appendix,obligation=informative]
       == Annex
-     INPUT
-             #{@blank_hdr}
-       <sections><clause id="_" inline-header="false" obligation="informative">
-         <title>Clause 1</title>
-         <clause id="_" inline-header="false" obligation="informative">
-         <title>Clause 1a</title>
-       </clause>
-       </clause>
-       <clause id="_" inline-header="false" obligation="normative">
-         <title>Clause 2</title>
-       </clause>
-       </sections><annex id="_" inline-header="false" obligation="informative">
-         <title>Annex</title>
-       </annex>
-       </iec-standard>
-     OUTPUT
+    INPUT
+    output = <<~OUTPUT
+            #{@blank_hdr}
+      <sections><clause id="_" inline-header="false" obligation="informative">
+        <title>Clause 1</title>
+        <clause id="_" inline-header="false" obligation="informative">
+        <title>Clause 1a</title>
+      </clause>
+      </clause>
+      <clause id="_" inline-header="false" obligation="normative">
+        <title>Clause 2</title>
+      </clause>
+      </sections><annex id="_" inline-header="false" obligation="informative">
+        <title>Annex</title>
+      </annex>
+      </iec-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
-    it "processes inline headers" do
-     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes inline headers" do
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       == Clause 1
 
@@ -294,42 +302,47 @@ end
 
       [%inline-header]
       === Clause Aa
-     INPUT
-             #{@blank_hdr}
-       <sections><clause id="_" inline-header="false" obligation="normative">
-         <title>Clause 1</title>
-         <clause id="_" inline-header="true" obligation="normative">
-         <title>Clause 1a</title>
-       </clause>
-       </clause>
-       </sections><annex id="_" inline-header="false" obligation="normative">
-         <title>Annex A</title>
-         <clause id="_" inline-header="true" obligation="normative">
-         <title>Clause Aa</title>
-       </clause>
-       </annex>
-       </iec-standard>
-     OUTPUT
-    end
+    INPUT
+    output = <<~OUTPUT
+            #{@blank_hdr}
+      <sections><clause id="_" inline-header="false" obligation="normative">
+        <title>Clause 1</title>
+        <clause id="_" inline-header="true" obligation="normative">
+        <title>Clause 1a</title>
+      </clause>
+      </clause>
+      </sections><annex id="_" inline-header="false" obligation="normative">
+        <title>Annex A</title>
+        <clause id="_" inline-header="true" obligation="normative">
+        <title>Clause Aa</title>
+      </clause>
+      </annex>
+      </iec-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
 
   it "processes blank headers" do
-     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       == Clause 1
 
       === {blank}
 
-     INPUT
-             #{@blank_hdr}
-       <sections>
-         <clause id="_" inline-header="false" obligation="normative">
-         <title>Clause 1</title>
-         <clause id="_" inline-header="false" obligation="normative">
-       </clause>
-       </clause>
-       </sections>
-       </iec-standard>
-     OUTPUT
+    INPUT
+    output = <<~OUTPUT
+            #{@blank_hdr}
+      <sections>
+        <clause id="_" inline-header="false" obligation="normative">
+        <title>Clause 1</title>
+        <clause id="_" inline-header="false" obligation="normative">
+      </clause>
+      </clause>
+      </sections>
+      </iec-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: metanorma-iec lets you write IEC standards in AsciiDoc.