metanorma-iec 2.1.6 → 2.1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 908bfed791fccdb7828a63b15a133a61e1591de49e3b32a8f99f1c14adc0a0d5
-  data.tar.gz: 915402d4accbb80e50f68870646e41a285f306937a2eb7df0a2b1fdd947ea1c2
+  metadata.gz: 8212307690191af07b587646aa7c8cc8ba091c1a55d1908bd3851a2b46fc1e7f
+  data.tar.gz: 94239654f8b267dfd12bc8198235f3c3fe89698ddc9a25cef206893a16bad5ff
 SHA512:
-  metadata.gz: 529609068f93529b989566f73f250fb274dd984b85e2a3bce30ef90c97dfe7142543e7fa5471f3dd538f49a02ceab009705bc665a667ed791133bf8306b475fa
-  data.tar.gz: 863f607e319df46c67b4964baa8f27b575a6225c3217e3d26e55d718c6d6743dd4cb63be99d20e6800d20c0583b6e2a91fa40421352576fc9075c77334bf4d20
+  metadata.gz: ce12487a121517043948f01ad664187803d575d01dfa8450c523f7f50958473e15ee80f623bf9b6c45cf5156421fdfa50af641e8588968ea1c07a5d5b57f033e
+  data.tar.gz: 7f776f92f93ba2a48007ee558f4dd534212c32f443e9bfd6ec6294cfbd27d5b31f1729e3656256509c89b7504b9097df18e88d39dac1e1fecf3df7937bf98302

data/.github/workflows/rake.yml

@@ -10,6 +10,6 @@ on:
 
 jobs:
   notify:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/mn-processor-rake.yml@main
+    uses: metanorma/ci/.github/workflows/mn-processor-rake.yml@main
     secrets:
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -0,0 +1,24 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+    secrets:
+      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
+

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

@@ -18,7 +18,7 @@
 <p class="coverpage_techcommittee"><a
 name="CVP_Secretariat_Loca">Secretariat</a>: {{ secretariat }}</p>
 
-<div class="doctitle-en"><div><span class="title">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &mdash; {% endif %}</span><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &mdash;{% endif %}</span>
+<div class="doctitle-en"><div><span class="title">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &#x2014; {% endif %}</span><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &#x2014;{% endif %}</span>
   {% if doctitlepart %}
 </div><div class="doctitle-part">
   {% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span>{% endif %}
@@ -26,7 +26,7 @@ name="CVP_Secretariat_Loca">Secretariat</a>: {{ secretariat }}</p>
   {% endif %}
 </div></div>
 
-<div class="doctitle-fr"><div><span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash;{% endif %}</span>
+<div class="doctitle-fr"><div><span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &#x2014; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &#x2014;{% endif %}</span>
   {% if docsubtitlepart %}
   </div><div>
   {% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span>{% endif %}

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

@@ -1944,8 +1944,18 @@
 
 	<xsl:param name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl -->
 
+	<xsl:variable name="isApplyAutolayoutAlgorithm_">
+		true
+	</xsl:variable>
+	<xsl:variable name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/>
+
 	<xsl:variable name="isGenerateTableIF_">
-		false
+		<xsl:choose>
+			<xsl:when test="$isApplyAutolayoutAlgorithm = 'true'">
+				<xsl:value-of select="normalize-space($table_if) = 'true'"/>
+			</xsl:when>
+			<xsl:otherwise>false</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable>
 	<xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/>
 
@@ -2364,6 +2374,9 @@
 	<xsl:attribute-set name="import-style">
 	</xsl:attribute-set>
 
+	<xsl:attribute-set name="component-style">
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="recommendation-style">
 
 	</xsl:attribute-set>
@@ -2580,9 +2593,7 @@
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="dt-block-style">
-		<xsl:attribute name="margin-top">6pt</xsl:attribute>
-
-			<xsl:attribute name="margin-top">0pt</xsl:attribute>
+		<xsl:attribute name="margin-top">0pt</xsl:attribute>
 
 	</xsl:attribute-set>
 
@@ -3565,6 +3576,7 @@
 
 			<xsl:variable name="margin-side">
 				<xsl:choose>
+					<xsl:when test="$isApplyAutolayoutAlgorithm = 'true'">0</xsl:when>
 					<xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
 					<xsl:otherwise>0</xsl:otherwise>
 				</xsl:choose>
@@ -3637,6 +3649,7 @@
 									</td>
 								</tr>
 							-->
+							<!-- Simple_table=<xsl:copy-of select="$simple-table"/> -->
 							<xsl:apply-templates select="xalan:nodeset($simple-table)" mode="process_table-if"/>
 
 						</xsl:when>
@@ -3771,12 +3784,17 @@
 	<xsl:template name="calculate-column-widths">
 		<xsl:param name="table"/>
 		<xsl:param name="cols-count"/>
-
+		<xsl:choose>
+			<xsl:when test="$isApplyAutolayoutAlgorithm = 'true'">
+				<xsl:call-template name="get-calculated-column-widths-autolayout-algorithm"/>
+			</xsl:when>
+			<xsl:otherwise>
 				<xsl:call-template name="calculate-column-widths-proportional">
 					<xsl:with-param name="cols-count" select="$cols-count"/>
 					<xsl:with-param name="table" select="$table"/>
 				</xsl:call-template>
-
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<!-- ================================================== -->
@@ -3954,6 +3972,7 @@
 	<!-- (https://www.w3.org/TR/REC-html40/appendix/notes.html#h-B.5.2) -->
 	<!-- ================================================== -->
 
+	<!-- INPUT: table with columns widths, generated by table_if.xsl  -->
 	<xsl:template name="calculate-column-widths-autolayout-algorithm">
 		<xsl:param name="parent_table_page-width"/> <!-- for nested tables, in re-calculate step -->
 
@@ -3965,67 +3984,6 @@
 
 		<!-- Since line wrap has been disabled, paragraphs are treated as long lines unless broken by BR elements. -->
 
-		<!-- get current table id -->
-		<xsl:variable name="table_id" select="@id"/>
-		<!-- find table by id in the file 'table_widths' -->
-	<!-- 	<xsl:variable name="table-if_" select="$table_widths_from_if//table[@id = $table_id]"/>
-		<xsl:variable name="table-if" select="xalan:nodeset($table-if_)"/> -->
-
-		<!-- table='<xsl:copy-of select="$table"/>' -->
-		<!-- table_id='<xsl:value-of select="$table_id"/>\ -->
-		<!-- table-if='<xsl:copy-of select="$table-if"/>' -->
-		<!-- table_widths_from_if='<xsl:copy-of select="$table_widths_from_if"/>' -->
-
-		<xsl:variable name="table_with_cell_widths_">
-			<xsl:apply-templates select="." mode="determine_cell_widths-if"/> <!-- read column's width from IF -->
-		</xsl:variable>
-		<xsl:variable name="table_with_cell_widths" select="xalan:nodeset($table_with_cell_widths_)"/>
-
-		<!-- <xsl:if test="$table_if_debug = 'true'">
-			<xsl:copy-of select="$table_with_cell_widths"/>
-		</xsl:if> -->
-
-		<!-- The minimum and maximum cell widths are then used to determine the corresponding minimum and maximum widths for the columns. -->
-
-		<xsl:variable name="column_widths_">
-			<!-- iteration of columns -->
-			<xsl:for-each select="$table_with_cell_widths//tr[1]/td">
-				<xsl:variable name="pos" select="position()"/>
-				<column>
-					<xsl:attribute name="width_max">
-						<xsl:for-each select="ancestor::tbody//tr/td[$pos]/@width_max">
-							<xsl:sort select="." data-type="number" order="descending"/>
-							<xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
-						</xsl:for-each>
-					</xsl:attribute>
-					<xsl:attribute name="width_min">
-						<xsl:for-each select="ancestor::tbody//tr/td[$pos]/@width_min">
-							<xsl:sort select="." data-type="number" order="descending"/>
-							<xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
-						</xsl:for-each>
-					</xsl:attribute>
-				</column>
-			</xsl:for-each>
-		</xsl:variable>
-		<xsl:variable name="column_widths" select="xalan:nodeset($column_widths_)"/>
-
-		<!-- <column_widths>
-			<xsl:copy-of select="$column_widths"/>
-		</column_widths> -->
-
-		<!-- These in turn, are used to find the minimum and maximum width for the table. -->
-		<xsl:variable name="table_widths_">
-			<table>
-				<xsl:attribute name="width_max">
-					<xsl:value-of select="sum($column_widths/column/@width_max)"/>
-				</xsl:attribute>
-				<xsl:attribute name="width_min">
-					<xsl:value-of select="sum($column_widths/column/@width_min)"/>
-				</xsl:attribute>
-			</table>
-		</xsl:variable>
-		<xsl:variable name="table_widths" select="xalan:nodeset($table_widths_)"/>
-
 		<xsl:variable name="page_width">
 			<xsl:choose>
 				<xsl:when test="$parent_table_page-width != ''">
@@ -4038,16 +3996,13 @@
 		</xsl:variable>
 
 		<xsl:if test="$table_if_debug = 'true'">
-			<table_width>
-				<xsl:copy-of select="$table_widths"/>
-			</table_width>
-			<debug>$page_width=<xsl:value-of select="$page_width"/></debug>
+			<page_width><xsl:value-of select="$page_width"/></page_width>
 		</xsl:if>
 
 		<!-- There are three cases: -->
 		<xsl:choose>
 			<!-- 1. The minimum table width is equal to or wider than the available space -->
-			<xsl:when test="$table_widths/table/@width_min &gt;= $page_width and 1 = 2"> <!-- this condition isn't working see case 3 below -->
+			<xsl:when test="@width_min &gt;= $page_width and 1 = 2"> <!-- this condition isn't working see case 3 below -->
 				<!-- call old algorithm -->
 				<case1/>
 				<!-- <xsl:variable name="cols-count" select="count(xalan:nodeset($table)/*/tr[1]/td)"/>
@@ -4057,10 +4012,10 @@
 				</xsl:call-template> -->
 			</xsl:when>
 			<!-- 2. The maximum table width fits within the available space. In this case, set the columns to their maximum widths. -->
-			<xsl:when test="$table_widths/table/@width_max &lt;= $page_width">
+			<xsl:when test="@width_max &lt;= $page_width">
 				<case2/>
 				<autolayout/>
-				<xsl:for-each select="$column_widths/column/@width_max">
+				<xsl:for-each select="column/@width_max">
 					<column divider="100"><xsl:value-of select="."/></column>
 				</xsl:for-each>
 			</xsl:when>
@@ -4070,19 +4025,19 @@
 			For each column, let d be the difference between maximum and minimum width of that column. 
 			Now set the column's width to the minimum width plus d times W over D. 
 			This makes columns with large differences between minimum and maximum widths wider than columns with smaller differences. -->
-			<xsl:when test="($table_widths/table/@width_max &gt; $page_width and $table_widths/table/@width_min &lt; $page_width) or ($table_widths/table/@width_min &gt;= $page_width)">
+			<xsl:when test="(@width_max &gt; $page_width and @width_min &lt; $page_width) or (@width_min &gt;= $page_width)">
 				<!-- difference between the available space and the minimum table width -->
-				<xsl:variable name="W" select="$page_width - $table_widths/table/@width_min"/>
+				<xsl:variable name="W" select="$page_width - @width_min"/>
 				<W><xsl:value-of select="$W"/></W>
 				<!-- difference between maximum and minimum width of the table -->
-				<xsl:variable name="D" select="$table_widths/table/@width_max - $table_widths/table/@width_min"/>
+				<xsl:variable name="D" select="@width_max - @width_min"/>
 				<D><xsl:value-of select="$D"/></D>
 				<case3/>
 				<autolayout/>
-				<xsl:if test="$table_widths/table/@width_min &gt;= $page_width">
+				<xsl:if test="@width_min &gt;= $page_width">
 					<split_keep-within-line>true</split_keep-within-line>
 				</xsl:if>
-				<xsl:for-each select="$column_widths/column">
+				<xsl:for-each select="column">
 					<!-- difference between maximum and minimum width of that column.  -->
 					<xsl:variable name="d" select="@width_max - @width_min"/>
 					<d><xsl:value-of select="$d"/></d>
@@ -4108,23 +4063,39 @@
 
 		<parent_element><xsl:value-of select="local-name(..)"/></parent_element>
 
+		<ancestor_tree>
+			<xsl:for-each select="ancestor::*">
+				<ancestor><xsl:value-of select="local-name()"/></ancestor>
+			</xsl:for-each>
+		</ancestor_tree>
+
 		<xsl:variable name="parent_table_page-width_">
 			<xsl:if test="$parent_table_id != ''">
 				<!-- determine column number in the parent table -->
 				<xsl:variable name="parent_table_column_number">
 					<xsl:choose>
-						<xsl:when test="parent::*[local-name() = 'dd']">2</xsl:when>
+						<!-- <xsl:when test="parent::*[local-name() = 'dd']">2</xsl:when> -->
+						<xsl:when test="(ancestor::*[local-name() = 'dd' or local-name() = 'table' or local-name() = 'dl'])[last()][local-name() = 'dd' or local-name() = 'dl']">2</xsl:when>
 						<xsl:otherwise> <!-- parent is table -->
 							<xsl:value-of select="count(ancestor::*[local-name() = 'td'][1]/preceding-sibling::*[local-name() = 'td']) + 1"/>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
 				<!-- find table by id in the file 'table_widths' and get all Nth `<column>...</column> -->
-				<xsl:value-of select="$table_widths_from_if_calculated//table[@id = $parent_table_id]/column[number($parent_table_column_number)]"/>
+
+				<xsl:variable name="parent_table_column_" select="$table_widths_from_if_calculated//table[@id = $parent_table_id]/column[number($parent_table_column_number)]"/>
+				<xsl:variable name="parent_table_column" select="xalan:nodeset($parent_table_column_)"/>
+				<!-- <xsl:variable name="divider">
+					<xsl:value-of select="$parent_table_column/@divider"/>
+					<xsl:if test="not($parent_table_column/@divider)">1</xsl:if>
+				</xsl:variable> -->
+				<xsl:value-of select="$parent_table_column/text()"/> <!--  * 10 -->
 			</xsl:if>
 		</xsl:variable>
 		<xsl:variable name="parent_table_page-width" select="normalize-space($parent_table_page-width_)"/>
 
+		<parent_table_page-width><xsl:value-of select="$parent_table_page-width"/></parent_table_page-width>
+
 		<!-- get current table id -->
 		<xsl:variable name="table_id" select="@id"/>
 
@@ -4145,50 +4116,6 @@
 
 	</xsl:template> <!-- get-calculated-column-widths-autolayout-algorithm -->
 
-	<!-- ============================= -->
-	<!-- mode: determine_cell_widths-if -->
-	<!-- ============================= -->
-	<xsl:template match="@*|node()" mode="determine_cell_widths-if">
-		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="determine_cell_widths-if"/>
-		</xsl:copy>
-	</xsl:template>
-
-	<xsl:template match="td | th" mode="determine_cell_widths-if">
-		<xsl:copy>
-			<xsl:copy-of select="@*"/>
-
-			 <!-- The maximum width is given by the widest line.  -->
-			<xsl:attribute name="width_max">
-				<xsl:for-each select="p_len">
-					<xsl:sort select="." data-type="number" order="descending"/>
-					<xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
-				</xsl:for-each>
-			</xsl:attribute>
-
-			<!-- The minimum width is given by the widest text element (word, image, etc.) -->
-			<xsl:variable name="width_min">
-				<xsl:for-each select="word_len">
-					<xsl:sort select="." data-type="number" order="descending"/>
-					<xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
-				</xsl:for-each>
-			</xsl:variable>
-			<xsl:attribute name="width_min">
-				<xsl:value-of select="$width_min"/>
-			</xsl:attribute>
-
-			<xsl:if test="$width_min = 0">
-				<xsl:attribute name="width_min">1</xsl:attribute>
-			</xsl:if>
-
-			<xsl:apply-templates select="node()" mode="determine_cell_widths-if"/>
-
-		</xsl:copy>
-	</xsl:template>
-	<!-- ============================= -->
-	<!-- END mode: determine_cell_widths-if -->
-	<!-- ============================= -->
-
 	<!-- ================================================== -->
 	<!-- Calculate column's width based on HTML4 algorithm -->
 	<!-- ================================================== -->
@@ -4389,6 +4316,7 @@
 					<xsl:when test="$table_or_dl = 'table'">
 						<xsl:for-each select="*[local-name() = 'td' or local-name() = 'th']/*">
 							<fo:table-row number-columns-spanned="{$col_count}">
+								<xsl:copy-of select="../@font-weight"/>
 								<!-- <test_table><xsl:copy-of select="."/></test_table> -->
 								<xsl:call-template name="td"/>
 							</fo:table-row>
@@ -4544,7 +4472,7 @@
 
 				<xsl:apply-templates/>
 
-				<xsl:if test="$isGenerateTableIF = 'true'"><fo:inline id="{@id}_end">end</fo:inline></xsl:if> <!-- to determine width of text --> <!-- <xsl:value-of select="$hair_space"/> -->
+				<xsl:if test="$isGenerateTableIF = 'true'"> <fo:inline id="{@id}_end">end</fo:inline></xsl:if> <!-- to determine width of text --> <!-- <xsl:value-of select="$hair_space"/> -->
 
 			</fo:block>
 		</fo:table-cell>
@@ -4875,6 +4803,7 @@
 	<xsl:template match="*[local-name()='dl']">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
+		<!-- <dl><xsl:copy-of select="."/></dl> -->
 		<fo:block-container>
 
 					<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
@@ -5423,21 +5352,16 @@
 	<!-- virtual html table for dl/[dt and dd] for IF (Intermediate Format) -->
 	<xsl:template match="*[local-name()='dt']" mode="dl_if">
 		<xsl:param name="id"/>
-		<xsl:variable name="row_number" select="count(preceding-sibling::*[local-name()='dt']) + 1"/>
 		<tr>
 			<td>
 				<xsl:copy-of select="node()"/>
 			</td>
 			<td>
-
-						<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/>
-
-						<!-- get paragraphs from nested 'dl' -->
-						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/>
-
+				<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/>
+				<!-- get paragraphs from nested 'dl' -->
+				<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/>
 			</td>
 		</tr>
-
 	</xsl:template>
 	<xsl:template match="*[local-name()='dd']" mode="dl_if"/>
 
@@ -6090,6 +6014,9 @@
 				<xsl:variable name="td">
 					<xsl:element name="td">
 						<xsl:attribute name="divide"><xsl:value-of select="@colspan"/></xsl:attribute>
+						<xsl:if test="local-name()='th'">
+							<xsl:attribute name="font-weight">bold</xsl:attribute>
+						</xsl:if>
 						<xsl:apply-templates select="@*" mode="simple-table-colspan"/>
 						<xsl:apply-templates mode="simple-table-colspan"/>
 					</xsl:element>
@@ -6102,6 +6029,9 @@
 			<xsl:otherwise>
 				<xsl:element name="td">
 					<xsl:apply-templates select="@*" mode="simple-table-colspan"/>
+					<xsl:if test="local-name()='th'">
+						<xsl:attribute name="font-weight">bold</xsl:attribute>
+					</xsl:if>
 					<xsl:apply-templates mode="simple-table-colspan"/>
 				</xsl:element>
 			</xsl:otherwise>
@@ -6231,8 +6161,14 @@
 			<xsl:copy-of select="@*"/>
 			<xsl:variable name="row_number" select="count(../preceding-sibling::*) + 1"/>
 			<xsl:variable name="col_number" select="count(preceding-sibling::*) + 1"/>
+			<xsl:variable name="divide">
+				<xsl:choose>
+					<xsl:when test="@divide"><xsl:value-of select="@divide"/></xsl:when>
+					<xsl:otherwise>1</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
 			<xsl:attribute name="id">
-				<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number)"/>
+				<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
 			</xsl:attribute>
 
 			<xsl:for-each select="*[local-name() = 'p']">
@@ -6240,10 +6176,12 @@
 					<xsl:copy-of select="@*"/>
 					<xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
 					<xsl:attribute name="id">
-						<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num)"/>
+						<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
 					</xsl:attribute>
 
-					<xsl:copy-of select="node()"/>
+					<!-- <xsl:copy-of select="node()" /> -->
+					<xsl:apply-templates mode="simple-table-noid"/>
+
 				</xsl:copy>
 			</xsl:for-each>
 
@@ -6272,7 +6210,7 @@
 					<xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
 					<xsl:copy>
 						<xsl:attribute name="id">
-							<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num)"/>
+							<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
 						</xsl:attribute>
 						<xsl:copy-of select="node()"/>
 					</xsl:copy>
@@ -6281,6 +6219,24 @@
 		</xsl:copy>
 
 	</xsl:template>
+
+	<xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'p']//*" mode="simple-table-noid">
+		<xsl:copy>
+			<xsl:choose>
+				<xsl:when test="$isGenerateTableIF = 'true'">
+					<xsl:copy-of select="@*[local-name() != 'id']"/> <!-- to prevent repeat id in colspan/rowspan cells -->
+					<!-- <xsl:if test="local-name() = 'dl' or local-name() = 'table'">
+						<xsl:copy-of select="@id"/>
+					</xsl:if> -->
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="@*"/>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:apply-templates select="node()" mode="simple-table-noid"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- End mode: simple-table-id -->
 	<!-- ===================== -->
 	<!-- ===================== -->
@@ -6290,7 +6246,7 @@
 	<!-- =============================== -->
 	<xsl:template match="@*|node()" mode="td_text_with_formatting">
 		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="td_text_with_formatting"/>
+			<xsl:apply-templates select="@*|node()" mode="td_text_with_formatting"/>
 		</xsl:copy>
 	</xsl:template>
 
@@ -6404,6 +6360,10 @@
 
 		<fo:inline xsl:use-attribute-sets="mathml-style">
 
+			<xsl:if test="$isGenerateTableIF = 'true' and ancestor::*[local-name() = 'td' or local-name() = 'th' or local-name() = 'dl'] and not(following-sibling::node()[not(self::comment())][normalize-space() != ''])"> <!-- math in table cell, and math is last element -->
+				<!-- <xsl:attribute name="padding-right">1mm</xsl:attribute> -->
+			</xsl:if>
+
 			<xsl:call-template name="setTrackChangesStyles">
 				<xsl:with-param name="isAdded" select="$isAdded"/>
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
@@ -8297,41 +8257,47 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
+	<xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] |           *[local-name() = 'div'][@type = 'requirement-inherit'] |           *[local-name() = 'div'][@type = 'recommendation-inherit'] |           *[local-name() = 'div'][@type = 'permission-inherit']">
 		<fo:block xsl:use-attribute-sets="inherit-style">
 			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
+	<xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] |           *[local-name() = 'div'][@type = 'requirement-description'] |           *[local-name() = 'div'][@type = 'recommendation-description'] |           *[local-name() = 'div'][@type = 'permission-description']">
 		<fo:block xsl:use-attribute-sets="description-style">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
+	<xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] |           *[local-name() = 'div'][@type = 'requirement-specification'] |           *[local-name() = 'div'][@type = 'recommendation-specification'] |           *[local-name() = 'div'][@type = 'permission-specification']">
 		<fo:block xsl:use-attribute-sets="specification-style">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
+	<xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] |           *[local-name() = 'div'][@type = 'requirement-measurement-target'] |           *[local-name() = 'div'][@type = 'recommendation-measurement-target'] |           *[local-name() = 'div'][@type = 'permission-measurement-target']">
 		<fo:block xsl:use-attribute-sets="measurement-target-style">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
+	<xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] |           *[local-name() = 'div'][@type = 'requirement-verification'] |           *[local-name() = 'div'][@type = 'recommendation-verification'] |           *[local-name() = 'div'][@type = 'permission-verification']">
 		<fo:block xsl:use-attribute-sets="verification-style">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
+	<xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] |           *[local-name() = 'div'][@type = 'requirement-import'] |           *[local-name() = 'div'][@type = 'recommendation-import'] |           *[local-name() = 'div'][@type = 'permission-import']">
 		<fo:block xsl:use-attribute-sets="import-style">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] |           *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] |           *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
+		<fo:block xsl:use-attribute-sets="component-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
 	<!-- ========== -->
 	<!-- END  -->
 	<!-- ========== -->
@@ -8387,15 +8353,12 @@
 
 	<xsl:template match="*[local-name()='tr']" mode="requirement">
 		<fo:table-row height="7mm" border-bottom="0.5pt solid grey">
-			<xsl:if test="parent::*[local-name()='thead']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) -->
-				<xsl:attribute name="background-color">rgb(33, 55, 92)</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')">
-				<xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="starts-with(*[local-name()='td'][1], 'Recommendation ')">
-				<xsl:attribute name="background-color">rgb(233, 235, 239)</xsl:attribute>
+
+			<xsl:if test="parent::*[local-name()='thead'] or starts-with(*[local-name()='td' or local-name()='th'][1], 'Requirement ') or starts-with(*[local-name()='td' or local-name()='th'][1], 'Recommendation ')">
+				<xsl:attribute name="font-weight">bold</xsl:attribute>
+
 			</xsl:if>
+
 			<xsl:apply-templates mode="requirement"/>
 		</fo:table-row>
 	</xsl:template>
@@ -9922,7 +9885,7 @@
 						</tbody>
 					</xsl:variable>
 					<xsl:variable name="cols-count" select="count(xalan:nodeset($toc_table_simple)/*/tr[1]/td)"/>
-					<xsl:call-template name="calculate-column-widths">
+					<xsl:call-template name="calculate-column-widths-proportional">
 						<xsl:with-param name="cols-count" select="$cols-count"/>
 						<xsl:with-param name="table" select="$toc_table_simple"/>
 					</xsl:call-template>

data/lib/metanorma/iec/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.1.6".freeze
+    VERSION = "2.1.8.1".freeze
   end
 end
 

data/lib/metanorma-iec.rb

@@ -7,8 +7,9 @@ require "isodoc/iec/pdf_convert"
 require "isodoc/iec/presentation_xml_convert"
 require "isodoc/iec/metadata"
 require "isodoc/iec/xref"
+require "metanorma"
 
-if defined? Metanorma
+if defined? Metanorma::Registry
   require_relative "metanorma/iec"
   Metanorma::Registry.instance.register(Metanorma::Iec::Processor)
 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", "~> 2.1.6"
+  spec.add_dependency "metanorma-iso", "~> 2.1.8"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "debug"

data/spec/isodoc/iev_spec.rb

@@ -203,7 +203,7 @@ RSpec.describe IsoDoc do
             <p id='_'>There are no normative references in this document.</p>
             <bibitem id='A'>
               <formattedref format='application/x-isodoc+xml'>
-                <em>TITLE</em>
+                <em>TITLE</em> [B]
               </formattedref>
               <docidentifier>B</docidentifier>
             </bibitem>
@@ -213,7 +213,7 @@ RSpec.describe IsoDoc do
             <p id='_'>There are no normative references in this document.</p>
             <bibitem id='A'>
               <formattedref format='application/x-isodoc+xml'>
-                <em>TITLE</em>
+                <em>TITLE</em> [B]
               </formattedref>
               <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
               <docidentifier>B</docidentifier>

data/spec/isodoc/ref_spec.rb

@@ -113,7 +113,7 @@ RSpec.describe IsoDoc::Iec do
         <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
         <docidentifier type="IETF">RFC 10</docidentifier>
       </bibitem>
-      <bibitem id="ref12">
+      <bibitem id="ref12" type="standard">
         <formattedref format="application/x-isodoc+xml">CitationWorks. 2019. <em>How to cite a reference</em>.</formattedref>
         <docidentifier type="metanorma">[Citn]</docidentifier>
         <docidentifier type="IETF">RFC 20</docidentifier>
@@ -137,7 +137,7 @@ RSpec.describe IsoDoc::Iec do
             <eref bibitemid="ISSN">[2]</eref>
             <eref bibitemid="ISO16634">ISO 16634:--</eref>
             <eref bibitemid="ref1">ICC 167</eref>
-            <eref bibitemid="ref10">[10]</eref>
+            <eref bibitemid="ref10">[4]</eref>
             <eref bibitemid="ref12">Citn</eref>
             <eref bibitemid="zip_ffs">[5]</eref>
             </p>
@@ -159,7 +159,7 @@ RSpec.describe IsoDoc::Iec do
             <docidentifier type="ISO">ISO 20483:2013-2014</docidentifier>
           </bibitem>
           <bibitem id="ref1">
-            <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
+            <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>) [ICC 167]</formattedref>
             <docidentifier type="ICC">ICC 167</docidentifier>
           </bibitem>
           <note><name>NOTE</name><p>This is an annotation of ISO 20483:2013-2014</p></note>
@@ -167,14 +167,14 @@ RSpec.describe IsoDoc::Iec do
           </references><references id="_bibliography" obligation="informative" normative="false" displayorder="3">
             <title depth="1">Bibliography</title>
           <bibitem id="ISBN" type="book">
-            <formattedref><em>Chemicals for analytical laboratory use</em>. ISBN.</formattedref>
+            <formattedref><em>Chemicals for analytical laboratory use</em>. n.p.: n.d. ISBN.</formattedref>
+            <docidentifier type="metanorma-ordinal">[1]</docidentifier>
             <docidentifier type="ISBN">ISBN</docidentifier>
-            <docidentifier type="metanorma">[1]</docidentifier>
           </bibitem>
           <bibitem id="ISSN" type="journal">
-            <formattedref><em>Instruments for analytical laboratory use</em>. ISSN.</formattedref>
+            <formattedref><em>Instruments for analytical laboratory use</em>. n.d. ISSN.</formattedref>
+            <docidentifier type="metanorma-ordinal">[2]</docidentifier>
             <docidentifier type="ISSN">ISSN</docidentifier>
-            <docidentifier type="metanorma">[2]</docidentifier>
           </bibitem>
           <note><name>NOTE</name><p>This is an annotation of document ISSN.</p></note>
           <note><name>NOTE</name><p>This is another annotation of document ISSN.</p></note>
@@ -185,14 +185,14 @@ RSpec.describe IsoDoc::Iec do
           </bibitem>
           <bibitem id="ref10">
             <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
-            <docidentifier type="metanorma">[10]</docidentifier>
+            <docidentifier type="metanorma-ordinal">[4]</docidentifier>
           </bibitem>
           <bibitem id="ref11">
-            <formattedref><em>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</em>.</formattedref>
-            <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
+            <formattedref><em><span class='stddocTitle'>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</span></em></formattedref>
+            <docidentifier type='metanorma-ordinal'>[5]</docidentifier>
             <docidentifier type="IETF">IETF RFC 10</docidentifier>
           </bibitem>
-          <bibitem id="ref12">
+          <bibitem id="ref12" type="standard">
             <formattedref format="application/x-isodoc+xml">CitationWorks. 2019. <em>How to cite a reference</em>.</formattedref>
             <docidentifier type="metanorma">[Citn]</docidentifier>
             <docidentifier type="IETF">IETF RFC 20</docidentifier>
@@ -203,7 +203,7 @@ RSpec.describe IsoDoc::Iec do
     OUTPUT
 
     html = <<~OUTPUT
-          #{HTML_HDR}
+      #{HTML_HDR}
             <div>
               <h1 class='ForewordTitle'>FOREWORD</h1>
               <div class='boilerplate_legal'/>
@@ -213,115 +213,116 @@ RSpec.describe IsoDoc::Iec do
                 <a href='#ISSN'>[2]</a>
                 <a href='#ISO16634'>ISO 16634:--</a>
                 <a href='#ref1'>ICC 167</a>
-                <a href='#ref10'>[10]</a>
+                <a href='#ref10'>[4]</a>
                 <a href='#ref12'>Citn</a>
                 <a href='#zip_ffs'>[5]</a>
               </p>
             </div>
             #{IEC_TITLE1}
-            <div>
-              <h1>1&#160; Normative References</h1>
-              <p>
-                The following documents are referred to in the text in such a way that
-                some or all of their content constitutes requirements of this
-                document. For dated references, only the edition cited applies. For
-                undated references, the latest edition of the referenced document
-                (including any amendments) applies.
-              </p>
-              <p id='ISO712' class='NormRef'>
-                [110], ISO 712,
-                <i>Cereals and cereal products</i>
-              </p>
-              <p id='ISO16634' class='NormRef'>
-                ISO 16634:-- (all parts)
-                <a class='FootnoteRef' href='#fn:1'>
-                  <sup>1</sup>
-                </a>
-                ,
-                <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
-              </p>
-              <p id='ISO20483' class='NormRef'>
-                ISO 20483:2013-2014,
-                <i>Cereals and pulses</i>
-              </p>
-              <p id='ref1' class='NormRef'>
-                ICC 167,
-                <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
-                .
-                <i>
-                  Determination of the protein content in cereal and cereal products
-                  for food and animal feeding stuffs according to the Dumas combustion
-                  method
-                </i>
-                 (see
-                <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
-                )
-              </p>
-              <div class='Note'>
-                <p>
-                  <span class='note_label'>NOTE</span>
-                  &#160; This is an annotation of ISO 20483:2013-2014
-                </p>
-              </div>
-              <p id='zip_ffs' class='NormRef'>[5] Title 5</p>
-            </div>
-            <br/>
-            <div>
-              <h1 class='Section3'>Bibliography</h1>
-              <p id='ISBN' class='Biblio'>
-                [1]&#160;
-                <i>Chemicals for analytical laboratory use</i>. ISBN.
-              </p>
-              <p id='ISSN' class='Biblio'>
-                [2]&#160;
-                <i>Instruments for analytical laboratory use</i>. ISSN.
-              </p>
-              <div class='Note'>
-                <p>
-                  <span class='note_label'>NOTE</span>
-                  &#160; This is an annotation of document ISSN.
-                </p>
-              </div>
-              <div class='Note'>
-                <p>
-                  <span class='note_label'>NOTE</span>
-                  &#160; This is another annotation of document ISSN.
-                </p>
-              </div>
-              <p id='ISO3696' class='Biblio'>
-                [3]&#160; ISO 3696,
-                <i>Water for analytical laboratory use</i>
-              </p>
-              <p id='ref10' class='Biblio'>
-                [10]&#160;
-                <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
-                .
-                <i>
-                  Determination of the protein content in cereal and cereal products
-                  for food and animal feeding stuffs according to the Dumas combustion
-                  method
-                </i>
-                 (see
-                <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
-                )
-              </p>
-              <p id='ref11' class='Biblio'>
-                [4]&#160; IETF RFC 10,
-                <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>.
-              </p>
-              <p id='ref12' class='Biblio'>
-                Citn&#160; IETF RFC 20, CitationWorks. 2019.
-                <i>How to cite a reference</i>
-                .
-              </p>
-            </div>
-            <aside id='fn:1' class='footnote'>
-              <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
-            </aside>
-          </div>
-        </body>
-      </html>
-
+             <div>
+               <h1>1&#xa0; Normative References</h1>
+               <p>
+                 The following documents are referred to in the text in such a way that
+                 some or all of their content constitutes requirements of this
+                 document. For dated references, only the edition cited applies. For
+                 undated references, the latest edition of the referenced document
+                 (including any amendments) applies.
+               </p>
+               <p id='ISO712' class='NormRef'>
+                 [110], ISO 712, 
+                 <i>Cereals and cereal products</i>
+               </p>
+               <p id='ISO16634' class='NormRef'>
+                 ISO 16634:-- (all parts)
+                 <a class='FootnoteRef' href='#fn:1'>
+                   <sup>1</sup>
+                 </a>
+                 , 
+                 <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
+               </p>
+               <p id='ISO20483' class='NormRef'>
+                 ISO 20483:2013-2014, 
+                 <i>Cereals and pulses</i>
+               </p>
+               <p id='ref1' class='NormRef'>
+                 ICC 167, 
+                 <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
+                 . 
+                 <i>
+                   Determination of the protein content in cereal and cereal products
+                   for food and animal feeding stuffs according to the Dumas combustion
+                   method
+                 </i>
+                  (see 
+                 <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
+                 ) [ICC 167]
+               </p>
+               <div class='Note'>
+                 <p>
+                   <span class='note_label'>NOTE</span>
+                   &#xa0; This is an annotation of ISO 20483:2013-2014
+                 </p>
+               </div>
+               <p id='zip_ffs' class='NormRef'>[5] Title 5</p>
+             </div>
+             <br/>
+             <div>
+               <h1 class='Section3'>Bibliography</h1>
+               <p id='ISBN' class='Biblio'>
+                 [1]&#xa0; 
+                 <i>Chemicals for analytical laboratory use</i>
+                 . n.p.: n.d. ISBN.
+               </p>
+               <p id='ISSN' class='Biblio'>
+                 [2]&#xa0; 
+                 <i>Instruments for analytical laboratory use</i>
+                 . n.d. ISSN.
+               </p>
+               <div class='Note'>
+                 <p>
+                   <span class='note_label'>NOTE</span>
+                   &#xa0; This is an annotation of document ISSN.
+                 </p>
+               </div>
+               <div class='Note'>
+                 <p>
+                   <span class='note_label'>NOTE</span>
+                   &#xa0; This is another annotation of document ISSN.
+                 </p>
+               </div>
+               <p id='ISO3696' class='Biblio'>
+                 [3]&#xa0; ISO 3696, 
+                 <i>Water for analytical laboratory use</i>
+               </p>
+               <p id='ref10' class='Biblio'>
+                 [4]&#xa0; 
+                 <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
+                 . 
+                 <i>
+                   Determination of the protein content in cereal and cereal products
+                   for food and animal feeding stuffs according to the Dumas combustion
+                   method
+                 </i>
+                  (see 
+                 <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
+                 )
+               </p>
+               <p id='ref11' class='Biblio'>
+                 [5]&#xa0; IETF RFC 10, 
+                 <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
+               </p>
+               <p id='ref12' class='Biblio'>
+                 Citn&#xa0; IETF RFC 20, CitationWorks. 2019. 
+                 <i>How to cite a reference</i>
+                 .
+               </p>
+             </div>
+             <aside id='fn:1' class='footnote'>
+               <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
+             </aside>
+           </div>
+         </body>
+       </html>
     OUTPUT
     expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({})
       .convert("test", input, true).sub(

data/spec/metanorma/base_spec.rb

@@ -89,7 +89,6 @@ RSpec.describe Metanorma::Iec do
       :title-intro-fr: Introduction Française
       :title-main-fr: Titre Principal
       :title-part-fr: Part du Titre
-      :library-ics: 1,2,3
       :accessibility-color-inside: true
       :price-code: XC
       :cen-processing: true
@@ -176,15 +175,6 @@ RSpec.describe Metanorma::Iec do
               <workgroup number='31' type='C1'>WG1</workgroup>
               <secretariat>SECRETARIAT</secretariat>
             </editorialgroup>
-            <ics>
-              <code>1</code>
-            </ics>
-            <ics>
-              <code>2</code>
-            </ics>
-            <ics>
-              <code>3</code>
-            </ics>
             <structuredidentifier>
               <project-number part='1'>IEC 1000</project-number>
             </structuredidentifier>

data/spec/metanorma/iev_spec.rb

@@ -156,15 +156,19 @@ RSpec.describe Metanorma::Iec do
         </bibdata>
                  #{@boilerplate}
         <sections>
-          <clause id='_' obligation='normative'>
+          <terms id='_' obligation='normative'>
             <title>Terms and definitions</title>
-            <terms id='_' obligation='normative'>
-              <title>General</title>
+            <term id='term-General'>
+             <preferred>
+         <expression>
+           <name>General</name>
+         </expression>
+       </preferred>
               <term id='term-Term-1'>
                 <preferred><expression><name>Term 1</name></expression></preferred>
               </term>
-            </terms>
-          </clause>
+            </term>
+          </terms>
         </sections>
       </iec-standard>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.8.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.6
+        version: 2.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.6
+        version: 2.1.8
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +203,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -283,7 +284,7 @@ homepage: https://github.com/metanorma/metanorma-iec
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -298,8 +299,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: metanorma-iec lets you write IEC standards in AsciiDoc.
 test_files: []