metanorma-iso 2.7.4 → 2.7.6

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:java="http://xml.apache.org/xalan/java" xmlns:barcode="http://barcode4j.krysalis.org/ns" exclude-result-prefixes="java" version="1.0">
+<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:java="http://xml.apache.org/xalan/java" xmlns:barcode="http://barcode4j.krysalis.org/ns" xmlns:redirect="http://xml.apache.org/xalan/redirect" exclude-result-prefixes="java" extension-element-prefixes="redirect" version="1.0">
 
 	<xsl:output method="xml" encoding="UTF-8" indent="no"/>
 
@@ -77,6 +77,16 @@
 		</xsl:if>
 	</xsl:variable>
 
+	<xsl:variable name="copyrightTextLastPage2024">
+		<xsl:value-of select="concat('© ', $copyrightAbbr, ' ', $copyrightYear)"/>
+		<xsl:if test="$copyrightAbbrIEEE != ''">
+			<xsl:value-of select="$linebreak"/>
+			<xsl:value-of select="concat('© ', $copyrightAbbrIEEE, ' ', $copyrightYear)"/>
+		</xsl:if>
+		<xsl:value-of select="$linebreak"/>
+		<xsl:value-of select="$i18n_all_rights_reserved"/>
+	</xsl:variable>
+
 	<xsl:variable name="docidentifier_iso_with_lang" select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-with-lang']"/>
 
 	<xsl:variable name="lang-1st-letter_tmp" select="substring-before(substring-after($docidentifier_iso_with_lang, '('), ')')"/>
@@ -100,7 +110,9 @@
 				<xsl:choose>
 					<!-- year separator replace to '-' -->
 					<xsl:when test="$layoutVersion = '1951'">
-						<xsl:value-of select="java:replaceAll(java:java.lang.String.new($iso_reference_tmp),':',' - ')"/>
+						<xsl:variable name="iso_reference_tmp_" select="java:replaceAll(java:java.lang.String.new($iso_reference_tmp),':',' - ')"/>
+						<!-- insert space before ( -->
+						<xsl:value-of select="java:replaceAll(java:java.lang.String.new($iso_reference_tmp_),'\(',' \(')"/>
 					</xsl:when>
 					<xsl:when test="$layoutVersion = '1972'">
 						<xsl:value-of select="java:replaceAll(java:java.lang.String.new($iso_reference_tmp),':','-')"/>
@@ -254,6 +266,10 @@
 
 	<xsl:variable name="proof-text">PROOF/ÉPREUVE</xsl:variable>
 
+	<xsl:variable name="docnumber_with_prefix">
+		<xsl:if test="$doctype = 'recommendation'">R </xsl:if><xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:docnumber"/>
+	</xsl:variable>
+
 	<xsl:variable name="ISO_title_en">INTERNATIONAL ORGANIZATION FOR STANDARDIZATION</xsl:variable>
 	<xsl:variable name="ISO_title_ru">МЕЖДУНАРОДНАЯ ОРГАНИЗАЦИЯ ПО СТАНДАРТИЗАЦИИ</xsl:variable>
 	<xsl:variable name="ISO_title_fr">ORGANISATION INTERNATIONALE DE NORMALISATION</xsl:variable>
@@ -264,6 +280,8 @@
 	<xsl:variable name="i18n_voting_begins_on"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">voting_begins_on</xsl:with-param></xsl:call-template></xsl:variable>
 	<xsl:variable name="i18n_voting_terminates_on"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">voting_terminates_on</xsl:with-param></xsl:call-template></xsl:variable>
 	<xsl:variable name="i18n_price_based_on"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">price_based_on</xsl:with-param></xsl:call-template></xsl:variable>
+	<xsl:variable name="i18n_price"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">price</xsl:with-param></xsl:call-template></xsl:variable>
+	<xsl:variable name="i18n_date_first_printing"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">date_first_printing</xsl:with-param></xsl:call-template></xsl:variable>
 	<xsl:variable name="i18n_corrected_version"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">corrected_version</xsl:with-param></xsl:call-template></xsl:variable>
 	<xsl:variable name="i18n_fast_track_procedure"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">fast-track-procedure</xsl:with-param></xsl:call-template></xsl:variable>
 	<xsl:variable name="i18n_all_rights_reserved"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">all_rights_reserved</xsl:with-param></xsl:call-template></xsl:variable>
@@ -278,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_)"/>
@@ -393,6 +413,11 @@
 
 				<xsl:variable name="root-style">
 					<root-style xsl:use-attribute-sets="root-style">
+
+						<xsl:if test="$layoutVersion = '1951'">
+							<xsl:attribute name="font-size">10pt</xsl:attribute>
+						</xsl:if>
+
 						<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
 							<xsl:attribute name="font-family">Arial, Times New Roman, Cambria Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
 							<xsl:attribute name="font-family-generic">Sans</xsl:attribute>
@@ -403,12 +428,10 @@
 							<xsl:attribute name="font-size">8.5pt</xsl:attribute>
 						 </xsl:if>
 
-						<xsl:if test="$layoutVersion = '2024'">
-							<xsl:attribute name="font-size">10.5pt</xsl:attribute>
+						<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>
-						<!-- <xsl:if test="$lang = 'zh'">
-							<xsl:attribute name="font-family">Source Han Sans, Times New Roman, Cambria Math</xsl:attribute>
-						</xsl:if> -->
 					</root-style>
 				</xsl:variable>
 				<xsl:call-template name="insertRootStyle">
@@ -425,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>
@@ -438,8 +461,8 @@
 					<xsl:variable name="marginRight_cover_page_1987">37</xsl:variable>
 					<xsl:variable name="marginTopBottom_cover_page_1987">20</xsl:variable>
 
-					<xsl:variable name="marginLeftRight_cover_page_2024">14</xsl:variable>
-					<xsl:variable name="marginTopBottom_cover_page_2024">15</xsl:variable>
+					<xsl:variable name="marginLeftRight_cover_page_2024">9.9</xsl:variable>
+					<xsl:variable name="marginTopBottom_cover_page_2024">9.9</xsl:variable>
 
 					<!-- cover page -->
 					<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
@@ -612,11 +635,16 @@
 					<!-- odd pages -->
 					<fo:simple-page-master master-name="odd-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 						<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
-						<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> <!--   display-align="center" -->
+						<fo:region-before region-name="header-odd" extent="{$marginTop}mm">
+							<xsl:if test="$layoutVersion = '1951'">
+								<xsl:attribute name="precedence">true</xsl:attribute>
+							</xsl:if>
+						</fo:region-before>
 						<fo:region-after region-name="footer-odd" extent="{$marginBottom - 2}mm"/>
 						<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
 						<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
 					</fo:simple-page-master>
+
 					<fo:simple-page-master master-name="odd-publishedISO-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 						<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
 						<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> <!--   display-align="center" -->
@@ -627,11 +655,25 @@
 					<!-- even pages -->
 					<fo:simple-page-master master-name="even-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 						<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
-						<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
+						<fo:region-before region-name="header-even" extent="{$marginTop}mm">
+							<xsl:if test="$layoutVersion = '1951'">
+								<xsl:attribute name="precedence">true</xsl:attribute>
+							</xsl:if>
+						</fo:region-before>
 						<fo:region-after region-name="footer-even" extent="{$marginBottom - 2}mm"/>
 						<fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
 						<fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
 					</fo:simple-page-master>
+
+					<!-- for 1951 layout only -->
+					<fo:simple-page-master master-name="even-last-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+						<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
+						<fo:region-before region-name="header-even" extent="{$marginTop}mm" precedence="true"/>
+						<fo:region-after region-name="footer-even-last" extent="{$marginBottom - 2}mm"/>
+						<fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
+						<fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
+					</fo:simple-page-master>
+
 					<fo:simple-page-master master-name="even-publishedISO-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 						<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
 						<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
@@ -672,21 +714,30 @@
 
 					<fo:page-sequence-master master-name="document-publishedISO">
 						<fo:repeatable-page-master-alternatives>
-							<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
+							<xsl:if test="not($layoutVersion = '1951')">
+								<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
+							</xsl:if>
+							<xsl:if test="$layoutVersion = '1951'">
+								<fo:conditional-page-master-reference page-position="last" master-reference="even-last-publishedISO"/> <!-- odd-or-even="even" -->
+							</xsl:if>
 							<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
 							<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
 						</fo:repeatable-page-master-alternatives>
 					</fo:page-sequence-master>
 					<fo:page-sequence-master master-name="document-publishedISO-portrait">
 						<fo:repeatable-page-master-alternatives>
-							<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
+							<xsl:if test="not($layoutVersion = '1951')">
+								<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
+							</xsl:if>
 							<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
 							<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
 						</fo:repeatable-page-master-alternatives>
 					</fo:page-sequence-master>
 					<fo:page-sequence-master master-name="document-publishedISO-landscape">
 						<fo:repeatable-page-master-alternatives>
-							<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
+							<xsl:if test="not($layoutVersion = '1951')">
+								<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
+							</xsl:if>
 							<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO-landscape"/>
 							<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO-landscape"/>
 						</fo:repeatable-page-master-alternatives>
@@ -753,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, ':')"/></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>
@@ -776,41 +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:if test="$doctype = 'recommendation'">R </xsl:if>
-											<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:docnumber"/>
-										</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>
@@ -1025,10 +1080,10 @@
 							<fo:flow flow-name="xsl-region-body">
 								<fo:table table-layout="fixed" width="100%">
 									<xsl:call-template name="insertInterFont"/>
-									<fo:table-column column-width="proportional-column-width(109)"/>
-									<fo:table-column column-width="proportional-column-width(1.9)"/>
-									<fo:table-column column-width="proportional-column-width(1.9)"/>
-									<fo:table-column column-width="proportional-column-width(70)"/>
+									<fo:table-column column-width="proportional-column-width(113.8)"/>
+									<fo:table-column column-width="proportional-column-width(2)"/>
+									<fo:table-column column-width="proportional-column-width(2)"/>
+									<fo:table-column column-width="proportional-column-width(72.2)"/>
 									<fo:table-body>
 
 										<fo:table-row>
@@ -1040,8 +1095,8 @@
 											<!-- International 
 											Standard -->
 											<fo:table-cell number-columns-spanned="2" padding-left="6mm">
-												<fo:block-container height="44mm">
-													<fo:block font-size="19.2pt" font-weight="bold" line-height="1.25">
+												<fo:block-container height="46mm">
+													<fo:block font-size="20pt" font-weight="bold" line-height="1.25" margin-top="3mm">
 
 														<xsl:variable name="updates-document-type" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:updates-document-type"/>
 														<xsl:variable name="updates-document-type_localized">
@@ -1102,13 +1157,13 @@
 											</fo:table-cell>
 										</fo:table-row>
 
-										<fo:table-row height="44mm">
+										<fo:table-row height="46mm">
 											<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}">
 												<fo:block>
 													</fo:block>
 											</fo:table-cell>
 											<fo:table-cell number-columns-spanned="2" display-align="after" padding-left="6mm">
-												<fo:block font-size="18.2pt" font-weight="bold">
+												<fo:block font-size="19pt" font-weight="bold" line-height="1">
 													<xsl:if test="$stage &gt;=60">
 														<xsl:attribute name="color"><xsl:value-of select="$color_red"/></xsl:attribute>
 													</xsl:if>
@@ -1122,16 +1177,16 @@
 											<fo:table-cell number-columns-spanned="2"><fo:block> </fo:block></fo:table-cell>
 											<fo:table-cell border-bottom="{$cover_page_border}"><fo:block> </fo:block></fo:table-cell>
 										</fo:table-row>
-										<fo:table-row height="2mm" font-size="0pt">
+										<fo:table-row height="1.4mm" font-size="0pt">
 											<fo:table-cell number-columns-spanned="4"><fo:block> </fo:block></fo:table-cell>
 										</fo:table-row>
 
 										<fo:table-row>
 											<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}" padding-right="4mm">
 
-												<fo:block-container font-family="Cambria" line-height="1.1" role="SKIP" height="103mm">
+												<fo:block-container font-family="Cambria" line-height="1.1" role="SKIP" height="110mm">
 													<fo:block margin-right="3.5mm" role="SKIP">
-														<fo:block font-size="18pt" font-weight="bold" margin-top="6pt" role="H1">
+														<fo:block font-size="18pt" font-weight="bold" margin-top="2.5mm" role="H1">
 															<xsl:call-template name="insertTitlesLangMain"/>
 														</fo:block>
 
@@ -1158,21 +1213,21 @@
 												</fo:block-container>
 											</fo:table-cell>
 											<fo:table-cell number-columns-spanned="2" padding-left="6mm">
-												<fo:block margin-top="6pt">
+												<fo:block margin-top="2.5mm" line-height="1.1">
 
 													<xsl:if test="not($stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM')">
 														<xsl:variable name="edition_and_date">
 															<xsl:call-template name="insertEditionAndDate"/>
 														</xsl:variable>
 														<xsl:if test="normalize-space($edition_and_date) != ''">
-															<fo:block font-size="17.2pt" font-weight="bold" margin-bottom="3mm">
+															<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
 																<xsl:value-of select="$edition_and_date"/>
 															</fo:block>
 														</xsl:if>
 													</xsl:if>
 
 													<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM')">
-														<fo:block font-size="17.2pt" font-weight="bold" margin-bottom="3mm">
+														<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
 															<xsl:value-of select="$doctype_uppercased"/>
 															<xsl:text> </xsl:text>
 															<xsl:variable name="amendment-number" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:project-number/@amendment"/>
@@ -1184,7 +1239,7 @@
 
 													<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM')">
 														<xsl:if test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'updated']">
-															<fo:block font-size="17.2pt" font-weight="bold" margin-bottom="3mm">
+															<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
 																<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'updated']"/>
 															</fo:block>
 														</xsl:if>
@@ -1192,7 +1247,7 @@
 
 													<xsl:variable name="date_corrected" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:date[@type = 'corrected'])"/>
 													<xsl:if test="$date_corrected != ''">
-														<fo:block font-size="17.2pt" font-weight="bold" margin-bottom="3mm">
+														<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
 															<xsl:value-of select="$i18n_corrected_version"/>
 															<xsl:value-of select="$linebreak"/>
 															<xsl:value-of select="$date_corrected"/>
@@ -1280,7 +1335,7 @@
 																			</fo:block>
 																		</fo:table-cell>
 																		<fo:table-cell padding="4mm">
-																			<fo:block color="black" font-size="7.2pt" line-height="1.35">
+																			<fo:block color="black" font-size="7.5pt" line-height="1.35">
 																				<xsl:text>Please share your feedback about the standard. Scan the QR code with your phone or click the link</xsl:text>
 																				<fo:block margin-top="2pt">
 																					<fo:basic-link external-destination="{$feedback_link}" fox:alt-text="{$feedback_link}">
@@ -1305,17 +1360,17 @@
 											</fo:table-cell>
 										</fo:table-row>
 
-										<fo:table-row height="12mm">
-											<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}" display-align="after" padding-bottom="-1mm">
-												<fo:block font-size="9.6pt">
+										<fo:table-row height="13mm">
+											<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}" display-align="after" padding-bottom="-1mm" line-height="1.1">&gt;
+												<fo:block font-size="10pt">
 													<xsl:value-of select="$i18n_reference_number"/>
 												</fo:block>
-												<fo:block font-size="9.6pt">
+												<fo:block font-size="10pt">
 													<xsl:value-of select="$ISOnumber"/>
 												</fo:block>
 											</fo:table-cell>
 											<fo:table-cell number-columns-spanned="2" padding-left="6mm" display-align="after" padding-bottom="-1mm">
-												<fo:block font-size="9.6pt">
+												<fo:block font-size="10pt" line-height="1.1">
 													<xsl:value-of select="concat('© ', $copyrightAbbr, ' ', $copyrightYear)"/>
 													<xsl:if test="$copyrightAbbrIEEE != ''">
 														<xsl:value-of select="$linebreak"/>
@@ -1998,27 +2053,99 @@
 					</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: updated_xml_step1=<xsl:copy-of select="$updated_xml_step1"/> -->
+
+				<!-- DEBUG -->
+				<!-- <redirect:write file="updated_xml_step1_{java:getTime(java:java.util.Date.new())}.xml">
+					<xsl:copy-of select="$updated_xml_step1"/>
+				</redirect:write> -->
+
+				<xsl:variable name="endTime1" select="java:getTime(java:java.util.Date.new())"/>
+				<xsl:if test="$debug = 'true'">
+				<xsl:message>DEBUG: processing time <xsl:value-of select="$endTime1 - $startTime1"/> msec.</xsl:message>
+				<xsl:message>END updated_xml_step1</xsl:message>
+				</xsl:if>
+
+				<xsl:if test="$debug = 'true'"><xsl:message>START updated_xml_step2</xsl:message></xsl:if>
+				<xsl:variable name="startTime2" select="java:getTime(java:java.util.Date.new())"/>
 
 				<!-- 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())"/>
+				<xsl:if test="$debug = 'true'">
+				<xsl:message>DEBUG: processing time <xsl:value-of select="$endTime2 - $startTime2"/> msec.</xsl:message>
+				<xsl:message>END updated_xml_step2</xsl:message>
+				</xsl:if>
 				<!-- DEBUG: updated_xml_step2=<xsl:copy-of select="$updated_xml_step2"/> -->
 
+				<xsl:if test="$debug = 'true'"><xsl:message>START updated_xml_step3</xsl:message></xsl:if>
+				<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())"/>
+				<xsl:if test="$debug = 'true'">
+				<xsl:message>DEBUG: processing time <xsl:value-of select="$endTime3 - $startTime3"/> msec.</xsl:message>
+				<xsl:message>END updated_xml_step3</xsl:message>
+				</xsl:if>
 				<!-- DEBUG: updated_xml_step3=<xsl:copy-of select="$updated_xml_step3"/> -->
 
 				<xsl:for-each select="xalan:nodeset($updated_xml_step3)">
 
 					<xsl:choose>
-						<xsl:when test="$layoutVersion = '1951'"><!-- To do --></xsl:when>
+						<xsl:when test="$layoutVersion = '1951'">
+							<fo:page-sequence master-reference="document{$document-master-reference}" initial-page-number="auto" force-page-count="no-force">
+								<fo:static-content flow-name="xsl-footnote-separator">
+									<fo:block>
+										<fo:leader leader-pattern="rule" leader-length="30%"/>
+									</fo:block>
+								</fo:static-content>
+								<xsl:call-template name="insertHeaderFooter">
+									<xsl:with-param name="is_header">false</xsl:with-param>
+									<xsl:with-param name="insert_footer_last">false</xsl:with-param>
+								</xsl:call-template>
+								<fo:flow flow-name="xsl-region-body">
+									<fo:block>
+										<!-- <xsl:call-template name="processPrefaceSectionsDefault"/> -->
+										<!-- Introduction will be showed in the main section -->
+										<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or local-name() = 'introduction')]">
+											<xsl:sort select="@displayorder" data-type="number"/>
+											<xsl:apply-templates select="."/>
+										</xsl:for-each>
+
+										<fo:block span="all" text-align="center" margin-top="15mm" keep-with-next="always" role="SKIP">
+											<fo:leader leader-pattern="rule" leader-length="22mm"/>
+										</fo:block>
+
+									</fo:block>
+								</fo:flow>
+							</fo:page-sequence>
+						</xsl:when><!-- END: preface sections (Foreword, Brief history for layout 1951 ($layoutVersion = '1951') -->
+
 						<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'">
 							<fo:page-sequence master-reference="preface-1987_TR" format="i" force-page-count="no-force">
 
@@ -2136,6 +2263,13 @@
 								<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num &lt;= 19981231)">
 									<xsl:attribute name="master-reference">preface-1972-1998</xsl:attribute>
 								</xsl:if>
+								<xsl:if test="$layoutVersion = '2024'">
+									<fo:static-content flow-name="xsl-footnote-separator">
+										<fo:block margin-bottom="6pt">
+											<fo:leader leader-pattern="rule" leader-length="51mm" rule-thickness="0.5pt"/>
+										</fo:block>
+									</fo:static-content>
+								</xsl:if>
 								<xsl:call-template name="insertHeaderFooter">
 									<xsl:with-param name="font-weight">normal</xsl:with-param>
 									<xsl:with-param name="is_footer">true</xsl:with-param>
@@ -2197,9 +2331,12 @@
 											<xsl:if test="/iso:iso-standard/iso:boilerplate/iso:copyright-statement">
 
 												<fo:block-container height="252mm" display-align="after" role="SKIP">
-													<xsl:if test="$layoutVersion = '1989' or $layoutVersion = '2024'">
+													<xsl:if test="$layoutVersion = '1989'">
 														<xsl:attribute name="height">241.5mm</xsl:attribute>
 													</xsl:if>
+													<xsl:if test="$layoutVersion = '2024'">
+														<xsl:attribute name="width">172mm</xsl:attribute>
+													</xsl:if>
 													<!-- <fo:block margin-bottom="3mm">
 														<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>								
 														<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold"></fo:inline>
@@ -2209,9 +2346,9 @@
 															<xsl:if test="$layoutVersion = '1989'">
 																<xsl:attribute name="font-size">8pt</xsl:attribute>
 															</xsl:if>
-															<xsl:if test="$layoutVersion = '2024'">
+															<!-- <xsl:if test="$layoutVersion = '2024'">
 																<xsl:attribute name="font-size">8.6pt</xsl:attribute>
-															</xsl:if>
+															</xsl:if> -->
 															<xsl:apply-templates select="/iso:iso-standard/iso:boilerplate/iso:copyright-statement"/>
 														</fo:block>
 													</fo:block>
@@ -2234,12 +2371,28 @@
 
 					<!-- BODY -->
 					<fo:page-sequence master-reference="document{$document-master-reference}" initial-page-number="1" force-page-count="no-force">
+						<xsl:if test="$layoutVersion = '1951'">
+							<xsl:attribute name="initial-page-number">auto</xsl:attribute>
+							<xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
+						</xsl:if>
 						<fo:static-content flow-name="xsl-footnote-separator">
 							<fo:block>
-								<fo:leader leader-pattern="rule" leader-length="30%"/>
+								<xsl:if test="$layoutVersion = '2024'">
+									<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+								</xsl:if>
+								<fo:leader leader-pattern="rule" leader-length="30%">
+									<xsl:if test="$layoutVersion = '2024'">
+										<xsl:attribute name="leader-length">51mm</xsl:attribute>
+										<xsl:attribute name="rule-thickness">0.5pt</xsl:attribute>
+									</xsl:if>
+								</fo:leader>
 							</fo:block>
 						</fo:static-content>
-						<xsl:call-template name="insertHeaderFooter"/>
+
+						<xsl:variable name="border_around_page"><xsl:if test="$layoutVersion = '1951'">true</xsl:if></xsl:variable>
+						<xsl:call-template name="insertHeaderFooter">
+							<xsl:with-param name="border_around_page" select="$border_around_page"/>
+						</xsl:call-template>
 						<fo:flow flow-name="xsl-region-body">
 
 							<!-- Information and documentation — Codes for transcription systems -->
@@ -2274,8 +2427,53 @@
 							<!-- Clause(s) -->
 							<!-- <fo:block> -->
 
+							<xsl:if test="$layoutVersion = '1951'">
+								<!-- first page header -->
+								<!-- Example: ISO Recommendation R 453 November 1965 -->
+								<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)"/>
+											<fo:table-column column-width="proportional-column-width(50)"/>
+											<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>
+													<fo:table-cell text-align="right">
+														<fo:block>
+															<xsl:call-template name="convertDate">
+																<xsl:with-param name="date" select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/>
+															</xsl:call-template>
+														</fo:block>
+													</fo:table-cell>
+													<fo:table-cell><fo:block> </fo:block></fo:table-cell>
+												</fo:table-row>
+											</fo:table-body>
+										</fo:table>
+									</fo:block-container>
+								</fo:block-container>
+
+								<!-- Show Introduction in the main section -->
+								<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() = 'introduction']"/>
+							</xsl:if> <!-- $layoutVersion = '1951' -->
+
 								<xsl:choose>
-									<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1">
+									<xsl:when test="($layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1">
 										<xsl:choose>
 											<xsl:when test="$doctype = 'amendment'">
 												<xsl:variable name="flatxml">
@@ -2301,17 +2499,23 @@
 								</xsl:choose>
 
 								<xsl:if test="($layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989')">
-									<fo:block span="all" text-align="center" margin-top="15mm" keep-with-next="always" role="SKIP">
+									<fo:block text-align="center" margin-top="12mm" keep-with-previous="always" role="SKIP">
+										<xsl:if test="$layout_columns != 1">
+											<xsl:attribute name="span">all</xsl:attribute>
+										</xsl:if>
 										<fo:leader leader-pattern="rule" leader-length="20%"/>
 									</fo:block>
 								</xsl:if>
 
-								<fo:block id="lastBlock" font-size="1pt" role="SKIP"> </fo:block>
+								<fo:block id="lastBlock" font-size="1pt" keep-with-previous="always" role="SKIP"> </fo:block>
 							<!-- </fo:block> -->
 
 						</fo:flow>
 					</fo:page-sequence>
 
+					<!-- Index -->
+					<!-- <xsl:message>START current_document_index_id</xsl:message> -->
+
 					<xsl:variable name="docid">
 						<xsl:call-template name="getDocumentId"/>
 					</xsl:variable>
@@ -2321,14 +2525,28 @@
 							<xsl:with-param name="docid" select="$docid"/>
 						</xsl:apply-templates>
 					</xsl:variable>
+					<!-- <xsl:message>END current_document_index_id</xsl:message> -->
 
+					<!-- <xsl:message>START current_document_index</xsl:message> -->
+					<xsl:variable name="startTime1" select="java:getTime(java:java.util.Date.new())"/>
 					<xsl:variable name="current_document_index">
 						<xsl:apply-templates select="xalan:nodeset($current_document_index_id)" mode="index_update"/>
 					</xsl:variable>
+					<!-- <xsl:variable name="endTime1" select="java:getTime(java:java.util.Date.new())"/>
+					<xsl:message>DEBUG: processing time <xsl:value-of select="$endTime1 - $startTime1"/> msec.</xsl:message>
+					<xsl:message>END current_document_index</xsl:message> -->
 
+					<!-- <xsl:variable name="startTime2" select="java:getTime(java:java.util.Date.new())"/>
+					<xsl:message>START xalan:nodeset</xsl:message> -->
+					<!-- <xsl:apply-templates select="//iso:indexsect" mode="index"/> -->
 					<xsl:apply-templates select="xalan:nodeset($current_document_index)" mode="index"/>
+					<!-- <xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
+					<xsl:message>DEBUG: processing time <xsl:value-of select="$endTime2 - $startTime2"/> msec.</xsl:message>
+					<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>
 						<xsl:when test="$layoutVersion = '2024'">
@@ -2349,8 +2567,41 @@
 
 	</xsl:template>
 
+	<xsl:template match="iso:preface/iso:introduction" mode="update_xml_step1" priority="3">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:choose>
+			<xsl:when test="$layoutVersion = '1951'">
+				<xsl:if test="$process = 'true'">
+					<xsl:copy>
+						<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+						<xsl:attribute name="displayorder">
+							<xsl:value-of select="concat(../../iso:sections/iso:p[@class = 'zzSTDTitle1']/@displayorder, '.1')"/>
+						</xsl:attribute>
+						<xsl:apply-templates select="node()" mode="update_xml_step1"/>
+					</xsl:copy>
+				</xsl:if>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy>
+					<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
+				</xsl:copy>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']" mode="update_xml_step1" priority="3">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
+		</xsl:copy>
+		<xsl:if test="$layoutVersion = '1951'">
+			<xsl:apply-templates select="../../iso:preface/iso:introduction" mode="update_xml_step1">
+				<xsl:with-param name="process">true</xsl:with-param>
+			</xsl:apply-templates>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="insertLogoImages2024">
-		<xsl:variable name="content-height">19.4</xsl:variable>
+		<xsl:variable name="content-height">20</xsl:variable>
 		<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:copyright/iso:owner/iso:organization">
 			<xsl:choose>
 				<xsl:when test="iso:abbreviation = 'ISO'">
@@ -2508,7 +2759,7 @@
 				<fo:block-container margin-left="1mm" role="SKIP"> <!-- margin-bottom="7mm" margin-top="-15mm" -->
 					<fo:block font-size="9pt" border="0.5pt solid black" fox:border-radius="5pt" padding-left="2mm" padding-top="2mm" padding-bottom="2mm">
 						<xsl:if test="$layoutVersion = '2024'">
-							<xsl:attribute name="font-size">9pt</xsl:attribute>
+							<!-- <xsl:attribute name="font-size">9pt</xsl:attribute> -->
 							<xsl:attribute name="fox:border-radius">0pt</xsl:attribute>
 							<xsl:attribute name="border">1pt solid black</xsl:attribute>
 						</xsl:if>
@@ -2544,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>
@@ -2674,12 +2927,12 @@
 	<xsl:template match="iso:preface/iso:clause[@type = 'toc']/iso:title" priority="3">
 		<fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
 			<xsl:if test="$layoutVersion = '2024'">
-				<xsl:attribute name="font-size">15.3pt</xsl:attribute>
+				<xsl:attribute name="margin-top">0</xsl:attribute>
 			</xsl:if>
 			<fo:inline font-size="16pt" font-weight="bold" role="SKIP">
-				<xsl:if test="$layoutVersion = '2024'">
+				<!-- <xsl:if test="$layoutVersion = '2024'">
 					<xsl:attribute name="font-size">15.3pt</xsl:attribute>
-				</xsl:if>
+				</xsl:if> -->
 				<!-- Contents -->
 				<!-- <xsl:call-template name="getLocalizedString">
 					<xsl:with-param name="key">table_of_contents</xsl:with-param>
@@ -2689,9 +2942,9 @@
 			<fo:inline keep-together.within-line="always" role="SKIP">
 				<fo:leader leader-pattern="space"/>
 				<fo:inline font-weight="normal" font-size="10pt" role="SKIP">
-					<xsl:if test="$layoutVersion = '2024'">
+					<!-- <xsl:if test="$layoutVersion = '2024'">
 						<xsl:attribute name="font-size">9.6pt</xsl:attribute>
-					</xsl:if>
+					</xsl:if> -->
 					<!-- Page -->
 					<xsl:value-of select="$i18n_locality_page"/>
 				</fo:inline>
@@ -2860,13 +3113,23 @@
 	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']" priority="4">
 		<xsl:if test="not($layoutVersion = '1987' and $doctype = 'technical-report')">
 		<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
+			<xsl:if test="$layoutVersion = '1951'">
+				<xsl:attribute name="font-size">13pt</xsl:attribute>
+				<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>
 				<xsl:attribute name="span">all</xsl:attribute>
 				<xsl:attribute name="margin-bottom">40pt</xsl:attribute>
 			</xsl:if>
 			<xsl:if test="$layoutVersion = '2024'">
-				<xsl:attribute name="font-size">17.2pt</xsl:attribute>
+				<xsl:attribute name="margin-top">50pt</xsl:attribute>
 			</xsl:if>
 			<xsl:if test="following-sibling::*[1][self::iso:p][starts-with(@class, 'zzSTDTitle')]">
 				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
@@ -2899,9 +3162,9 @@
 				<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
 				<xsl:attribute name="font-size">16pt</xsl:attribute>
 			</xsl:if>
-				<xsl:if test="$layoutVersion = '2024'">
+				<!-- <xsl:if test="$layoutVersion = '2024'">
 					<xsl:attribute name="font-size">17.2pt</xsl:attribute>
-				</xsl:if>
+				</xsl:if> -->
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -3006,12 +3269,15 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:block margin-left="0.5mm" margin-bottom="3mm" role="H1">
+					<xsl:if test="$layoutVersion = '2024'">
+							<xsl:attribute name="margin-bottom">3.5mm</xsl:attribute>
+						</xsl:if>
 					<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}">
-						<xsl:if test="$layoutVersion = '2024'">
+						<!-- <xsl:if test="$layoutVersion = '2024'">
 							<xsl:attribute name="width">13mm</xsl:attribute>
 							<xsl:attribute name="content-height">11.5mm</xsl:attribute>
 							<xsl:attribute name="margin-bottom">-1mm</xsl:attribute>
-						</xsl:if>
+						</xsl:if> -->
 					</fo:external-graphic>
 					<!-- <fo:inline padding-left="6mm" font-size="12pt" font-weight="bold">COPYRIGHT PROTECTED DOCUMENT</fo:inline> -->
 					<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold" role="SKIP">
@@ -3019,7 +3285,7 @@
 							<xsl:attribute name="font-size">11pt</xsl:attribute>
 						</xsl:if>
 						<xsl:if test="$layoutVersion = '2024'">
-							<xsl:attribute name="font-size">11.5pt</xsl:attribute>
+							<xsl:attribute name="baseline-shift">5%</xsl:attribute>
 						</xsl:if>
 					<xsl:apply-templates/></fo:inline>
 				</fo:block>
@@ -3032,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
@@ -3094,7 +3360,8 @@
 			<xsl:otherwise>
 				<fo:block font-size="16pt" text-align="center" margin-bottom="48pt" keep-with-next="always" role="H1">
 					<xsl:if test="$layoutVersion = '2024'">
-						<xsl:attribute name="font-size">15.3pt</xsl:attribute>
+						<xsl:attribute name="line-height">1.1</xsl:attribute>
+						<!-- <xsl:attribute name="margin-bottom">52pt</xsl:attribute> -->
 					</xsl:if>
 					<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
 						<xsl:attribute name="span">all</xsl:attribute>
@@ -3119,7 +3386,8 @@
 						<xsl:attribute name="span">all</xsl:attribute>
 					</xsl:if>
 					<xsl:if test="$layoutVersion = '2024'">
-						<xsl:attribute name="font-size">15.3pt</xsl:attribute>
+						<xsl:attribute name="margin-top">0pt</xsl:attribute>
+						<xsl:attribute name="margin-bottom">30pt</xsl:attribute>
 					</xsl:if>
 					<xsl:apply-templates/>
 				</fo:block>
@@ -3135,6 +3403,15 @@
 
 		<xsl:variable name="font-size">
 			<xsl:choose>
+				<xsl:when test="$layoutVersion = '1951'">
+					<xsl:choose>
+						<xsl:when test="$level = 1 and ancestor::iso:preface">13pt</xsl:when>
+						<xsl:when test="$level = 1">9pt</xsl:when>
+						<xsl:otherwise>inherit</xsl:otherwise>
+						<!-- <xsl:when test="$level = 2">10pt</xsl:when>
+						<xsl:when test="$level &gt;= 3">9pt</xsl:when> -->
+					</xsl:choose>
+				</xsl:when>
 				<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'">
 					<xsl:choose>
 						<xsl:when test="$level = 1">11pt</xsl:when>
@@ -3153,7 +3430,7 @@
 						<xsl:otherwise>12pt</xsl:otherwise>
 					</xsl:choose>
 				</xsl:when>
-				<xsl:when test="$layoutVersion = '2024'">
+				<!-- <xsl:when test="$layoutVersion = '2024'">
 					<xsl:choose>
 						<xsl:when test="ancestor::iso:annex and $level = 2">12.5pt</xsl:when>
 						<xsl:when test="ancestor::iso:annex and $level = 3">11.5pt</xsl:when>
@@ -3163,7 +3440,7 @@
 						<xsl:when test="$level &gt;= 3">10.5pt</xsl:when>
 						<xsl:otherwise>12.5pt</xsl:otherwise>
 					</xsl:choose>
-				</xsl:when>
+				</xsl:when> -->
 				<xsl:otherwise>
 					<xsl:choose>
 						<xsl:when test="ancestor::iso:annex and $level = 2">13pt</xsl:when>
@@ -3190,9 +3467,9 @@
 			<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report' and parent::iso:foreword"><!-- skip Foreword title --></xsl:when>
 			<xsl:when test="$doctype = 'amendment' and not(ancestor::iso:preface)">
 				<fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always" role="H{$level}">
-					<xsl:if test="$layoutVersion = '2024'">
+					<!-- <xsl:if test="$layoutVersion = '2024'">
 						<xsl:attribute name="font-size">10.5pt</xsl:attribute>
-					</xsl:if>
+					</xsl:if> -->
 					<xsl:apply-templates/>
 					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 				</fo:block>
@@ -3223,13 +3500,16 @@
 					</xsl:variable>
 					<xsl:attribute name="{$attribute-name-before}"> <!-- space-before or margin-top -->
 						<xsl:choose>
+							<xsl:when test="$layoutVersion = '1951' and ancestor::iso:preface and $level = 1">20mm</xsl:when>
 							<xsl:when test="ancestor::iso:introduction and $level &gt;= 2 and ../preceding-sibling::iso:clause">30pt</xsl:when>
 							<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report' and ancestor::iso:preface and $level = 1">10mm</xsl:when>
 							<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num &lt;= 19981231)) and ancestor::iso:preface and $level = 1">62mm</xsl:when>
 							<xsl:when test="$layoutVersion = '1989' and ancestor::iso:preface and $level = 1">56pt</xsl:when>
+							<xsl:when test="$layoutVersion = '2024' and ancestor::iso:preface and $level = 1">0pt</xsl:when>
 							<xsl:when test="ancestor::iso:preface">8pt</xsl:when>
 							<xsl:when test="$level = 2 and ancestor::iso:annex">18pt</xsl:when>
 							<xsl:when test="$level = 1">18pt</xsl:when>
+							<xsl:when test="($level = 2 or $level = 3) and not(../preceding-sibling::iso:clause) and $layoutVersion = '2024'">12pt</xsl:when> <!-- first title in 3rd level clause -->
 							<xsl:when test="($level = 2 or $level = 3) and not(../preceding-sibling::iso:clause)">14pt</xsl:when> <!-- first title in 3rd level clause -->
 							<xsl:when test="$level = 3">14pt</xsl:when>
 							<xsl:when test="$level &gt; 3">3pt</xsl:when>
@@ -3239,9 +3519,12 @@
 					</xsl:attribute>
 					<xsl:attribute name="space-after"> <!-- margin-bottom -->
 						<xsl:choose>
+							<xsl:when test="$layoutVersion = '1951' and $level = 1 and ancestor::iso:preface">14.7mm</xsl:when>
+							<xsl:when test="$layoutVersion = '1951' and $level = 1">12pt</xsl:when>
 							<xsl:when test="ancestor::iso:introduction and $level &gt;= 2">8pt</xsl:when>
 							<xsl:when test="ancestor::iso:preface">18pt</xsl:when>
 							<xsl:when test="$level = 3">9pt</xsl:when>
+							<!-- <xsl:when test="$level = 2 and ancestor::iso:annex and $layoutVersion = '2024'">2pt</xsl:when> -->
 							<!-- <xsl:otherwise>12pt</xsl:otherwise> -->
 							<xsl:otherwise>8pt</xsl:otherwise>
 						</xsl:choose>
@@ -3251,6 +3534,15 @@
 					<xsl:if test="@type = 'floating-title' or @type = 'section-title'">
 						<xsl:copy-of select="@id"/>
 					</xsl:if>
+					<xsl:if test="$layoutVersion = '1951'">
+						<xsl:if test="$element-name = 'fo:block' and ($level  = 1 or parent::iso:introduction)">
+							<xsl:attribute name="text-align">center</xsl:attribute>
+							<xsl:attribute name="text-transform">uppercase</xsl:attribute>
+							<xsl:if test="ancestor::iso:preface or ancestor::iso:introduction">
+								<xsl:attribute name="font-weight">normal</xsl:attribute>
+							</xsl:if>
+						</xsl:if>
+					</xsl:if>
 					<xsl:if test="$element-name = 'fo:inline'">
 						<xsl:choose>
 							<xsl:when test="$lang = 'zh'">
@@ -3261,7 +3553,17 @@
 							</xsl:otherwise>
 						</xsl:choose>
 					</xsl:if>
-					<xsl:apply-templates/>
+					<xsl:choose>
+						<xsl:when test="$layoutVersion = '1951' and ((ancestor::iso:preface and $level  = 1) or parent::iso:introduction)">
+							<xsl:call-template name="add-letter-spacing">
+								<xsl:with-param name="text" select="."/>
+								<xsl:with-param name="letter-spacing" select="0.65"/>
+							</xsl:call-template>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates/>
+						</xsl:otherwise>
+					</xsl:choose>
 					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 				</xsl:element>
 
@@ -3277,7 +3579,7 @@
 
 	<xsl:template match="iso:title[@inline-header = 'true'][following-sibling::*[1][local-name() = 'p']]" priority="3">
 		<xsl:choose>
-			<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1"/> <!-- don't show 'title' with inline-header='true' if next element is 'p' -->
+			<xsl:when test="($layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1"/> <!-- don't show 'title' with inline-header='true' if next element is 'p' -->
 			<xsl:otherwise>
 				<xsl:call-template name="title"/>
 			</xsl:otherwise>
@@ -3289,9 +3591,9 @@
 			<xsl:call-template name="getId"/>
 		</xsl:variable> id="{$id}"  -->
 		<fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always">
-			<xsl:if test="$layoutVersion = '2024'">
+			<!-- <xsl:if test="$layoutVersion = '2024'">
 				<xsl:attribute name="font-size">10.5pt</xsl:attribute>
-			</xsl:if>
+			</xsl:if> -->
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -3387,8 +3689,25 @@
 			</xsl:apply-templates> -->
 			<!-- <xsl:apply-templates select="node()[not(self::iso:note[not(following-sibling::*) or count(following-sibling::*) = count(../iso:note) - 1])]"> -->
 
+			<xsl:if test="$layoutVersion = '1951'">
+				<xsl:if test="not(ancestor::*[local-name() = 'li' or local-name() = 'td' or local-name() = 'th' or local-name() = 'dd'])">
+					<!-- for paragraphs in the main text -->
+					<xsl:attribute name="margin-bottom">14pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="ancestor::iso:preface and parent::iso:clause">
+					<xsl:attribute name="text-indent">7.1mm</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
+
+			<xsl:if test="$layoutVersion = '2024'">
+				<xsl:attribute name="line-height">1.13</xsl:attribute>
+				<xsl:if test="parent::iso:li/following-sibling::* or parent::iso:dd">
+					<xsl:attribute name="margin-bottom">9pt</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
+
 			<!-- put inline title in the first paragraph -->
-			<xsl:if test="($layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1">
+			<xsl:if test="($layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1">
 				<xsl:if test="preceding-sibling::*[1]/@inline-header = 'true' and preceding-sibling::*[1][self::iso:title]">
 					<xsl:attribute name="space-before">0pt</xsl:attribute>
 					<xsl:for-each select="preceding-sibling::*[1]">
@@ -3510,6 +3829,10 @@
 		<xsl:call-template name="insert_basic_link">
 			<xsl:with-param name="element">
 				<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
+					<xsl:if test="$layoutVersion = '2024' and (ancestor::iso:termsource or $bibitems/*[local-name() ='bibitem'][@id = current()/@target and @type = 'standard'])">
+						<xsl:attribute name="color">inherit</xsl:attribute>
+						<xsl:attribute name="text-decoration">none</xsl:attribute>
+					</xsl:if>
 					<xsl:choose>
 						<xsl:when test="@pagenumber='true'">
 							<fo:inline>
@@ -3519,6 +3842,20 @@
 								<fo:page-number-citation ref-id="{@target}"/>
 							</fo:inline>
 						</xsl:when>
+						<xsl:when test="$layoutVersion = '2024' and $bibitems/*[local-name() ='bibitem'][@id = current()/@target and not(@type = 'standard')]"> <!-- if reference to bibitem -->
+							<!-- <fo:inline baseline-shift="30%" font-size="80%"> -->
+								<xsl:choose>
+									<xsl:when test="contains(., '[') and contains(., ']')">
+										<fo:inline color="black" text-decoration="none">[</fo:inline>
+										<xsl:value-of select="translate(.,'[]','')"/>
+										<fo:inline color="black" text-decoration="none">]</fo:inline>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:apply-templates/>
+									</xsl:otherwise>
+								</xsl:choose>
+							<!-- </fo:inline> -->
+						</xsl:when>
 						<xsl:otherwise>
 							<xsl:apply-templates/>
 						</xsl:otherwise>
@@ -3528,6 +3865,20 @@
 		</xsl:call-template>
 	</xsl:template>
 
+	<xsl:template match="*[local-name()='sup'][*[local-name()='xref'][@type = 'footnote']]" priority="2">
+		<fo:inline font-size="80%">
+			<xsl:choose>
+				<xsl:when test="$layoutVersion = '2024'">
+					<xsl:attribute name="baseline-shift">20%</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:attribute name="vertical-align">super</xsl:attribute>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
 	<!-- =================== -->
 	<!-- End of Index processing -->
 	<!-- =================== -->
@@ -3650,19 +4001,32 @@
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="font-weight" select="'bold'"/>
 		<xsl:param name="is_footer">false</xsl:param>
+		<xsl:param name="is_header">true</xsl:param>
+		<xsl:param name="border_around_page">false</xsl:param>
+		<xsl:param name="insert_footer_last">true</xsl:param>
 		<xsl:if test="($layoutVersion = '1972' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num &lt;= 19981231)) and $is_footer = 'true'">
 			<xsl:call-template name="insertFooterFirst1972_1998">
 				<xsl:with-param name="font-weight" select="$font-weight"/>
 			</xsl:call-template>
 		</xsl:if>
-		<xsl:call-template name="insertHeaderEven"/>
+		<xsl:call-template name="insertHeaderEven">
+			<xsl:with-param name="border_around_page" select="$border_around_page"/>
+			<xsl:with-param name="is_header" select="$is_header"/>
+		</xsl:call-template>
 		<xsl:call-template name="insertFooterEven">
 			<xsl:with-param name="font-weight" select="$font-weight"/>
+			<xsl:with-param name="insert_footer_last" select="$insert_footer_last"/>
+		</xsl:call-template>
+		<xsl:choose>
+			<xsl:when test="$layoutVersion = '1951'"/>
+			<xsl:when test="not($layoutVersion = '1987' and $doctype = 'technical-report')">
+				<xsl:call-template name="insertHeaderFirst"/>
+			</xsl:when>
+		</xsl:choose>
+		<xsl:call-template name="insertHeaderOdd">
+			<xsl:with-param name="border_around_page" select="$border_around_page"/>
+			<xsl:with-param name="is_header" select="$is_header"/>
 		</xsl:call-template>
-		<xsl:if test="not($layoutVersion = '1987' and $doctype = 'technical-report')">
-			<xsl:call-template name="insertHeaderFirst"/>
-		</xsl:if>
-		<xsl:call-template name="insertHeaderOdd"/>
 		<xsl:call-template name="insertFooterOdd">
 			<xsl:with-param name="font-weight" select="$font-weight"/>
 		</xsl:call-template>
@@ -3674,12 +4038,37 @@
 		</xsl:choose>
 	</xsl:variable>
 	<xsl:template name="insertHeaderEven">
+		<xsl:param name="is_header">true</xsl:param>
+		<xsl:param name="border_around_page">false</xsl:param>
 		<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="15mm" height="270mm" width="170mm" border="1.25pt solid black" role="SKIP">
+					<fo:block> </fo:block>
+				</fo:block-container>
+			</xsl:if>
 			<fo:block-container height="24mm" display-align="before">
-				<fo:block font-size="{$font-size_header}" font-weight="bold" padding-top="12.5mm" line-height="1.1">
-					<xsl:call-template name="insertLayoutVersion2024AttributesTop"/>
-					<xsl:value-of select="$ISOnumber"/>
-				</fo:block>
+				<xsl:if test="$layoutVersion = '2024'">
+					<xsl:attribute name="height">23mm</xsl:attribute>
+				</xsl:if>
+				<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>
@@ -3689,7 +4078,7 @@
 				<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="{$font-size_header}" font-weight="bold" text-align="right" padding-top="12.5mm" line-height="1.1">
-							<xsl:call-template name="insertLayoutVersion2024AttributesTop"/>
+							<xsl:call-template name="insertLayoutVersionAttributesTop"/>
 							<xsl:value-of select="$ISOnumber"/>
 						</fo:block>
 					</fo:block-container>
@@ -3701,6 +4090,7 @@
 							<xsl:attribute name="border-bottom">0.5mm solid black</xsl:attribute>
 						</xsl:if>
 						<xsl:if test=" $layoutVersion = '2024'">
+							<xsl:attribute name="width">180mm</xsl:attribute>
 							<xsl:attribute name="border-top">0.8mm solid black</xsl:attribute>
 							<xsl:attribute name="border-bottom">0.8mm solid black</xsl:attribute>
 						</xsl:if>
@@ -3726,6 +4116,9 @@
 							<fo:table-column column-width="50%"/>
 							<fo:table-body>
 								<fo:table-row display-align="center" height="9mm">
+									<xsl:if test="$layoutVersion = '2024'">
+										<xsl:attribute name="height">8.5mm</xsl:attribute>
+									</xsl:if>
 									<fo:table-cell>
 										<fo:block>
 											<xsl:choose>
@@ -3757,16 +4150,79 @@
 		</fo:static-content>
 	</xsl:template>
 	<xsl:template name="insertHeaderOdd">
+		<xsl:param name="is_header">true</xsl:param>
+		<xsl:param name="border_around_page">false</xsl:param>
 		<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="15mm" height="270mm" width="170mm" border="1.25pt solid black" role="SKIP">
+					<fo:block> </fo:block>
+				</fo:block-container>
+			</xsl:if>
 			<fo:block-container height="24mm" display-align="before">
-				<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="insertLayoutVersion2024AttributesTop"/>
-					<xsl:value-of select="$ISOnumber"/>
-				</fo:block>
+				<xsl:if test="$layoutVersion = '2024'">
+					<xsl:attribute name="height">23mm</xsl:attribute>
+				</xsl:if>
+				<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>
@@ -3817,9 +4273,13 @@
 	</xsl:template>
 	<xsl:template name="insertFooterEven">
 		<xsl:param name="font-weight" select="'bold'"/>
+		<xsl:param name="insert_footer_last">true</xsl:param>
 		<fo:static-content flow-name="footer-even" role="artifact">
 			<fo:block-container>
 				<xsl:choose>
+					<xsl:when test="$layoutVersion = '1951'">
+						<xsl:call-template name="insertFooter1951"/>
+					</xsl:when>
 					<xsl:when test="$layoutVersion = '2024'">
 						<xsl:call-template name="insertFooter2024">
 							<xsl:with-param name="font-weight" select="$font-weight"/>
@@ -3860,12 +4320,25 @@
 				</xsl:choose>
 			</fo:block-container>
 		</fo:static-content>
+		<!-- for layout 1951 only -->
+		<xsl:if test="$layoutVersion = '1951'">
+			<fo:static-content flow-name="footer-even-last" role="artifact">
+				<fo:block-container>
+					<xsl:call-template name="insertFooter1951">
+						<xsl:with-param name="insert_footer_last" select="$insert_footer_last"/>
+					</xsl:call-template>
+				</fo:block-container>
+			</fo:static-content>
+		</xsl:if>
 	</xsl:template>
 	<xsl:template name="insertFooterOdd">
 		<xsl:param name="font-weight" select="'bold'"/>
 		<fo:static-content flow-name="footer-odd" role="artifact">
 			<fo:block-container>
 				<xsl:choose>
+					<xsl:when test="$layoutVersion = '1951'">
+						<xsl:call-template name="insertFooter1951"/>
+					</xsl:when>
 					<xsl:when test="$layoutVersion = '2024'">
 						<xsl:call-template name="insertFooter2024">
 							<xsl:with-param name="font-weight" select="$font-weight"/>
@@ -3907,20 +4380,94 @@
 			</fo:block-container>
 		</fo:static-content>
 	</xsl:template>
+	<xsl:template name="insertFooter1951">
+		<xsl:param name="insert_footer_last">false</xsl:param>
+		<xsl:attribute name="height"><xsl:value-of select="$marginBottom - 2"/>mm</xsl:attribute>
+		<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="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)"/>
+					<fo:table-body>
+						<fo:table-row>
+							<fo:table-cell font-size="8pt">
+								<fo:block line-height="1" margin-top="2mm">
+									<xsl:variable name="date_first_printing" select="normalize-space(/iso:iso-standard/iso:metanorma-extension/iso:presentation-metadata/iso:first-printing-date)"/>
+									<xsl:if test="$insert_footer_last = 'true' and $date_first_printing != ''">
+										<fo:block><xsl:value-of select="$i18n_date_first_printing"/>:</fo:block>
+										<fo:block>
+											<!-- Example: December 1965 -->
+											<xsl:call-template name="convertDate">
+												<xsl:with-param name="date" select="$date_first_printing"/>
+											</xsl:call-template>
+										</fo:block>
+									</xsl:if>
+								</fo:block>
+							</fo:table-cell>
+							<fo:table-cell>
+								<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">
+									<xsl:variable name="price_" select="normalize-space(/iso:iso-standard/iso:metanorma-extension/iso:presentation-metadata/iso:price)"/>
+									<xsl:variable name="price" select="java:replaceAll(java:java.lang.String.new($price_), '-{2}', $em_dash)"/>
+									<xsl:if test="$insert_footer_last = 'true' and $price != ''">
+										<!-- Example: Price: Sw. fr. 3.- -->
+										<xsl:value-of select="concat($i18n_price, ': ', $price)"/>
+									</xsl:if>
+								</fo:block>
+							</fo:table-cell>
+						</fo:table-row>
+					</fo:table-body>
+				</fo:table>
+			</fo:block-container>
+		</fo:block-container>
+	</xsl:template>
 	<xsl:template name="insertFooter2024">
 		<xsl:param name="font-weight" select="'bold'"/>
 		<xsl:attribute name="text-align">center</xsl:attribute>
-		<fo:block font-size="8.6pt">
-			<xsl:call-template name="insertInterFont"/>
+		<xsl:attribute name="line-height">1.1</xsl:attribute>
+		<fo:block font-size="9pt">
+			<!-- <xsl:call-template name="insertInterFont"/> -->
 			<xsl:value-of select="$copyrightText"/>
 		</fo:block>
 		<xsl:if test="$copyrightAbbrIEEE = ''"><fo:block> </fo:block></xsl:if>
 		<fo:block font-size="11pt" font-weight="{$font-weight}"><fo:page-number/></fo:block>
 	</xsl:template>
-	<xsl:template name="insertLayoutVersion2024AttributesTop">
+	<xsl:template name="insertLayoutVersionAttributesTop">
+		<xsl:param name="odd_or_even"/>
+		<xsl:if test="$layoutVersion = '1951'">
+			<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">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'">
-			<xsl:attribute name="font-size">11.5pt</xsl:attribute>
-			<xsl:attribute name="padding-top">17mm</xsl:attribute>
+			<!-- <xsl:attribute name="font-size">11.5pt</xsl:attribute> -->
+			<xsl:attribute name="padding-top">12.2mm</xsl:attribute>
 			<xsl:attribute name="text-align">center</xsl:attribute>
 		</xsl:if>
 	</xsl:template>
@@ -4050,14 +4597,14 @@
 	<xsl:template name="insertLastPage_2024">
 		<fo:page-sequence master-reference="last-page_2024" force-page-count="no-force">
 			<fo:flow flow-name="xsl-region-body">
-				<fo:table table-layout="fixed" width="100%">
+				<fo:table table-layout="fixed" width="100%" margin-bottom="-1mm">
 					<xsl:call-template name="insertInterFont"/>
-					<fo:table-column column-width="proportional-column-width(70)"/>
-					<fo:table-column column-width="proportional-column-width(1.4)"/>
-					<fo:table-column column-width="proportional-column-width(1.4)"/>
-					<fo:table-column column-width="proportional-column-width(109.5)"/>
+					<fo:table-column column-width="proportional-column-width(73)"/>
+					<fo:table-column column-width="proportional-column-width(1.45)"/>
+					<fo:table-column column-width="proportional-column-width(1.45)"/>
+					<fo:table-column column-width="proportional-column-width(114.3)"/>
 					<fo:table-body>
-						<fo:table-row height="88mm">
+						<fo:table-row height="91.8mm">
 							<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}">
 								<fo:block>
 									<xsl:call-template name="insertLogoImages2024"/>
@@ -4073,9 +4620,9 @@
 						<fo:table-row height="2mm" font-size="0pt">
 							<fo:table-cell number-columns-spanned="4"><fo:block> </fo:block></fo:table-cell>
 						</fo:table-row>
-						<fo:table-row height="175mm"> <!-- 174 -->
+						<fo:table-row height="182mm"> <!-- 174 -->
 							<fo:table-cell number-columns-spanned="2" display-align="after" border-right="{$cover_page_border}">
-								<fo:block font-size="11.5pt" font-weight="bold">
+								<fo:block font-size="12pt" font-weight="bold">
 									<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:ext/iso:ics/iso:code">
 										<xsl:if test="position() = 1"><fo:inline>ICS  </fo:inline></xsl:if>
 										<xsl:value-of select="."/>
@@ -4084,7 +4631,7 @@
 								</fo:block>
 
 								<!-- Price based on ... pages -->
-								<fo:block font-size="8.6pt" space-before="2pt">
+								<fo:block font-size="9pt" space-before="2pt">
 									<fo:block>
 										<xsl:for-each select="xalan:nodeset($price_based_on_items)/item">
 											<xsl:value-of select="."/>
@@ -4093,11 +4640,11 @@
 											</xsl:if>
 										</xsl:for-each>
 									</fo:block>
-									<fo:block margin-top="16pt" margin-bottom="2.5mm"><xsl:value-of select="$copyrightText"/></fo:block>
+									<fo:block margin-top="18pt" margin-bottom="-1mm" line-height="1.1"><xsl:value-of select="$copyrightTextLastPage2024"/></fo:block>
 								</fo:block>
 							</fo:table-cell>
 							<fo:table-cell number-columns-spanned="2" text-align="right" display-align="after">
-								<fo:block font-size="15.3pt" font-weight="bold" margin-bottom="1.5mm" margin-right="2mm">
+								<fo:block font-size="16pt" font-weight="bold" margin-bottom="1mm" margin-right="1.5mm">
 									<xsl:if test="$stage &gt;=60">
 										<xsl:attribute name="color"><xsl:value-of select="$color_red"/></xsl:attribute>
 									</xsl:if>
@@ -4290,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)"/> -->
@@ -4407,7 +4967,8 @@
 	<xsl:variable name="marginLeftRight1_">
 
 				<xsl:choose>
-					<xsl:when test="$layoutVersion = '2024'">18.7</xsl:when>
+					<xsl:when test="$layoutVersion = '1951'">36</xsl:when>
+					<xsl:when test="$layoutVersion = '2024'">15.2</xsl:when>
 					<xsl:otherwise>25</xsl:otherwise>
 				</xsl:choose>
 
@@ -4417,7 +4978,8 @@
 	<xsl:variable name="marginLeftRight2_">
 
 				<xsl:choose>
-					<xsl:when test="$layoutVersion = '2024'">18.7</xsl:when>
+					<xsl:when test="$layoutVersion = '1951'">29</xsl:when>
+					<xsl:when test="$layoutVersion = '2024'">15.2</xsl:when>
 					<xsl:otherwise>12.5</xsl:otherwise>
 				</xsl:choose>
 
@@ -4425,14 +4987,20 @@
 	<xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/>
 
 	<xsl:variable name="marginTop_">
-		27.4
+
+				<xsl:choose>
+					<xsl:when test="$layoutVersion = '2024'">23.5</xsl:when>
+					<xsl:otherwise>27.4</xsl:otherwise>
+				</xsl:choose>
+
 	</xsl:variable>
 	<xsl:variable name="marginTop" select="normalize-space($marginTop_)"/>
 
 	<xsl:variable name="marginBottom_">
 
 				<xsl:choose>
-					<xsl:when test="$layoutVersion = '2024'">25.5</xsl:when>
+					<xsl:when test="$layoutVersion = '1951'">25.5</xsl:when>
+					<xsl:when test="$layoutVersion = '2024'">19.5</xsl:when>
 					<xsl:otherwise>15</xsl:otherwise>
 				</xsl:choose>
 
@@ -4540,6 +5108,10 @@
 	<xsl:variable name="zero_width_space">​</xsl:variable>
 	<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"/>
@@ -4736,6 +5308,11 @@
 
 	<xsl:template name="refine_link-style">
 
+			<xsl:if test="(ancestor::*[local-name() = 'copyright-statement'] and contains(@target, 'mailto:')) or        ($layoutVersion = '2024' and ancestor::iso:termsource)">
+				<xsl:attribute name="color">inherit</xsl:attribute>
+				<xsl:attribute name="text-decoration">none</xsl:attribute>
+			</xsl:if>
+
 	</xsl:template> <!-- refine_link-style -->
 
 	<xsl:attribute-set name="sourcecode-container-style">
@@ -4880,6 +5457,14 @@
 
 	</xsl:attribute-set> <!-- example-name-style -->
 
+	<xsl:template name="refine_example-name-style">
+
+			<xsl:if test="$layoutVersion = '2024' and translate(.,'0123456789','') = ."> <!-- EXAMPLE without number -->
+				<xsl:attribute name="padding-right">8mm</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template>
+
 	<xsl:attribute-set name="example-p-style">
 
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -4900,6 +5485,14 @@
 
 	</xsl:attribute-set> <!-- termexample-name-style -->
 
+	<xsl:template name="refine_termexample-name-style">
+
+			<xsl:if test="$layoutVersion = '2024' and translate(.,'0123456789','') = ."> <!-- EXAMPLE without number -->
+				<xsl:attribute name="padding-right">8mm</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template>
+
 	<!-- ========================== -->
 	<!-- Table styles -->
 	<!-- ========================== -->
@@ -4938,8 +5531,6 @@
 				<xsl:if test="normalize-space(@width) != 'text-width'">
 					<xsl:attribute name="span">all</xsl:attribute>
 				</xsl:if>
-			</xsl:if>
-			<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
 				<xsl:attribute name="font-size">9pt</xsl:attribute>
 			</xsl:if>
 
@@ -4964,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"/>
 
@@ -4991,9 +5587,6 @@
 					<xsl:attribute name="span">all</xsl:attribute>
 				</xsl:if>
 			</xsl:if>
-			<xsl:if test="$layoutVersion = '2024'">
-				<xsl:attribute name="font-size">10.5pt</xsl:attribute>
-			</xsl:if>
 
 	</xsl:template> <!-- refine_table-name-style -->
 
@@ -5072,6 +5665,10 @@
 				<xsl:attribute name="border-top"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
 				<xsl:attribute name="border-bottom"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
 			</xsl:if>
+			<!-- vertical table header -->
+			<xsl:if test="ancestor::*[local-name() = 'tbody'] and not(following-sibling::*[local-name() = 'th'])">
+				<xsl:attribute name="border-right"><xsl:value-of select="$table-border"/></xsl:attribute>
+			</xsl:if>
 
 		<xsl:call-template name="setBordersTableArray"/>
 
@@ -5110,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"/>
@@ -5129,6 +5731,10 @@
 
 	<xsl:template name="refine_table-footer-cell-style">
 
+			<xsl:if test="$layoutVersion = '2024'">
+				<xsl:attribute name="border-top"><xsl:value-of select="$table-border"/></xsl:attribute>
+			</xsl:if>
+
 	</xsl:template> <!-- refine_table-footer-cell-style -->
 
 	<xsl:attribute-set name="table-note-style">
@@ -5152,6 +5758,17 @@
 
 	</xsl:attribute-set> <!-- table-fn-style -->
 
+	<xsl:template name="refine_table-fn-style">
+
+			<xsl:if test="$layoutVersion = '2024'">
+				<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
+				<xsl:if test="position() = last()">
+					<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
+
+	</xsl:template>
+
 	<xsl:attribute-set name="table-fn-number-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -5160,6 +5777,15 @@
 
 	</xsl:attribute-set> <!-- table-fn-number-style -->
 
+	<xsl:template name="refine_table-fn-number-style">
+
+			<xsl:if test="$layoutVersion = '2024'">
+				<xsl:attribute name="alignment-baseline">auto</xsl:attribute>
+				<xsl:attribute name="baseline-shift">15%</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template>
+
 	<xsl:attribute-set name="fn-container-body-style">
 		<xsl:attribute name="text-indent">0</xsl:attribute>
 		<xsl:attribute name="start-indent">0</xsl:attribute>
@@ -5215,6 +5841,10 @@
 
 	<xsl:template name="refine_dt-block-style">
 
+			<xsl:if test="$layoutVersion = '2024'">
+				<xsl:attribute name="margin-bottom">9pt</xsl:attribute>
+			</xsl:if>
+
 	</xsl:template> <!-- refine_dt-block-style -->
 
 	<xsl:attribute-set name="dl-name-style">
@@ -5286,6 +5916,14 @@
 			<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
 				<xsl:attribute name="font-size">9pt</xsl:attribute>
 			</xsl:if>
+			<xsl:if test="$layoutVersion  = '2024'">
+				<xsl:if test="ancestor::*[local-name() = 'li'] and not(following-sibling::*)">
+					<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="preceding-sibling::*[1][local-name() = 'table']">
+					<xsl:attribute name="margin-top">0pt</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
 			<xsl:if test="$doctype = 'amendment' and parent::*[local-name() = 'quote']">
 				<xsl:attribute name="font-size">inherit</xsl:attribute>
 			</xsl:if>
@@ -5303,6 +5941,11 @@
 
 	<xsl:template name="refine_note-name-style">
 
+			<xsl:variable name="note_name" select="*[local-name() = 'name']"/>
+			<xsl:if test="$layoutVersion = '2024' and translate($note_name,'0123456789','') = $note_name"> <!-- NOTE without number -->
+				<xsl:attribute name="padding-right">8mm</xsl:attribute>
+			</xsl:if>
+
 	</xsl:template> <!-- refine_note-name-style -->
 
 	<xsl:attribute-set name="table-note-name-style">
@@ -5421,6 +6064,9 @@
 					<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 				</xsl:if>
 			</xsl:if>
+			<xsl:if test="$layoutVersion = '2024'">
+				<xsl:attribute name="space-after">18pt</xsl:attribute>
+			</xsl:if>
 
 	</xsl:template>
 
@@ -5625,6 +6271,8 @@
 
 	<xsl:attribute-set name="list-item-body-style">
 
+			<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
+
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_list-item-body-style">
@@ -5658,7 +6306,8 @@
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 
 			<xsl:attribute name="font-size">80%</xsl:attribute>
-			<xsl:attribute name="vertical-align">super</xsl:attribute>
+			<!--<xsl:attribute name="vertical-align">super</xsl:attribute> -->
+			<xsl:attribute name="baseline-shift">30%</xsl:attribute>
 
 	</xsl:attribute-set>
 
@@ -5678,6 +6327,9 @@
 			<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
 				<xsl:attribute name="font-size">9pt</xsl:attribute>
 			</xsl:if>
+			<xsl:if test="$layoutVersion = '2024'">
+				<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			</xsl:if>
 
 	</xsl:template> <!-- refine_fn-body-style -->
 
@@ -6319,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">
@@ -6328,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_)"/> -->
 
@@ -6424,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>
@@ -6511,6 +7179,12 @@
 				<!-- centered table when table name is centered (see table-name-style) -->
 
 					<fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style">
+
+							<xsl:if test="$layoutVersion = '2024'">
+								<xsl:attribute name="margin-top">12pt</xsl:attribute>
+								<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+							</xsl:if>
+
 						<fo:table-column column-width="proportional-column-width(1)"/>
 						<fo:table-column column-width="{@width}"/>
 						<fo:table-column column-width="proportional-column-width(1)"/>
@@ -6593,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"/>
@@ -7020,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">
 
@@ -7092,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']"/>
 
@@ -7102,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"/>
@@ -7509,6 +8202,10 @@
 					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
 				</xsl:if>
 
+					<xsl:if test="$layoutVersion = '2024'">
+						<xsl:attribute name="font-size">70%</xsl:attribute>
+					</xsl:if>
+
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
 						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}" role="Lbl">
@@ -7627,8 +8324,9 @@
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
 
 						<fo:block xsl:use-attribute-sets="table-fn-style">
-
+							<xsl:call-template name="refine_table-fn-style"/>
 							<fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
+								<xsl:call-template name="refine_table-fn-number-style"/>
 
 								<xsl:value-of select="@reference"/>
 
@@ -7812,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> -->
@@ -8792,11 +9503,21 @@
 	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
 		<!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 -->
 		<xsl:variable name="text" select="."/>
-		<fo:inline font-size="75%" role="SKIP">
+		<xsl:variable name="ratio_">
+
+					<xsl:choose>
+						<xsl:when test="$layoutVersion = '2024'">0.8</xsl:when>
+						<xsl:otherwise>0.75</xsl:otherwise>
+					</xsl:choose>
+
+		</xsl:variable>
+		<xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
+		<fo:inline font-size="{$ratio * 100}%" role="SKIP">
 				<xsl:if test="string-length($text) &gt; 0">
 					<xsl:variable name="smallCapsText">
 						<xsl:call-template name="recursiveSmallCaps">
 							<xsl:with-param name="text" select="$text"/>
+							<xsl:with-param name="ratio" select="$ratio"/>
 						</xsl:call-template>
 					</xsl:variable>
 					<!-- merge neighboring fo:inline -->
@@ -8833,12 +9554,13 @@
 
 	<xsl:template name="recursiveSmallCaps">
     <xsl:param name="text"/>
+    <xsl:param name="ratio"/>
     <xsl:variable name="char" select="substring($text,1,1)"/>
     <!-- <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/> -->
 		<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
     <xsl:choose>
       <xsl:when test="$char=$upperCase">
-        <fo:inline font-size="{100 div 0.75}%" role="SKIP">
+        <fo:inline font-size="{100 div $ratio}%" role="SKIP">
           <xsl:value-of select="$upperCase"/>
         </fo:inline>
       </xsl:when>
@@ -8849,6 +9571,7 @@
     <xsl:if test="string-length($text) &gt; 1">
       <xsl:call-template name="recursiveSmallCaps">
         <xsl:with-param name="text" select="substring($text,2)"/>
+        <xsl:with-param name="ratio" select="$ratio"/>
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
@@ -8956,6 +9679,9 @@
 				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
+				<xsl:if test="$key = 'text-indent'">
+					<style name="padding-left"><xsl:value-of select="$value"/></style>
+				</xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -9828,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>
@@ -10365,6 +11097,13 @@
 		</xsl:call-template>
 	</xsl:template>
 
+	<!-- command between two xref points to non-standard bibitem -->
+	<xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and    following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]">
+
+				<fo:inline baseline-shift="20%" font-size="80%"><xsl:value-of select="."/></fo:inline>
+
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- formula  -->
 	<!-- ====== -->
@@ -10735,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">
@@ -11070,6 +11809,8 @@
 		</xsl:attribute>
 	</xsl:template>
 
+	<xsl:variable name="regex_starts_with_digit">^[0-9].*</xsl:variable>
+
 	<xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="svg_update"/>
@@ -11088,7 +11829,8 @@
 
 			<xsl:attribute name="width">
 				<xsl:choose>
-					<xsl:when test="$parent_image_width != '' and $parent_image_width != 'auto'"><xsl:value-of select="$parent_image_width"/></xsl:when>
+					<!-- width is non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
+					<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
 					<xsl:when test="$width != ''">
 						<xsl:value-of select="round($width)"/>
 					</xsl:when>
@@ -11097,7 +11839,8 @@
 			</xsl:attribute>
 			<xsl:attribute name="height">
 				<xsl:choose>
-					<xsl:when test="$parent_image_height != '' and $parent_image_height != 'auto'"><xsl:value-of select="$parent_image_height"/></xsl:when>
+					<!-- height non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
+					<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
 					<xsl:when test="$height != ''">
 						<xsl:value-of select="round($height)"/>
 					</xsl:when>
@@ -11114,7 +11857,7 @@
 		<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[2][local-name() = 'image']/@width)"/>
 		<xsl:attribute name="width">
 			<xsl:choose>
-				<xsl:when test="$parent_image_width != '' and $parent_image_width != 'auto'"><xsl:value-of select="$parent_image_width"/></xsl:when>
+				<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
@@ -11125,7 +11868,7 @@
 		<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[2][local-name() = 'image']/@height)"/>
 		<xsl:attribute name="height">
 			<xsl:choose>
-				<xsl:when test="$parent_image_height != '' and $parent_image_height != 'auto'"><xsl:value-of select="$parent_image_height"/></xsl:when>
+				<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
@@ -12588,6 +13331,7 @@
 	<xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<fo:inline xsl:use-attribute-sets="termexample-name-style">
+				<xsl:call-template name="refine_termexample-name-style"/>
 				<xsl:apply-templates/>
 			</fo:inline>
 		</xsl:if>
@@ -12738,6 +13482,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:inline xsl:use-attribute-sets="example-name-style">
+					<xsl:call-template name="refine_example-name-style"/>
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:otherwise>
@@ -13076,6 +13821,8 @@
 			</xsl:choose>
 		</xsl:variable>
 
+			<xsl:if test="$layoutVersion = '1951' and $depth = 1">.</xsl:if>
+
 		<xsl:choose>
 			<xsl:when test="$lang = 'zh'">
 				<fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -13206,6 +13953,7 @@
 	<xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
 
 				<xsl:choose>
+					<xsl:when test="$layoutVersion = '1951' and (local-name() = 'clause' or local-name() = 'introduction')"/>
 					<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'"/>
 					<xsl:otherwise>
 						<fo:block break-after="page"/>
@@ -13956,6 +14704,11 @@
 	<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
 
 				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
+
+						<xsl:if test="$layoutVersion = '2024'">
+							<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+						</xsl:if>
+
 					<xsl:call-template name="processBibitem"/>
 				</fo:block>
 
@@ -13991,6 +14744,11 @@
 			<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
 			<xsl:otherwise>
 				<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
+
+						<xsl:if test="$layoutVersion = '2024'">
+							<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+						</xsl:if>
+
 					<fo:list-item-label end-indent="label-end()">
 						<fo:block role="SKIP">
 							<fo:inline role="SKIP">