metanorma-iso 2.1.6 → 2.1.9

data/lib/isodoc/iso/iso.amendment.xsl

@@ -10,7 +10,7 @@
 
 	<xsl:variable name="debug">false</xsl:variable>
 
-	<xsl:variable name="docidentifierISO_undated" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-undated'])"/>
+	<xsl:variable name="docidentifierISO_undated"><xsl:if test="not($stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM')"><xsl:value-of select="normalize-space(/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-undated'])"/></xsl:if></xsl:variable>
 	<xsl:variable name="docidentifierISO_">
 		<xsl:value-of select="$docidentifierISO_undated"/>
 		<xsl:if test="$docidentifierISO_undated = ''">
@@ -120,8 +120,8 @@
 
 	<xsl:variable name="stagename-header-coverpage">
 		<xsl:choose>
-			<xsl:when test="$stage-abbreviation = 'DIS'">DRAFT</xsl:when>
-			<xsl:when test="$stage-abbreviation = 'FDIS'">FINAL DRAFT</xsl:when>
+			<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM'">DRAFT</xsl:when>
+			<xsl:when test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM'">FINAL DRAFT</xsl:when>
 			<xsl:when test="$stage-abbreviation = 'PRF'"/>
 			<xsl:when test="$stage-abbreviation = 'IS'"/>
 			<xsl:otherwise>
@@ -453,14 +453,17 @@
 								<fo:table-body>
 									<fo:table-row>
 										<fo:table-cell font-size="6.5pt" text-align="justify" display-align="after" padding-bottom="8mm">
+											<xsl:if test="$stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM'">
+												<xsl:attribute name="font-size">7pt</xsl:attribute>
+											</xsl:if>
 											<!-- margin-top="-30mm"  -->
 											<fo:block> <!-- margin-top="-100mm" -->
-												<xsl:if test="$stage-abbreviation = 'DIS' or                       $stage-abbreviation = 'NWIP' or                       $stage-abbreviation = 'NP' or                       $stage-abbreviation = 'PWI' or                       $stage-abbreviation = 'AWI' or                       $stage-abbreviation = 'WD' or                       $stage-abbreviation = 'CD'">
+												<xsl:if test="$stage-abbreviation = 'DIS' or                       $stage-abbreviation = 'DAmd' or                       $stage-abbreviation = 'DAM' or                       $stage-abbreviation = 'NWIP' or                       $stage-abbreviation = 'NP' or                       $stage-abbreviation = 'PWI' or                       $stage-abbreviation = 'AWI' or                       $stage-abbreviation = 'WD' or                       $stage-abbreviation = 'CD'">
 													<fo:block margin-bottom="1.5mm">
 														<xsl:text>THIS DOCUMENT IS A DRAFT CIRCULATED FOR COMMENT AND APPROVAL. IT IS THEREFORE SUBJECT TO CHANGE AND MAY NOT BE REFERRED TO AS AN INTERNATIONAL STANDARD UNTIL PUBLISHED AS SUCH.</xsl:text>
 													</fo:block>
 												</xsl:if>
-												<xsl:if test="$stage-abbreviation = 'FDIS' or                       $stage-abbreviation = 'DIS' or                       $stage-abbreviation = 'NWIP' or                       $stage-abbreviation = 'NP' or                       $stage-abbreviation = 'PWI' or                       $stage-abbreviation = 'AWI' or                       $stage-abbreviation = 'WD' or                       $stage-abbreviation = 'CD'">
+												<xsl:if test="$stage-abbreviation = 'FDIS' or                       $stage-abbreviation = 'DIS' or                       $stage-abbreviation = 'FDAmd' or                       $stage-abbreviation = 'FDAM' or                       $stage-abbreviation = 'DAmd' or                       $stage-abbreviation = 'DAM' or                       $stage-abbreviation = 'NWIP' or                       $stage-abbreviation = 'NP' or                       $stage-abbreviation = 'PWI' or                       $stage-abbreviation = 'AWI' or                       $stage-abbreviation = 'WD' or                       $stage-abbreviation = 'CD'">
 													<fo:block margin-bottom="1.5mm">
 														<xsl:text>RECIPIENTS OF THIS DRAFT ARE INVITED TO
 																			SUBMIT, WITH THEIR COMMENTS, NOTIFICATION
@@ -494,7 +497,7 @@
 												</xsl:if>
 
 												<fo:block>
-													<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'FDIS'">
+													<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM'">
 														<xsl:variable name="text">
 															<xsl:for-each select="/iso:iso-standard/iso:preface/iso:note[@coverpage='true']/iso:p">
 																<fo:block>
@@ -610,7 +613,7 @@
 
 						<xsl:choose>
 							<!-- COVER PAGE for DIS document only -->
-							<xsl:when test="$stage-abbreviation = 'DIS'">
+							<xsl:when test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM'">
 								<fo:flow flow-name="xsl-region-body">
 									<fo:block-container>
 										<fo:block margin-top="-1mm" font-size="20pt" text-align="right">
@@ -635,7 +638,7 @@
 														</fo:block>
 													</fo:table-cell>
 													<fo:table-cell>
-														<fo:block>
+														<fo:block margin-bottom="3mm">
 															<xsl:copy-of select="$secretariat"/>
 														</fo:block>
 													</fo:table-cell>
@@ -730,10 +733,10 @@
 									</fo:block-container>
 								</fo:flow>
 
-							</xsl:when> <!-- END: $stage-abbreviation = 'DIS' -->
+							</xsl:when> <!-- END: $stage-abbreviation = 'DIS' 'DAmd' 'DAM'-->
 							<xsl:otherwise>
 
-								<!-- COVER PAGE  for all documents except DIS -->
+								<!-- COVER PAGE  for all documents except DIS, DAmd and DAM -->
 								<fo:flow flow-name="xsl-region-body">
 									<fo:block-container>
 										<fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1"> <!-- margin-bottom="35mm" -->
@@ -769,6 +772,7 @@
 													<fo:table-cell>
 														<fo:block text-align="left">
 															<xsl:choose>
+																<xsl:when test="$stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM'"><xsl:value-of select="$doctype_uppercased"/></xsl:when>
 																<xsl:when test="$doctype = 'amendment'">
 																	<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(translate(/iso:iso-standard/iso:bibdata/iso:ext/iso:updates-document-type,'-',' ')))"/>
 																</xsl:when>
@@ -817,7 +821,7 @@
 														</fo:block>
 														<!-- <xsl:value-of select="$linebreak"/>
 														<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/> -->
-														<xsl:if test="$doctype = 'amendment'">
+														<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM')">
 															<fo:block text-align="right" margin-right="0.5mm">
 																<fo:block font-weight="bold" margin-top="4pt" role="H1">
 																	<xsl:value-of select="$doctype_uppercased"/>
@@ -875,11 +879,11 @@
 												<fo:table-row> <!--  border="1pt solid black" height="150mm"  -->
 													<fo:table-cell font-size="11pt">
 														<fo:block>
-															<xsl:if test="$stage-abbreviation = 'FDIS'">
+															<xsl:if test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM'">
 																<fo:block-container border="0.5mm solid black" width="51mm">
 																	<fo:block margin="2mm">
 																			<fo:block margin-bottom="8pt"><xsl:copy-of select="$editorialgroup"/></fo:block>
-																			<fo:block margin-bottom="6pt"><xsl:value-of select="$secretariat"/></fo:block>
+																			<fo:block margin-bottom="6pt"><xsl:copy-of select="$secretariat"/></fo:block>
 																			<fo:block margin-bottom="6pt">Voting begins on:<xsl:value-of select="$linebreak"/>
 																				<fo:inline font-weight="bold">
 																					<xsl:choose>
@@ -911,7 +915,7 @@
 													<fo:table-cell>
 														<xsl:call-template name="insertTripleLine"/>
 														<fo:block-container line-height="1.1">
-															<fo:block margin-right="5mm">
+															<fo:block margin-right="3.5mm">
 																<fo:block font-size="18pt" font-weight="bold" margin-top="12pt" role="H1">
 
 																	<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
@@ -928,27 +932,29 @@
 
 																</fo:block>
 
-																<xsl:for-each select="xalan:nodeset($lang_other)/lang">
-																	<xsl:variable name="lang_other" select="."/>
+																<xsl:if test="not($stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM')">
+																	<xsl:for-each select="xalan:nodeset($lang_other)/lang">
+																		<xsl:variable name="lang_other" select="."/>
 
-																	<fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
-																	<fo:block font-size="11pt" font-style="italic" line-height="1.1" role="H1">
+																		<fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
+																		<fo:block font-size="11pt" font-style="italic" line-height="1.1" role="H1">
 
-																		<!-- Example: title-intro fr -->
-																		<xsl:apply-templates select="$XML/iso:iso-standard/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-intro']"/>
+																			<!-- Example: title-intro fr -->
+																			<xsl:apply-templates select="$XML/iso:iso-standard/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-intro']"/>
 
-																		<xsl:apply-templates select="$XML/iso:iso-standard/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-main']"/>
+																			<xsl:apply-templates select="$XML/iso:iso-standard/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-main']"/>
 
-																		<xsl:apply-templates select="$XML/iso:iso-standard/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-part']">
-																			<xsl:with-param name="curr_lang" select="$lang_other"/>
-																		</xsl:apply-templates>
+																			<xsl:apply-templates select="$XML/iso:iso-standard/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-part']">
+																				<xsl:with-param name="curr_lang" select="$lang_other"/>
+																			</xsl:apply-templates>
 
-																		<xsl:apply-templates select="$XML/iso:iso-standard/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-amd']">
-																			<xsl:with-param name="curr_lang" select="$lang_other"/>
-																		</xsl:apply-templates>
+																			<xsl:apply-templates select="$XML/iso:iso-standard/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-amd']">
+																				<xsl:with-param name="curr_lang" select="$lang_other"/>
+																			</xsl:apply-templates>
 
-																	</fo:block>
-																</xsl:for-each>
+																		</fo:block>
+																	</xsl:for-each>
+																</xsl:if>
 
 																<xsl:if test="$stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD' or $stage-abbreviation = 'FDIS'">
 																	<fo:block margin-top="10mm">
@@ -1591,13 +1597,19 @@
 				</xsl:if>
 
 				<fo:block font-weight="normal" line-height="1.1">
-					<xsl:value-of select="$doctype_uppercased"/>
+					<xsl:choose>
+						<xsl:when test="$isMainLang = 'false' and $curr_lang = 'fr'">AMENDEMENT</xsl:when>
+						<xsl:otherwise><xsl:value-of select="$doctype_uppercased"/></xsl:otherwise>
+					</xsl:choose>
 					<xsl:variable name="amendment-number" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:project-number/@amendment"/>
 					<xsl:if test="normalize-space($amendment-number) != ''">
 						<xsl:text> </xsl:text><xsl:value-of select="$amendment-number"/>
 					</xsl:if>
-					<xsl:text>: </xsl:text>
-					<xsl:apply-templates/>
+
+					<xsl:if test="not($stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM')">
+						<xsl:text>: </xsl:text>
+						<xsl:apply-templates/>
+					</xsl:if>
 				</fo:block>
 
 			</fo:block>
@@ -2012,18 +2024,27 @@
 				</fo:table>
 			</fo:block-container>
 		</fo:static-content>
-		<fo:static-content flow-name="header-first">
-			<fo:block-container margin-top="13mm" height="9mm" width="172mm" border-top="0.5mm solid black" border-bottom="0.5mm solid black" display-align="center" background-color="white">
-				<fo:block text-align-last="justify" font-size="12pt" font-weight="bold">
+		<fo:static-content flow-name="header-first" role="artifact">
+			<xsl:choose>
+				<xsl:when test="$stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM'">
+					<fo:block-container height="24mm" display-align="before">
+						<fo:block font-size="12pt" font-weight="bold" text-align="right" padding-top="12.5mm"><xsl:value-of select="$ISOname"/></fo:block>
+					</fo:block-container>
+				</xsl:when>
+				<xsl:otherwise>
+					<fo:block-container margin-top="13mm" height="9mm" width="172mm" border-top="0.5mm solid black" border-bottom="0.5mm solid black" display-align="center" background-color="white">
+						<fo:block text-align-last="justify" font-size="12pt" font-weight="bold">
 
-					<xsl:value-of select="$stagename-header-firstpage"/>
+							<xsl:value-of select="$stagename-header-firstpage"/>
 
-					<fo:inline keep-together.within-line="always">
-						<fo:leader leader-pattern="space"/>
-						<fo:inline><xsl:value-of select="$ISOname"/></fo:inline>
-					</fo:inline>
-				</fo:block>
-			</fo:block-container>
+							<fo:inline keep-together.within-line="always">
+								<fo:leader leader-pattern="space"/>
+								<fo:inline><xsl:value-of select="$ISOname"/></fo:inline>
+							</fo:inline>
+						</fo:block>
+					</fo:block-container>
+				</xsl:otherwise>
+			</xsl:choose>
 		</fo:static-content>
 		<fo:static-content flow-name="header-odd" role="artifact">
 			<fo:block-container height="24mm" display-align="before">
@@ -2130,10 +2151,18 @@
 
 	<xsl:param name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl -->
 
-	<xsl:variable name="isGenerateTableIF_">
+	<xsl:variable name="isApplyAutolayoutAlgorithm_">
+		true
+	</xsl:variable>
+	<xsl:variable name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/>
 
+	<xsl:variable name="isGenerateTableIF_">
+		<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_)"/>
 
@@ -2562,6 +2591,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>
@@ -2778,9 +2810,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>
 
@@ -3749,6 +3779,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>
@@ -3819,6 +3850,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>
@@ -3955,9 +3987,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>
 
 	<!-- ================================================== -->
@@ -4135,6 +4175,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 -->
 
@@ -4146,67 +4187,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 != ''">
@@ -4219,16 +4199,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)"/>
@@ -4238,10 +4215,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>
@@ -4251,19 +4228,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>
@@ -4289,23 +4266,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"/>
 
@@ -4326,50 +4319,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 -->
 	<!-- ================================================== -->
@@ -4614,6 +4563,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>
@@ -4775,7 +4725,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>
@@ -5108,6 +5058,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'])">
@@ -5659,21 +5610,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"/>
 
@@ -6324,6 +6270,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>
@@ -6336,6 +6285,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>
@@ -6465,8 +6417,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']">
@@ -6474,10 +6432,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>
 
@@ -6506,7 +6466,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>
@@ -6515,6 +6475,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 -->
 	<!-- ===================== -->
 	<!-- ===================== -->
@@ -6524,7 +6502,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>
 
@@ -6638,6 +6616,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"/>
@@ -6985,6 +6967,10 @@
 
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
 
+				<xsl:if test="$doctype = 'amendment' and parent::*[local-name() = 'quote']">
+					<xsl:attribute name="font-size">inherit</xsl:attribute>
+				</xsl:if>
+
 			<fo:block-container margin-left="0mm">
 
 						<fo:block>
@@ -7035,6 +7021,10 @@
 	<xsl:template match="*[local-name() = 'termnote']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
 
+				<xsl:if test="$doctype = 'amendment' and parent::*[local-name() = 'quote']">
+					<xsl:attribute name="font-size">inherit</xsl:attribute>
+				</xsl:if>
+
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 
 				<xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
@@ -8525,41 +8515,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  -->
 	<!-- ========== -->
@@ -8615,15 +8611,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>
@@ -8969,6 +8962,11 @@
 			<fo:block-container margin-left="0mm">
 				<fo:block-container xsl:use-attribute-sets="quote-style">
 
+						<xsl:if test="$doctype = 'amendment' and (*[local-name() = 'note'] or *[local-name() = 'termnote'])">
+							<xsl:attribute name="margin-left">7mm</xsl:attribute>
+							<xsl:attribute name="margin-right">0mm</xsl:attribute>
+						</xsl:if>
+
 					<fo:block-container margin-left="0mm" margin-right="0mm">
 						<fo:block role="BlockQuote">
 							<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
@@ -10136,7 +10134,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>