metanorma-iso 2.7.5 → 2.7.6

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

@@ -296,10 +296,12 @@
 	-->
 	<xsl:variable name="contents_">
 		<contents>
-			<xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
-			<xsl:call-template name="processMainSectionsDefault_Contents"/>
-			<xsl:apply-templates select="//iso:indexsect" mode="contents"/>
-			<xsl:call-template name="processTablesFigures_Contents"/>
+			<xsl:if test="$isGenerateTableIF = 'false'">
+				<xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
+				<xsl:call-template name="processMainSectionsDefault_Contents"/>
+				<xsl:apply-templates select="//iso:indexsect" mode="contents"/>
+				<xsl:call-template name="processTablesFigures_Contents"/>
+			</xsl:if>
 		</contents>
 	</xsl:variable>
 	<xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
@@ -426,9 +428,10 @@
 							<xsl:attribute name="font-size">8.5pt</xsl:attribute>
 						 </xsl:if>
 
-						<!-- <xsl:if test="$lang = 'zh'">
-							<xsl:attribute name="font-family">Source Han Sans, Times New Roman, Cambria Math</xsl:attribute>
-						</xsl:if> -->
+						<xsl:if test="$lang = 'zh'">
+							<!-- <xsl:attribute name="font-family">Source Han Sans, Times New Roman, Cambria Math</xsl:attribute> -->
+							<xsl:attribute name="font-selection-strategy">character-by-character</xsl:attribute>
+						</xsl:if>
 					</root-style>
 				</xsl:variable>
 				<xsl:call-template name="insertRootStyle">
@@ -445,8 +448,8 @@
 
 				<fo:layout-master-set>
 
-					<xsl:variable name="marginLeftRight_cover_page_1951">12.5</xsl:variable>
-					<xsl:variable name="marginTop_cover_page_1951">18</xsl:variable>
+					<xsl:variable name="marginLeftRight_cover_page_1951">16.5</xsl:variable> <!-- 12.5 -->
+					<xsl:variable name="marginTop_cover_page_1951">19.5</xsl:variable>
 					<xsl:variable name="marginBottom_cover_page_1951">94.5</xsl:variable>
 
 					<xsl:variable name="marginLeft_cover_page_1972">21</xsl:variable>
@@ -801,18 +804,20 @@
 					<xsl:with-param name="contents" select="$contents"/>
 				</xsl:call-template>
 
+				<xsl:if test="$isGenerateTableIF = 'false'"> <!-- no need cover page for auto-layout algorithm -->
+
 				<!-- cover page -->
 				<xsl:choose>
 					<xsl:when test="$layoutVersion = '1951'">
 						<fo:page-sequence master-reference="cover-page_1951" force-page-count="no-force">
-							<fo:static-content flow-name="cover-page-header" font-weight="bold" font-size="9pt">
+							<fo:static-content flow-name="cover-page-header" font-family="Times New Roman" font-size="8.5pt" font-weight="bold">
 								<fo:block-container height="99%" display-align="after">
 									<fo:block text-align-last="justify" role="SKIP">
 										<!-- Example: UDC 669.7 : 620.178.1 -->
 										<xsl:value-of select="$udc"/>
 										<fo:inline keep-together.within-line="always" role="SKIP">
 											<fo:leader leader-pattern="space"/>
-											<fo:inline font-weight="normal"><xsl:value-of select="concat($i18n_reference_number_abbrev, ': ')"/></fo:inline><xsl:value-of select="$ISOnumber"/>
+											<fo:inline font-weight="normal"><xsl:value-of select="concat($i18n_reference_number_abbrev, ' : ')"/></fo:inline><xsl:value-of select="$ISOnumber"/> <!-- font-family="Arial" -->
 										</fo:inline>
 									</fo:block>
 								</fo:block-container>
@@ -824,40 +829,43 @@
 								</fo:block>
 							</fo:static-content>
 							<fo:flow flow-name="xsl-region-body">
-								<fo:block text-align="center" font-family="Arial" margin-top="18mm">
+								<fo:block text-align="center" font-family="Arial" margin-top="14mm">
 									<fo:block>
 										<fo:instream-foreign-object content-width="23mm" fox:alt-text="Image ISO Logo">
 											<xsl:copy-of select="$Image-ISO-Logo-1951-SVG"/>
 										</fo:instream-foreign-object>
 									</fo:block>
-									<fo:block margin-top="3mm" font-size="8pt" font-weight="bold">
+									<fo:block margin-top="2mm" font-size="8pt" font-weight="bold">
 										<xsl:call-template name="add-letter-spacing">
 											<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new(/iso:iso-standard/iso:bibdata/iso:copyright/iso:owner/iso:organization/iso:name))"/>
-											<xsl:with-param name="letter-spacing" select="0.65"/>
+											<xsl:with-param name="letter-spacing" select="0.55"/>
 										</xsl:call-template>
 									</fo:block>
-									<fo:block-container margin-top="12mm" height="78mm" display-align="center">
-										<fo:block font-size="20pt">
-											<!-- ISO RECOMMENDATION -->
-											<xsl:call-template name="add-letter-spacing">
-												<xsl:with-param name="text" select="$doctype_uppercased"/>
-												<xsl:with-param name="letter-spacing" select="0.65"/>
-											</xsl:call-template>
-										</fo:block>
-										<fo:block font-size="24pt" margin-top="5mm">
-											<xsl:value-of select="$docnumber_with_prefix"/>
-										</fo:block>
 
-										<fo:block font-size="11pt" margin-top="12mm">
+									<fo:block font-size="20pt" margin-top="31mm">
+										<!-- ISO RECOMMENDATION -->
+										<xsl:call-template name="add-letter-spacing">
+											<xsl:with-param name="text" select="$doctype_uppercased"/>
+											<xsl:with-param name="letter-spacing" select="0.35"/>
+										</xsl:call-template>
+									</fo:block>
+									<fo:block font-size="24pt" margin-top="5mm">
+										<xsl:value-of select="$docnumber_with_prefix"/>
+									</fo:block>
+
+									<fo:block-container height="39mm" display-align="center">
+										<fo:block font-size="11pt">
 											<xsl:call-template name="insertTitlesLangMain"/>
 										</fo:block>
-
 									</fo:block-container>
-									<fo:block-container height="40mm" display-align="center" font-size="9pt">
-										<fo:block><xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:edition[@language != '']"/></fo:block>
-										<fo:block> </fo:block>
+
+									<fo:block-container margin-top="8.5mm" font-size="10pt"> <!--  height="40mm" display-align="center"  -->
+										<!-- Example: 1st EDITION -->
+										<!-- <fo:block><xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:edition[@language != '']" /></fo:block> -->
+										<fo:block font-weight="bold"><xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:edition[@language != '']"/></fo:block>
+										<!-- <fo:block>&#xa0;</fo:block> -->
 										<!-- Example: October 1971 -->
-										<fo:block>
+										<fo:block margin-top="2mm" font-size="9pt">
 											<xsl:call-template name="convertDate">
 												<xsl:with-param name="date" select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/>
 											</xsl:call-template>
@@ -2045,12 +2053,16 @@
 					</xsl:otherwise>
 				</xsl:choose>
 
+				</xsl:if> <!-- $isGenerateTableIF = ' false' -->
+
 				<xsl:if test="$debug = 'true'"><xsl:message>START updated_xml_step1</xsl:message></xsl:if>
 				<xsl:variable name="startTime1" select="java:getTime(java:java.util.Date.new())"/>
 
 				<!-- STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
 				<xsl:variable name="updated_xml_step1">
-					<xsl:apply-templates mode="update_xml_step1"/>
+					<xsl:if test="$table_if = 'false'">
+						<xsl:apply-templates mode="update_xml_step1"/>
+					</xsl:if>
 				</xsl:variable>
 
 				<!-- DEBUG -->
@@ -2069,7 +2081,9 @@
 
 				<!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...'  -->
 				<xsl:variable name="updated_xml_step2">
-					<xsl:apply-templates select="xalan:nodeset($updated_xml_step1)" mode="update_xml_step2"/>
+					<xsl:if test="$table_if = 'false'">
+						<xsl:apply-templates select="xalan:nodeset($updated_xml_step1)" mode="update_xml_step2"/>
+					</xsl:if>
 				</xsl:variable>
 
 				<xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
@@ -2083,7 +2097,14 @@
 				<xsl:variable name="startTime3" select="java:getTime(java:java.util.Date.new())"/>
 
 				<xsl:variable name="updated_xml_step3">
-					<xsl:apply-templates select="xalan:nodeset($updated_xml_step2)" mode="update_xml_enclose_keep-together_within-line"/>
+					<xsl:choose>
+						<xsl:when test="$table_if = 'false'">
+							<xsl:apply-templates select="xalan:nodeset($updated_xml_step2)" mode="update_xml_enclose_keep-together_within-line"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:copy-of select="."/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:variable>
 
 				<xsl:variable name="endTime3" select="java:getTime(java:java.util.Date.new())"/>
@@ -2409,9 +2430,17 @@
 							<xsl:if test="$layoutVersion = '1951'">
 								<!-- first page header -->
 								<!-- Example: ISO Recommendation R 453 November 1965 -->
-								<fo:block-container margin-top="-13mm" margin-left="-12mm" margin-right="-12mm">
+								<fo:block-container margin-top="-8mm" margin-left="-12mm" margin-right="-12mm">
+									<xsl:if test="$revision_date_num &gt;= 19690101">
+										<xsl:attribute name="margin-top">-9mm</xsl:attribute>
+										<xsl:attribute name="margin-left">-12.5mm</xsl:attribute>
+										<xsl:attribute name="margin-right">-12.5mm</xsl:attribute>
+									</xsl:if>
 									<fo:block-container margin-left="0" margin-right="0" border-bottom="1.25pt solid black">
 										<fo:table table-layout="fixed" width="100%" font-family="Arial" font-size="13pt">
+											<xsl:if test="$revision_date_num &gt;= 19690101">
+												<xsl:attribute name="font-size">10pt</xsl:attribute>
+											</xsl:if>
 											<fo:table-column column-width="proportional-column-width(9.5)"/>
 											<fo:table-column column-width="proportional-column-width(65)"/>
 											<fo:table-column column-width="proportional-column-width(34)"/>
@@ -2419,6 +2448,9 @@
 											<fo:table-column column-width="proportional-column-width(9.5)"/>
 											<fo:table-body>
 												<fo:table-row height="10mm">
+													<xsl:if test="$revision_date_num &gt;= 19690101">
+														<xsl:attribute name="height">7mm</xsl:attribute>
+													</xsl:if>
 													<fo:table-cell><fo:block> </fo:block></fo:table-cell>
 													<fo:table-cell><fo:block><xsl:value-of select="$doctype_localized"/></fo:block></fo:table-cell>
 													<fo:table-cell text-align="center"><fo:block><xsl:value-of select="$docnumber_with_prefix"/></fo:block></fo:table-cell>
@@ -2513,6 +2545,7 @@
 					<xsl:message>END xalan:nodeset</xsl:message> -->
 
 					<xsl:choose>
+						<xsl:when test="$isGenerateTableIF = 'true'"><!-- skip last page --></xsl:when>
 						<xsl:when test="$layoutVersion = '1951'"/>
 						<xsl:when test="$layoutVersion = '1972'"/>
 						<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'"><!-- UDC, Keywords and Price renders on the first page for technical-report --></xsl:when>
@@ -2762,6 +2795,8 @@
 
 	<xsl:template match="iso:preface/iso:clause[@type = 'toc']" priority="3">
 		<xsl:choose>
+			<xsl:when test="$isGenerateTableIF = 'true'"/>
+			<xsl:when test="$toc_level = 0"/>
 			<xsl:when test="$doctype = 'amendment'"/><!-- ToC shouldn't be generated in amendments. -->
 			<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'"/>
 			<xsl:otherwise>
@@ -3083,6 +3118,10 @@
 				<xsl:attribute name="text-align">center</xsl:attribute>
 				<xsl:attribute name="margin-top">49mm</xsl:attribute>
 				<xsl:attribute name="text-transform">uppercase</xsl:attribute>
+				<xsl:if test="$revision_date_num &gt;= 19690101">
+					<xsl:attribute name="font-family">Arial</xsl:attribute>
+					<xsl:attribute name="font-size">11pt</xsl:attribute>
+				</xsl:if>
 			</xsl:if>
 			<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
 				<xsl:attribute name="font-size">16pt</xsl:attribute>
@@ -3259,7 +3298,7 @@
 			<xsl:when test="$layoutVersion = '1951'">
 				<xsl:choose>
 					<xsl:when test="@id = 'boilerplate-message'">
-						<fo:block-container width="85.5mm" margin-left="50mm" margin-right="50mm">
+						<fo:block-container width="87mm" margin-left="45mm" margin-right="45mm">
 							<fo:block-container margin-left="0" margin-right="0">
 								<fo:block text-align="justify" text-align-last="center">
 								<!-- The copyright of ISO Recommendations and 1SO Standards
@@ -4004,7 +4043,7 @@
 		<fo:static-content flow-name="header-even" role="artifact">
 			<xsl:if test="$layoutVersion = '1951' and $border_around_page = 'true'">
 				<!-- box around page -->
-				<fo:block-container position="absolute" left="16.5mm" top="10mm" height="271.5mm" width="170mm" border="1.25pt solid black" role="SKIP">
+				<fo:block-container position="absolute" left="16.5mm" top="15mm" height="270mm" width="170mm" border="1.25pt solid black" role="SKIP">
 					<fo:block> </fo:block>
 				</fo:block-container>
 			</xsl:if>
@@ -4012,14 +4051,24 @@
 				<xsl:if test="$layoutVersion = '2024'">
 					<xsl:attribute name="height">23mm</xsl:attribute>
 				</xsl:if>
-				<fo:block font-size="{$font-size_header}" font-weight="bold" padding-top="12.5mm" line-height="1.1">
-					<xsl:call-template name="insertLayoutVersionAttributesTop">
-						<xsl:with-param name="odd_or_even">even</xsl:with-param>
-					</xsl:call-template>
-					<xsl:if test="$is_header = 'true'">
-						<xsl:value-of select="$ISOnumber"/>
-					</xsl:if>
-				</fo:block>
+				<xsl:choose>
+					<xsl:when test="$layoutVersion = '1951'">
+						<xsl:call-template name="insertHeader1951">
+							<xsl:with-param name="is_header" select="$is_header"/>
+							<xsl:with-param name="odd_or_even">even</xsl:with-param>
+						</xsl:call-template>
+					</xsl:when>
+					<xsl:otherwise>
+						<fo:block font-size="{$font-size_header}" font-weight="bold" padding-top="12.5mm" line-height="1.1">
+							<xsl:call-template name="insertLayoutVersionAttributesTop">
+								<xsl:with-param name="odd_or_even">even</xsl:with-param>
+							</xsl:call-template>
+							<xsl:if test="$is_header = 'true'">
+								<xsl:value-of select="$ISOnumber"/>
+							</xsl:if>
+						</fo:block>
+					</xsl:otherwise>
+				</xsl:choose>
 			</fo:block-container>
 		</fo:static-content>
 	</xsl:template>
@@ -4106,7 +4155,7 @@
 		<fo:static-content flow-name="header-odd" role="artifact">
 			<xsl:if test="$layoutVersion = '1951' and $border_around_page = 'true'">
 				<!-- box around page -->
-				<fo:block-container position="absolute" left="23.5mm" top="10mm" height="271.5mm" width="170mm" border="1.25pt solid black" role="SKIP">
+				<fo:block-container position="absolute" left="23.5mm" top="15mm" height="270mm" width="170mm" border="1.25pt solid black" role="SKIP">
 					<fo:block> </fo:block>
 				</fo:block-container>
 			</xsl:if>
@@ -4114,18 +4163,66 @@
 				<xsl:if test="$layoutVersion = '2024'">
 					<xsl:attribute name="height">23mm</xsl:attribute>
 				</xsl:if>
-				<fo:block font-size="{$font-size_header}" font-weight="bold" text-align="right" padding-top="12.5mm" line-height="1.1">
-					<xsl:call-template name="insertLayoutVersionAttributesTop">
-						<xsl:with-param name="odd_or_even">odd</xsl:with-param>
-					</xsl:call-template>
-					<xsl:if test="$is_header = 'true'">
-						<xsl:value-of select="$ISOnumber"/>
-					</xsl:if>
-				</fo:block>
+				<xsl:choose>
+					<xsl:when test="$layoutVersion = '1951'">
+						<xsl:call-template name="insertHeader1951">
+							<xsl:with-param name="is_header" select="$is_header"/>
+							<xsl:with-param name="odd_or_even">odd</xsl:with-param>
+						</xsl:call-template>
+					</xsl:when>
+					<xsl:otherwise>
+						<fo:block font-size="{$font-size_header}" font-weight="bold" text-align="right" padding-top="12.5mm" line-height="1.1">
+							<xsl:call-template name="insertLayoutVersionAttributesTop">
+								<xsl:with-param name="odd_or_even">odd</xsl:with-param>
+							</xsl:call-template>
+							<xsl:if test="$is_header = 'true'">
+								<xsl:value-of select="$ISOnumber"/>
+							</xsl:if>
+						</fo:block>
+					</xsl:otherwise>
+				</xsl:choose>
 			</fo:block-container>
 		</fo:static-content>
 	</xsl:template>
 
+	<xsl:template name="insertHeader1951">
+		<xsl:param name="is_header"/>
+		<xsl:param name="odd_or_even"/>
+		<fo:block-container font-size="{$font-size_header}" font-weight="bold" text-align="right" padding-top="12.5mm" line-height="1.1">
+			<xsl:call-template name="insertLayoutVersionAttributesTop">
+				<xsl:with-param name="odd_or_even" select="$odd_or_even"/>
+			</xsl:call-template>
+			<fo:block-container margin-left="0mm" margin-right="0mm">
+				<fo:table table-layout="fixed" width="100%">
+					<fo:table-column column-width="proportional-column-width(1)"/>
+					<fo:table-column column-width="proportional-column-width(1)"/>
+					<fo:table-column column-width="proportional-column-width(1)"/>
+					<fo:table-body>
+						<fo:table-row>
+							<fo:table-cell>
+								<fo:block> </fo:block>
+							</fo:table-cell>
+							<fo:table-cell padding-top="-0.5mm">
+								<fo:block font-size="9.5pt" text-align="center">
+									<xsl:if test="$revision_date_num &gt;= 19690101">
+										<xsl:value-of select="$em_dash"/>  <fo:page-number/>  <xsl:value-of select="$em_dash"/>
+									</xsl:if>
+								</fo:block>
+							</fo:table-cell>
+							<fo:table-cell>
+								<fo:block>
+									<xsl:if test="$is_header = 'true'">
+										<xsl:value-of select="$ISOnumber"/>
+									</xsl:if>
+								</fo:block>
+							</fo:table-cell>
+						</fo:table-row>
+					</fo:table-body>
+				</fo:table>
+			</fo:block-container>
+		</fo:block-container>
+	</xsl:template>
+
 	<xsl:variable name="font-size_footer_copyright">
 		<xsl:choose>
 			<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">8pt</xsl:when>
@@ -4289,8 +4386,8 @@
 		<xsl:attribute name="display-align">after</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
 		<fo:block-container margin-left="-13mm" margin-right="-13mm">
-		<fo:block-container margin-left="0mm" margin-right="0mm">
-				<fo:table table-layout="fixed" width="100%" margin-bottom="8mm">
+			<fo:block-container margin-left="0mm" margin-right="0mm">
+				<fo:table table-layout="fixed" width="100%" margin-bottom="5mm">
 					<fo:table-column column-width="proportional-column-width(35)"/>
 					<fo:table-column column-width="proportional-column-width(100)"/>
 					<fo:table-column column-width="proportional-column-width(35)"/>
@@ -4311,7 +4408,11 @@
 								</fo:block>
 							</fo:table-cell>
 							<fo:table-cell>
-								<fo:block font-size="9.5pt" font-weight="bold"><xsl:value-of select="$em_dash"/>  <fo:page-number/>  <xsl:value-of select="$em_dash"/></fo:block>
+								<fo:block font-size="9.5pt" font-weight="bold">
+									<xsl:if test="$revision_date_num &lt; 19690101">
+										<xsl:value-of select="$em_dash"/>  <fo:page-number/>  <xsl:value-of select="$em_dash"/>
+									</xsl:if>
+								</fo:block>
 							</fo:table-cell>
 							<fo:table-cell>
 								<fo:block font-size="8.5pt" text-align="right" font-weight="bold">
@@ -4346,12 +4447,22 @@
 			<xsl:attribute name="font-family">Arial</xsl:attribute>
 			<xsl:attribute name="font-size">8pt</xsl:attribute>
 			<xsl:attribute name="text-align">right</xsl:attribute>
-			<xsl:attribute name="padding-top">5mm</xsl:attribute>
+			<xsl:attribute name="padding-top">8mm</xsl:attribute>
+			<xsl:if test="$revision_date_num &gt;= 19690101">
+				<xsl:attribute name="padding-top">11mm</xsl:attribute>
+				<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+			</xsl:if>
 			<xsl:if test="$odd_or_even = 'odd'">
 				<xsl:attribute name="margin-right">16.5mm</xsl:attribute>
+				<xsl:if test="$revision_date_num &gt;= 19690101">
+					<xsl:attribute name="margin-left">23.5mm</xsl:attribute>
+				</xsl:if>
 			</xsl:if>
 			<xsl:if test="$odd_or_even = 'even'">
 				<xsl:attribute name="margin-right">23.5mm</xsl:attribute>
+				<xsl:if test="$revision_date_num &gt;= 19690101">
+					<xsl:attribute name="margin-left">16.5mm</xsl:attribute>
+				</xsl:if>
 			</xsl:if>
 		</xsl:if>
 		<xsl:if test="$layoutVersion = '2024'">
@@ -4726,17 +4837,30 @@
 	<xsl:param name="add_math_as_text">true</xsl:param> <!-- add math in text behind svg formula, to copy-paste formula from PDF as text -->
 
 	<xsl:param name="table_if">false</xsl:param> <!-- generate extended table in IF for autolayout-algorithm -->
-	<xsl:param name="table_widths"/> <!-- path to xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
+	<xsl:param name="table_widths"/> <!-- (debug: path to) xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
 	<!-- Example: <tables>
-			<table id="table_if_tab-symdu" page-width="75"> - table id prefixed by 'table_if_' to simple search in IF 
-				<tbody>
-					<tr>
-						<td id="tab-symdu_1_1">
-							<p_len>6</p_len>
-							<p_len>100</p_len>  for 2nd paragraph
-							<word_len>6</word_len>
-							<word_len>20</word_len>
-						...
+		<table page-width="509103" id="table1" width_max="223561" width_min="223560">
+			<column width_max="39354" width_min="39354"/>
+			<column width_max="75394" width_min="75394"/>
+			<column width_max="108813" width_min="108813"/>
+			<tbody>
+				<tr>
+					<td width_max="39354" width_min="39354">
+						<p_len>39354</p_len>
+						<word_len>39354</word_len>
+					</td>
+					
+		OLD:
+			<tables>
+					<table id="table_if_tab-symdu" page-width="75"> - table id prefixed by 'table_if_' to simple search in IF 
+						<tbody>
+							<tr>
+								<td id="tab-symdu_1_1">
+									<p_len>6</p_len>
+									<p_len>100</p_len>  for 2nd paragraph
+									<word_len>6</word_len>
+									<word_len>20</word_len>
+								...
 	-->
 
 	<!-- for command line debug: <xsl:variable name="table_widths_from_if" select="document($table_widths)"/> -->
@@ -4985,6 +5109,9 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="cr">&#13;</xsl:variable>
+	<xsl:variable name="lf">
+</xsl:variable>
 
 	<xsl:template name="getTitle">
 		<xsl:param name="name"/>
@@ -5428,6 +5555,11 @@
 				<!-- for internal table in table cell -->
 				<xsl:attribute name="border"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
 			</xsl:if>
+			<xsl:if test="$layoutVersion = '1951'">
+				<xsl:if test="@unnumbered = 'true' and ancestor::*[local-name() = 'preface']">
+					<xsl:attribute name="border">none</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
 
 		<xsl:call-template name="setBordersTableArray"/>
 
@@ -5575,6 +5707,11 @@
 			<xsl:if test="ancestor::*[local-name() = 'tbody'] and not(../preceding-sibling::*[local-name() = 'tr']) and ancestor::*[local-name() = 'table'][1]/*[local-name() = 'thead']"> <!-- cells in 1st row in the table body, and if thead exists -->
 				<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
 			</xsl:if>
+			<xsl:if test="$layoutVersion = '1951'">
+				<xsl:if test="ancestor::*[local-name() = 'table'][1]/@unnumbered = 'true' and ancestor::*[local-name() = 'preface']">
+					<xsl:attribute name="border">none</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
 			<!-- <xsl:attribute name="page-break-inside">avoid</xsl:attribute> -->
 
 		<xsl:call-template name="setBordersTableArray"/>
@@ -6834,6 +6971,20 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:param name="table_only_with_id"/><!-- Example: table1, for table auto-layout algorithm -->
+
+	<xsl:template match="*[local-name()='table']" priority="2">
+		<xsl:choose>
+			<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
+				<xsl:call-template name="table"/>
+			</xsl:when>
+			<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="table"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='table']" name="table">
 
 		<xsl:variable name="table-preamble">
@@ -6843,9 +6994,11 @@
 		<xsl:variable name="table">
 
 			<xsl:variable name="simple-table">
-				<xsl:call-template name="getSimpleTable">
-					<xsl:with-param name="id" select="@id"/>
-				</xsl:call-template>
+				<xsl:if test="$isGenerateTableIF = 'true' and $isApplyAutolayoutAlgorithm = 'true'">
+					<xsl:call-template name="getSimpleTable">
+						<xsl:with-param name="id" select="@id"/>
+					</xsl:call-template>
+				</xsl:if>
 			</xsl:variable>
 			<!-- <xsl:variable name="simple-table" select="xalan:nodeset($simple-table_)"/> -->
 
@@ -6939,9 +7092,9 @@
 						</xsl:attribute>
 					</xsl:for-each>
 
-					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
+					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'][not(@type = 'units')] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
 					<xsl:if test="$isNoteOrFnExist = 'true'">
-						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
+						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute><!-- set 0pt border, because there is a separete table below for footer -->
 					</xsl:if>
 
 					<xsl:choose>
@@ -7114,9 +7267,28 @@
 
 					</fo:block>
 
+					<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+					<xsl:if test="$continued = 'true'">
+						<fo:block text-align="right">
+							<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
+						</fo:block>
+					</xsl:if>
+					<!-- </xsl:if> -->
+
 		</xsl:if>
 	</xsl:template> <!-- table/name -->
 
+	<!-- workaround solution for https://github.com/metanorma/metanorma-iso/issues/1151#issuecomment-2033087938 -->
+	<xsl:template match="*[local-name()='table']/*[local-name() = 'note'][@type = 'units']/*[local-name() = 'p']/text()" priority="4">
+		<xsl:choose>
+			<xsl:when test="preceding-sibling::*[local-name() = 'br']">
+				<!-- remove CR or LF at start -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'^(&#13;&#10;|&#13;|&#10;)', '')"/>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<!-- SOURCE: ... -->
 	<xsl:template match="*[local-name()='table']/*[local-name() = 'source']" priority="2">
 		<xsl:call-template name="termsource"/>
@@ -7541,7 +7713,7 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
 
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 
@@ -7613,7 +7785,7 @@
 
 										<xsl:apply-templates select="../*[local-name()='p']"/>
 										<xsl:apply-templates select="../*[local-name()='dl']"/>
-										<xsl:apply-templates select="../*[local-name()='note']"/>
+										<xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
 										<xsl:apply-templates select="../*[local-name()='example']"/>
 										<xsl:apply-templates select="../*[local-name()='source']"/>
 
@@ -7623,7 +7795,7 @@
 
 								<!-- horizontal row separator -->
 								<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
-									<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
+									<xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
 										<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
 
 											<xsl:call-template name="setBordersTableArray"/>
@@ -8338,7 +8510,20 @@
 	<!-- Definition List -->
 	<!-- ===================== -->
 
-	<xsl:template match="*[local-name()='dl']">
+	<!-- for table auto-layout algorithm -->
+	<xsl:template match="*[local-name()='dl']" priority="2">
+		<xsl:choose>
+			<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
+				<xsl:call-template name="dl"/>
+			</xsl:when>
+			<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="dl"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template match="*[local-name()='dl']" name="dl">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
@@ -10369,7 +10554,13 @@
 							<xsl:value-of select="$language_current_2"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+							<xsl:variable name="language_current_3" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'])"/>
+							<xsl:choose>
+								<xsl:when test="$language_current_3 != ''">
+									<xsl:value-of select="$language_current_3"/>
+								</xsl:when>
+								<xsl:otherwise>en</xsl:otherwise>
+							</xsl:choose>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:otherwise>
@@ -11283,7 +11474,7 @@
 						</xsl:when>
 						<xsl:otherwise>
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
-								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
+								<xsl:if test="not(@mimetype = 'image/svg+xml') and (../*[local-name() = 'name'] or parent::*[local-name() = 'figure'][@unnumbered = 'true']) and not(ancestor::*[local-name() = 'table'])">
 
 									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
 										<xsl:attribute name="width">
@@ -16442,6 +16633,4 @@
 		</xsl:if>
 	</xsl:template>
 
-	<!-- update -->
-
 </xsl:stylesheet>