metanorma-m3aawg 2.1.6 → 2.1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e412c976cf7cd35f52c321b9d2c02772c3b9aac9598f0bd7682864e2c1a97e1
-  data.tar.gz: 1d49ed66206ebcbf66101106868dfed67d4d12dfc03635295ac952762dd3067a
+  metadata.gz: 045ce58a3bfec9df2645c1d5aa0ec057946625b1e051813958d7cc8534dec911
+  data.tar.gz: 47dd69ec834652367ff9887cc86ea286b94954e9da9a8ce9d82c8c674bb46b9c
 SHA512:
-  metadata.gz: 78acf6198e27b2f390f4f9883a38289a28c7a72f50a59e6a59f6d5082b933ac223ef5c07de1f6665291fe485a67f00ee9e94dcb0bc6fb5c0d2deb32aa0bae224
-  data.tar.gz: 0baf14043064b1f1169f59064160ae5b5096582becd47c187190148ac3522e0724009d57216dd6e6a6ada3e11c8f1576329ec5047cfd452ffda5cbbd4736e3a9
+  metadata.gz: a7f023448dab072f412abf8621796233838483a7d794107a1fc44bbb3e9743d72ce95326116009258c6785eec5635cf2c15b27fc392de870ca25bfa9f15dc4e4
+  data.tar.gz: 8c955a578e69be60898499e29ed39e0370d374d8a3953bb8fbc79eda613918afd7b68c4f6a7661b7fe8dbb32d638f691e84684054102c6ef56c2c83b82d36f5d

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/m3aawg/m3aawg.policy.xsl

@@ -673,8 +673,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_)"/>
 
@@ -1087,6 +1097,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>
@@ -1269,7 +1282,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-set>
 
@@ -2229,6 +2242,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>
@@ -2297,6 +2311,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>
@@ -2431,12 +2446,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>
 
 	<!-- ================================================== -->
@@ -2614,6 +2634,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 -->
 
@@ -2625,67 +2646,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 != ''">
@@ -2698,16 +2658,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)"/>
@@ -2717,10 +2674,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>
@@ -2730,19 +2687,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>
@@ -2768,23 +2725,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"/>
 
@@ -2805,50 +2778,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 -->
 	<!-- ================================================== -->
@@ -3039,6 +2968,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>
@@ -3185,7 +3115,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>
@@ -3511,6 +3441,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'])">
@@ -4044,21 +3975,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"/>
 
@@ -4714,6 +4640,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>
@@ -4726,6 +4655,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>
@@ -4855,8 +4787,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']">
@@ -4864,10 +4802,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>
 
@@ -4896,7 +4836,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>
@@ -4905,6 +4845,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 -->
 	<!-- ===================== -->
 	<!-- ===================== -->
@@ -4914,7 +4872,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>
 
@@ -5028,6 +4986,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"/>
@@ -6908,41 +6870,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  -->
 	<!-- ========== -->
@@ -6998,15 +6966,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>
@@ -8530,7 +8495,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/isodoc/m3aawg/m3aawg.report.xsl

@@ -673,8 +673,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_)"/>
 
@@ -1087,6 +1097,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>
@@ -1269,7 +1282,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-set>
 
@@ -2229,6 +2242,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>
@@ -2297,6 +2311,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>
@@ -2431,12 +2446,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>
 
 	<!-- ================================================== -->
@@ -2614,6 +2634,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 -->
 
@@ -2625,67 +2646,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 != ''">
@@ -2698,16 +2658,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)"/>
@@ -2717,10 +2674,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>
@@ -2730,19 +2687,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>
@@ -2768,23 +2725,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"/>
 
@@ -2805,50 +2778,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 -->
 	<!-- ================================================== -->
@@ -3039,6 +2968,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>
@@ -3185,7 +3115,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>
@@ -3511,6 +3441,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'])">
@@ -4044,21 +3975,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"/>
 
@@ -4714,6 +4640,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>
@@ -4726,6 +4655,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>
@@ -4855,8 +4787,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']">
@@ -4864,10 +4802,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>
 
@@ -4896,7 +4836,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>
@@ -4905,6 +4845,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 -->
 	<!-- ===================== -->
 	<!-- ===================== -->
@@ -4914,7 +4872,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>
 
@@ -5028,6 +4986,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"/>
@@ -6908,41 +6870,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  -->
 	<!-- ========== -->
@@ -6998,15 +6966,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>
@@ -8530,7 +8495,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/m3aawg/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/m3aawg/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3AAWG
-    VERSION = "2.1.6".freeze
+    VERSION = "2.1.8.1".freeze
   end
 end

data/lib/metanorma-m3aawg.rb

@@ -5,8 +5,9 @@ require_relative "isodoc/m3aawg/word_convert"
 require_relative "isodoc/m3aawg/pdf_convert"
 require_relative "isodoc/m3aawg/presentation_xml_convert"
 require_relative "metanorma/m3aawg/version"
+require "metanorma"
 
-if defined? Metanorma
+if defined? Metanorma::Registry
   require_relative "metanorma/m3aawg"
   Metanorma::Registry.instance.register(Metanorma::M3AAWG::Processor)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3aawg
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.8.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 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: htmlentities
@@ -205,6 +205,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -255,13 +256,13 @@ files:
 - lib/metanorma/m3aawg/processor.rb
 - lib/metanorma/m3aawg/reqt.rng
 - lib/metanorma/m3aawg/version.rb
-- metanorma-m3d.gemspec
+- metanorma-m3aawg.gemspec
 - metanorma.yml
 homepage: https://github.com/metanorma/metanorma-m3aawg
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -276,8 +277,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-m3d lets you write M3AAWG Documents in AsciiDoc.
 test_files: []