metanorma-iso 3.1.7 → 3.2.0

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

@@ -3080,9 +3080,8 @@
 	<xsl:template name="insertLogoImages2024">
 		<xsl:variable name="content-height">20</xsl:variable>
 		<xsl:choose>
-			<xsl:when test="mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description = 'committee']/mn:organization">
-				<xsl:for-each select="mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description = 'committee']/mn:organization">
-
+			<xsl:when test="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description = 'committee']/mn:organization[mn:abbreviation]">
+				<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description = 'committee']/mn:organization[mn:abbreviation]">
 					<xsl:variable name="items">
 						<xsl:call-template name="split_abbreviation"/>
 					</xsl:variable>
@@ -4122,15 +4121,9 @@
 				<xsl:call-template name="titleAmendment"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block font-size="16pt" text-align="center" margin-bottom="48pt" keep-with-next="always" role="H1">
-					<xsl:call-template name="setIDforNamedDestination"/>
-					<xsl:if test="$layoutVersion = '2024'">
-						<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 = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
-						<xsl:attribute name="span">all</xsl:attribute>
-					</xsl:if>
+				<fo:block xsl:use-attribute-sets="annex-title-style">
+					<xsl:call-template name="refine_annex-title-style"/>
+
 					<xsl:apply-templates/>
 					<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
 				</fo:block>
@@ -4145,15 +4138,9 @@
 				<xsl:call-template name="titleAmendment"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block font-size="16pt" font-weight="bold" text-align="center" margin-top="6pt" margin-bottom="36pt" keep-with-next="always" role="H1">
-					<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
-						<xsl:attribute name="font-size">14pt</xsl:attribute>
-						<xsl:attribute name="span">all</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="$layoutVersion = '2024'">
-						<xsl:attribute name="margin-top">0pt</xsl:attribute>
-						<xsl:attribute name="margin-bottom">30pt</xsl:attribute>
-					</xsl:if>
+				<fo:block xsl:use-attribute-sets="references-non-normative-title-style">
+					<xsl:call-template name="refine_references-non-normative-title-style"/>
+
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -4167,68 +4154,6 @@
 			<xsl:call-template name="getLevel"/>
 		</xsl:variable>
 
-		<xsl:variable name="font-size">
-			<xsl:choose>
-				<xsl:when test="$layoutVersion = '1951'">
-					<xsl:choose>
-						<xsl:when test="$level = 1 and ancestor::mn:preface and $revision_date_num &gt;= 19680101">9.5pt</xsl:when> <!-- BRIEF HISTORY, FOREWORD -->
-						<xsl:when test="$level = 1 and ancestor::mn:preface">13pt</xsl:when>
-						<xsl:when test="$revision_date_num &lt; 19680101 and ancestor::mn:sections and not(ancestor::mn:introduction)">9pt</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 = '1972'">
-					<xsl:choose>
-						<xsl:when test="$level = 1">9pt</xsl:when>
-						<xsl:otherwise>9pt</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when>
-				<xsl:when test="(($layoutVersion = '1987' and $doctype = 'technical-report') or ($layoutVersion = '1979' and $doctype = 'addendum'))">
-					<xsl:choose>
-						<xsl:when test="$level = 1">11pt</xsl:when>
-						<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 = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
-					<xsl:choose>
-						<xsl:when test="ancestor::mn:annex and $level = 2">12pt</xsl:when>
-						<xsl:when test="ancestor::mn:annex and $level = 3">11pt</xsl:when>
-						<xsl:when test="ancestor::mn:introduction and $level &gt;= 2">10pt</xsl:when>
-						<xsl:when test="ancestor::mn:preface">14pt</xsl:when>
-						<xsl:when test="$level = 2">10pt</xsl:when>
-						<xsl:when test="$level &gt;= 3">10pt</xsl:when>
-						<xsl:otherwise>12pt</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when>
-				<!-- <xsl:when test="$layoutVersion = '2024'">
-					<xsl:choose>
-						<xsl:when test="ancestor::mn:annex and $level = 2">12.5pt</xsl:when>
-						<xsl:when test="ancestor::mn:annex and $level = 3">11.5pt</xsl:when>
-						<xsl:when test="ancestor::mn:introduction and $level &gt;= 2">10.5pt</xsl:when>
-						<xsl:when test="ancestor::mn:preface">15.3pt</xsl:when>
-						<xsl:when test="$level = 2">11.5pt</xsl:when>
-						<xsl:when test="$level &gt;= 3">10.5pt</xsl:when>
-						<xsl:otherwise>12.5pt</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when> -->
-				<xsl:otherwise>
-					<xsl:choose>
-						<xsl:when test="ancestor::mn:annex and $level = 2">13pt</xsl:when>
-						<xsl:when test="ancestor::mn:annex and $level = 3">12pt</xsl:when>
-						<xsl:when test="ancestor::mn:introduction and $level &gt;= 2">11pt</xsl:when>
-						<xsl:when test="ancestor::mn:preface">16pt</xsl:when>
-						<xsl:when test="$level = 2">12pt</xsl:when>
-						<xsl:when test="$level &gt;= 3">11pt</xsl:when>
-						<xsl:otherwise>13pt</xsl:otherwise>
-					</xsl:choose>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable> <!-- font-size -->
-
 		<xsl:variable name="element-name">
 			<xsl:choose>
 				<xsl:when test="@inline-header = 'true'">fo:inline</xsl:when>
@@ -4237,6 +4162,8 @@
 			</xsl:choose>
 		</xsl:variable>
 
+		<xsl:variable name="title_styles"><styles xsl:use-attribute-sets="title-style"><xsl:call-template name="refine_title-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template></styles></xsl:variable>
+
 		<xsl:choose>
 			<xsl:when test="(($layoutVersion = '1987' and $doctype = 'technical-report') or ($layoutVersion = '1979' and $doctype = 'addendum')) and parent::mn:foreword"><!-- skip Foreword title --></xsl:when>
 			<xsl:when test="$doctype = 'amendment' and not(ancestor::mn:preface)">
@@ -4259,97 +4186,12 @@
 				</xsl:if>
 
 				<xsl:element name="{$element-name}">
+					<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
 
-					<xsl:if test="$layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
-						<!-- copy @id from empty preceding clause -->
-						<xsl:copy-of select="preceding-sibling::*[1][self::mn:clause and count(node()) = 0]/@id"/>
-					</xsl:if>
-
-					<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
-					<xsl:attribute name="font-weight">bold</xsl:attribute>
-					<xsl:variable name="attribute-name-before">
-						<xsl:choose>
-							<xsl:when test="ancestor::mn:preface and $level = 1">margin-top</xsl:when> <!-- for Foreword and Introduction titles -->
-							<xsl:otherwise>space-before</xsl:otherwise>
-						</xsl:choose>
-					</xsl:variable>
-					<xsl:attribute name="{$attribute-name-before}"> <!-- space-before or margin-top -->
-						<xsl:choose>
-							<xsl:when test="$layoutVersion = '1951' and ancestor::mn:preface and $level = 1">20mm</xsl:when>
-							<xsl:when test="$layoutVersion = '1951' and $level = 1 and $revision_date_num &gt;= 19680101">12pt</xsl:when>
-							<xsl:when test="ancestor::mn:introduction and $level &gt;= 2 and ../preceding-sibling::mn:clause">30pt</xsl:when>
-							<xsl:when test="(($layoutVersion = '1987' and $doctype = 'technical-report') or ($layoutVersion = '1979' and $doctype = 'addendum')) and ancestor::mn:preface and $level = 1">10mm</xsl:when>
-							<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num &lt;= 19981231)) and ancestor::mn:preface and $level = 1">62mm</xsl:when>
-							<xsl:when test="$layoutVersion = '1972' and $level = 1">30pt</xsl:when>
-							<xsl:when test="$layoutVersion = '1989' and ancestor::mn:preface and $level = 1">56pt</xsl:when>
-							<xsl:when test="$layoutVersion = '2024' and ancestor::mn:preface and $level = 1">0pt</xsl:when>
-							<xsl:when test="ancestor::mn:preface">8pt</xsl:when>
-							<xsl:when test="$level = 2 and ancestor::mn:annex">18pt</xsl:when>
-							<xsl:when test="$level = 1">18pt</xsl:when>
-							<xsl:when test="($level = 2 or $level = 3) and not(../preceding-sibling::mn: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::mn: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>
-							<xsl:when test="$level = ''">6pt</xsl:when>
-							<xsl:otherwise>12pt</xsl:otherwise>
-						</xsl:choose>
-					</xsl:attribute>
-					<xsl:attribute name="space-after"> <!-- margin-bottom -->
-						<xsl:choose>
-							<xsl:when test="$layoutVersion = '1951' and $level = 1 and ancestor::mn:preface">14.7mm</xsl:when>
-							<xsl:when test="$layoutVersion = '1951' and parent::mn:introduction and $revision_date_num &lt; 19680101">6mm</xsl:when>
-							<xsl:when test="$layoutVersion = '1951' and parent::mn:introduction">2mm</xsl:when>
-							<!-- <xsl:when test="$layoutVersion = '1951' and $revision_date_num &gt;= 19680101">4pt</xsl:when> -->
-							<xsl:when test="$layoutVersion = '1951' and $level = 1">12pt</xsl:when>
-							<xsl:when test="ancestor::mn:introduction and $level &gt;= 2">8pt</xsl:when>
-							<xsl:when test="ancestor::mn:preface">18pt</xsl:when>
-							<xsl:when test="$level = 3">9pt</xsl:when>
-							<!-- <xsl:when test="$level = 2 and ancestor::mn:annex and $layoutVersion = '2024'">2pt</xsl:when> -->
-							<!-- <xsl:otherwise>12pt</xsl:otherwise> -->
-							<xsl:otherwise>8pt</xsl:otherwise>
-						</xsl:choose>
-					</xsl:attribute>
-					<xsl:attribute name="keep-with-next">always</xsl:attribute>
-					<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
-					<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::mn:introduction)">
-
-							<xsl:if test="($revision_date_num &lt; 19690101) or ancestor::mn:preface or (parent::mn:introduction and $revision_date_num &gt;= 19680101)">
-							<xsl:attribute name="text-align">center</xsl:attribute>
-							</xsl:if>
-
-							<xsl:attribute name="text-transform">uppercase</xsl:attribute>
-
-							<xsl:if test="ancestor::mn:preface or ancestor::mn:introduction">
-								<xsl:attribute name="font-weight">normal</xsl:attribute>
-							</xsl:if>
-						</xsl:if>
-					</xsl:if>
-
-					<xsl:if test="$layoutVersion = '1972'">
-						<xsl:if test="$level = 1">
-							<xsl:attribute name="text-transform">uppercase</xsl:attribute>
-						</xsl:if>
-					</xsl:if>
-
-					<xsl:if test="$layoutVersion = '1987' and ../@type = 'section'">
-						<xsl:attribute name="font-size">14pt</xsl:attribute>
-						<xsl:attribute name="text-align">center</xsl:attribute>
-						<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
-						<xsl:attribute name="keep-with-next">always</xsl:attribute>
-					</xsl:if>
 					<xsl:if test="$element-name = 'fo:inline'">
-						<xsl:choose>
-							<xsl:when test="$lang = 'zh'">
-								<xsl:value-of select="$tab_zh"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:attribute name="padding-right">2mm</xsl:attribute>
-							</xsl:otherwise>
-						</xsl:choose>
+						<xsl:if test="$lang = 'zh'">
+							<xsl:value-of select="$tab_zh"/>
+						</xsl:if>
 					</xsl:if>
 
 					<xsl:call-template name="setIDforNamedDestinationInline"/>
@@ -4506,77 +4348,18 @@
 		</xsl:variable>
 
 		<xsl:call-template name="setNamedDestination"/>
-		<xsl:element name="{$element-name}">
-
-			<xsl:call-template name="setBlockAttributes">
-				<xsl:with-param name="text_align_default">justify</xsl:with-param>
-			</xsl:call-template>
-
-			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
-			<xsl:if test="count(ancestor::mn:li) = 1 and not(ancestor::mn:li[1]/following-sibling::mn:li) and not(following-sibling::mn:p)">
-				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="starts-with(ancestor::mn:table[1]/@type, 'recommend') and not(following-sibling::mn:p)">
-				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="parent::*[self::mn:td or self::mn:th]">
-				<xsl:choose>
-					<xsl:when test="not(following-sibling::*)"> <!-- last paragraph in table cell -->
-						<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
-					</xsl:otherwise>
-				</xsl:choose>
-				<!-- Special case: if paragraph in 'strong', i.e. it's sub-header, then keeps with next -->
-				<xsl:if test="count(node()) = count(mn:strong) and following-sibling::*">
-					<xsl:attribute name="keep-with-next">always</xsl:attribute>
-				</xsl:if>
-			</xsl:if>
-			<xsl:if test="@id">
-				<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-			</xsl:if>
 
-			<!-- bookmarks only in paragraph -->
-			<xsl:if test="count(mn:bookmark) != 0 and count(*) = count(mn:bookmark) and normalize-space() = ''">
-				<xsl:attribute name="font-size">0</xsl:attribute>
-				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-				<xsl:attribute name="line-height">0</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="$element-name = 'fo:inline'">
-				<xsl:attribute name="role">P</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="ancestor::*[self::mn:li or self::mn:td or self::mn:th or self::mn:dd]">
-				<xsl:attribute name="role">SKIP</xsl:attribute>
-			</xsl:if>
-			<!-- <xsl:apply-templates>
-				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
-			</xsl:apply-templates> -->
-			<!-- <xsl:apply-templates select="node()[not(self::mn:note[not(following-sibling::*) or count(following-sibling::*) = count(../mn:note) - 1])]"> -->
+		<xsl:variable name="p_styles">
+			<styles xsl:use-attribute-sets="p-style">
+				<xsl:call-template name="refine_p-style">
+					<xsl:with-param name="element-name" select="$element-name"/>
+				</xsl:call-template>
+			</styles>
+		</xsl:variable>
 
-			<xsl:if test="$layoutVersion = '1951'">
-				<xsl:if test="not(ancestor::*[self::mn:li or self::mn:td or self::mn:th or self::mn:dd])">
-					<!-- for paragraphs in the main text -->
-					<xsl:choose>
-						<xsl:when test="$revision_date_num &lt; 19600101">
-							<xsl:attribute name="margin-bottom">14pt</xsl:attribute>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:if>
-				<xsl:if test="(ancestor::mn:preface and parent::mn:clause) or ancestor::mn:foreword">
-					<xsl:attribute name="text-indent">7.1mm</xsl:attribute>
-				</xsl:if>
-			</xsl:if>
+		<xsl:element name="{$element-name}">
 
-			<xsl:if test="$layoutVersion = '2024'">
-				<xsl:attribute name="line-height">1.13</xsl:attribute>
-				<xsl:if test="parent::mn:li/following-sibling::* or parent::mn:dd">
-					<xsl:attribute name="margin-bottom">9pt</xsl:attribute>
-				</xsl:if>
-			</xsl:if>
+			<xsl:copy-of select="xalan:nodeset($p_styles)/styles/@*"/>
 
 			<!-- put inline title in the first paragraph -->
 			<xsl:if test="($layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1">
@@ -5192,7 +4975,7 @@
 			<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:block-container xsl:use-attribute-sets="reset-margins-style">
 				<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)"/>
@@ -5386,7 +5169,7 @@
 		<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:block-container xsl:use-attribute-sets="reset-margins-style">
 				<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)"/>
@@ -8097,6 +7880,10 @@
 		</xsl:element>
 	</xsl:template>
 
+	<!-- show sourcecode's name 'before' or 'after' source code -->
+	<xsl:variable name="sourcecode-name-position"><xsl:text>after</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:sourcecode" name="sourcecode">
 
 		<xsl:variable name="sourcecode_attributes">
@@ -8120,7 +7907,12 @@
 
 					<xsl:call-template name="refine_sourcecode-container-style"/>
 
-					<fo:block-container margin-left="0mm" role="SKIP">
+					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+
+						<!-- <xsl:if test="$namespace = 'rsd'"> -->
+						<xsl:if test="$sourcecode-name-position = 'before'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name BEFORE content -->
+						</xsl:if>
 
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
 
@@ -8142,7 +7934,16 @@
 						</fo:block>
 
 						<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
-						<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
+
+						<!-- <xsl:choose>
+							<xsl:when test="$namespace = 'rsd'"></xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates select="mn:fmt-name" />  --><!-- show sourcecode's name AFTER content -->
+							<!-- </xsl:otherwise>
+						</xsl:choose> -->
+						<xsl:if test="$sourcecode-name-position = 'after'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
+						</xsl:if>
 
 					</fo:block-container>
 				</fo:block-container>
@@ -14244,6 +14045,10 @@
 	<!-- image    -->
 	<!-- ====== -->
 
+	<!-- show figure's name 'before' or 'after' image -->
+	<xsl:variable name="figure-name-position"><xsl:text>after</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:figure" name="figure">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -14256,6 +14061,10 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 
+			<xsl:if test="$figure-name-position = 'before'"> <!-- show figure's name BEFORE image -->
+				<xsl:apply-templates select="mn:fmt-name"/>
+			</xsl:if>
+
 			<!-- Example: Dimensions in millimeters -->
 			<xsl:apply-templates select="mn:note[@type = 'units']"/>
 
@@ -14276,7 +14085,16 @@
 			<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
 				<xsl:call-template name="showFigureKey"/>
 			</xsl:if>
-			<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
+
+			<!-- <xsl:choose>
+				<xsl:when test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'rsd'"></xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:fmt-name" /> --> <!-- show figure's name AFTER image -->
+				<!-- </xsl:otherwise>
+			</xsl:choose> -->
+			<xsl:if test="$figure-name-position = 'after'">
+				<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
+			</xsl:if>
 
 		</fo:block-container>
 	</xsl:template>
@@ -16432,10 +16250,24 @@
 	<!-- ================ -->
 
 	<xsl:attribute-set name="references-non-normative-title-style">
+		<xsl:attribute name="font-size">16pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="margin-top">0pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">30pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_references-non-normative-title-style">
-
+		<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
+			<xsl:attribute name="font-size">14pt</xsl:attribute>
+			<xsl:attribute name="span">all</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$layoutVersion != '2024'">
+			<xsl:attribute name="margin-top">6pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">36pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -18534,9 +18366,22 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
-	</xsl:attribute-set>
+		<xsl:attribute name="font-size">16pt</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="margin-bottom">48pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="role">H1</xsl:attribute>
+	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
+		<xsl:call-template name="setIDforNamedDestination"/>
+		<xsl:if test="$layoutVersion = '2024'">
+			<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 = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
+			<xsl:attribute name="span">all</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:attribute-set name="p-zzSTDTitle1-style">
@@ -18545,6 +18390,272 @@
 	<xsl:template name="refine_p-zzSTDTitle1-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="p-style">
+		<xsl:attribute name="text-align">justify</xsl:attribute>
+		<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+		<xsl:attribute name="line-height">1.13</xsl:attribute>
+	</xsl:attribute-set> <!-- p-style -->
+
+	<xsl:template name="refine_p-style">
+		<xsl:param name="element-name"/>
+		<xsl:param name="margin"/>
+		<xsl:call-template name="setBlockAttributes">
+			<!-- <xsl:with-param name="text_align_default">justify</xsl:with-param> -->
+			<xsl:with-param name="skip_text_align_default">true</xsl:with-param>
+		</xsl:call-template>
+
+		<xsl:if test="count(ancestor::mn:li) = 1 and not(ancestor::mn:li[1]/following-sibling::mn:li) and not(following-sibling::mn:p)">
+			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="starts-with(ancestor::mn:table[1]/@type, 'recommend') and not(following-sibling::mn:p)">
+			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="parent::*[self::mn:td or self::mn:th]">
+			<xsl:choose>
+				<xsl:when test="not(following-sibling::*)"> <!-- last paragraph in table cell -->
+					<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
+				</xsl:otherwise>
+			</xsl:choose>
+			<!-- Special case: if paragraph in 'strong', i.e. it's sub-header, then keeps with next -->
+			<xsl:if test="count(node()) = count(mn:strong) and following-sibling::*">
+				<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:copy-of select="@id"/>
+
+		<!-- bookmarks only in paragraph -->
+		<xsl:if test="count(mn:bookmark) != 0 and count(*) = count(mn:bookmark) and normalize-space() = ''">
+			<xsl:attribute name="font-size">0</xsl:attribute>
+			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			<xsl:attribute name="line-height">0</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$element-name = 'fo:inline'">
+			<xsl:attribute name="role">P</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="ancestor::*[self::mn:li or self::mn:td or self::mn:th or self::mn:dd]">
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+		</xsl:if>
+		<!-- <xsl:apply-templates>
+				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
+			</xsl:apply-templates> -->
+		<!-- <xsl:apply-templates select="node()[not(self::mn:note[not(following-sibling::*) or count(following-sibling::*) = count(../mn:note) - 1])]"> -->
+
+		<xsl:if test="$layoutVersion = '1951'">
+			<xsl:if test="not(ancestor::*[self::mn:li or self::mn:td or self::mn:th or self::mn:dd])">
+				<!-- for paragraphs in the main text -->
+				<xsl:choose>
+					<xsl:when test="$revision_date_num &lt; 19600101">
+						<xsl:attribute name="margin-bottom">14pt</xsl:attribute>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:if>
+			<xsl:if test="(ancestor::mn:preface and parent::mn:clause) or ancestor::mn:foreword">
+				<xsl:attribute name="text-indent">7.1mm</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$layoutVersion != '2024'">
+			<xsl:attribute name="line-height">1.2</xsl:attribute>
+			<xsl:if test="ancestor::mn:preface">
+				<xsl:attribute name="line-height">1.15</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$layoutVersion = '2024'">
+			<xsl:if test="parent::mn:li/following-sibling::* or parent::mn:dd">
+				<xsl:attribute name="margin-bottom">9pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+		<!-- $namespace = 'iso' -->
+
+	</xsl:template> <!-- refine_p-style -->
+
+	<xsl:attribute-set name="title-style">
+		<!-- Note: font-size for level 1 title -->
+		<xsl:attribute name="font-size">13pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="space-after">8pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:attribute-set> <!-- title-style -->
+
+	<xsl:template name="refine_title-style">
+		<xsl:param name="element-name"/>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+
+		<xsl:if test="$level = 2">
+			<xsl:attribute name="font-size">12pt</xsl:attribute>
+			<xsl:if test="ancestor::mn:annex">
+				<xsl:attribute name="font-size">13pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$level &gt;= 3">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$level = 3">
+			<xsl:attribute name="space-after">9pt</xsl:attribute>
+			<xsl:if test="ancestor::mn:annex">
+				<xsl:attribute name="font-size">12pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="ancestor::mn:preface">
+			<xsl:attribute name="font-size">16pt</xsl:attribute>
+			<xsl:attribute name="space-after">18pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$level &gt;= 2">
+			<xsl:if test="ancestor::mn:introduction">
+				<xsl:attribute name="font-size">11pt</xsl:attribute>
+				<xsl:attribute name="space-after">8pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$layoutVersion = '1951'">
+			<xsl:attribute name="font-size">inherit</xsl:attribute>
+			<xsl:if test="$level = 1">
+				<xsl:attribute name="space-after">12pt</xsl:attribute>
+				<xsl:if test="parent::mn:introduction">
+					<xsl:attribute name="space-after">2mm</xsl:attribute>
+					<xsl:if test="$revision_date_num &lt; 19680101">
+						<xsl:attribute name="space-after">6mm</xsl:attribute>
+					</xsl:if>
+				</xsl:if>
+				<xsl:if test="ancestor::mn:preface">
+					<xsl:attribute name="space-after">14.7mm</xsl:attribute>
+					<xsl:attribute name="font-size">13pt</xsl:attribute>
+					<xsl:if test="$revision_date_num &gt;= 19680101"><!-- BRIEF HISTORY, FOREWORD -->
+						<xsl:attribute name="font-size">9.5pt</xsl:attribute>
+					</xsl:if>
+				</xsl:if>
+			</xsl:if>
+			<xsl:if test="$revision_date_num &lt; 19680101 and ancestor::mn:sections and not(ancestor::mn:introduction)">
+				<xsl:attribute name="font-size">9pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$layoutVersion = '1972'">
+			<xsl:attribute name="font-size">9pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
+			<xsl:attribute name="font-size">12pt</xsl:attribute>
+
+			<xsl:if test="$level = 2">
+				<xsl:attribute name="font-size">10pt</xsl:attribute>
+				<xsl:if test="ancestor::mn:annex">
+					<xsl:attribute name="font-size">12pt</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
+			<xsl:if test="$level = 3">
+				<xsl:if test="ancestor::mn:annex">
+					<xsl:attribute name="font-size">11pt</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
+			<xsl:if test="$level &gt;= 3">
+				<xsl:attribute name="font-size">10pt</xsl:attribute>
+			</xsl:if>
+
+			<xsl:if test="ancestor::mn:preface">
+				<xsl:attribute name="font-size">14pt</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="ancestor::mn:introduction and $level &gt;= 2">
+				<xsl:attribute name="font-size">10pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="(($layoutVersion = '1987' and $doctype = 'technical-report') or ($layoutVersion = '1979' and $doctype = 'addendum'))">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+			<xsl:if test="$level = 2">
+				<xsl:attribute name="font-size">10pt</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="$level &gt;= 3">
+				<xsl:attribute name="font-size">9pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
+			<!-- copy @id from empty preceding clause -->
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:clause and count(node()) = 0]/@id"/>
+		</xsl:if>
+
+		<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::mn:introduction)">
+
+				<xsl:if test="($revision_date_num &lt; 19690101) or ancestor::mn:preface or (parent::mn:introduction and $revision_date_num &gt;= 19680101)">
+				<xsl:attribute name="text-align">center</xsl:attribute>
+				</xsl:if>
+
+				<xsl:attribute name="text-transform">uppercase</xsl:attribute>
+
+				<xsl:if test="ancestor::mn:preface or ancestor::mn:introduction">
+					<xsl:attribute name="font-weight">normal</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$layoutVersion = '1972'">
+			<xsl:if test="$level = 1">
+				<xsl:attribute name="text-transform">uppercase</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$layoutVersion = '1987' and ../@type = 'section'">
+			<xsl:attribute name="font-size">14pt</xsl:attribute>
+			<xsl:attribute name="text-align">center</xsl:attribute>
+			<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
+			<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$element-name = 'fo:inline'">
+			<xsl:if test="not($lang = 'zh')">
+				<xsl:attribute name="padding-right">2mm</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:variable name="attribute-name-before">
+			<xsl:choose>
+				<xsl:when test="ancestor::mn:preface and $level = 1">margin-top</xsl:when> <!-- for Foreword and Introduction titles -->
+				<xsl:otherwise>space-before</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:attribute name="{$attribute-name-before}"> <!-- space-before or margin-top -->
+			<xsl:choose>
+				<xsl:when test="$layoutVersion = '1951' and ancestor::mn:preface and $level = 1">20mm</xsl:when>
+				<xsl:when test="$layoutVersion = '1951' and $level = 1 and $revision_date_num &gt;= 19680101">12pt</xsl:when>
+				<xsl:when test="ancestor::mn:introduction and $level &gt;= 2 and ../preceding-sibling::mn:clause">30pt</xsl:when>
+				<xsl:when test="(($layoutVersion = '1987' and $doctype = 'technical-report') or ($layoutVersion = '1979' and $doctype = 'addendum')) and ancestor::mn:preface and $level = 1">10mm</xsl:when>
+				<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num &lt;= 19981231)) and ancestor::mn:preface and $level = 1">62mm</xsl:when>
+				<xsl:when test="$layoutVersion = '1972' and $level = 1">30pt</xsl:when>
+				<xsl:when test="$layoutVersion = '1989' and ancestor::mn:preface and $level = 1">56pt</xsl:when>
+				<xsl:when test="$layoutVersion = '2024' and ancestor::mn:preface and $level = 1">0pt</xsl:when>
+				<xsl:when test="ancestor::mn:preface">8pt</xsl:when>
+				<xsl:when test="$level = 2 and ancestor::mn:annex">18pt</xsl:when>
+				<xsl:when test="$level = 1">18pt</xsl:when>
+				<xsl:when test="($level = 2 or $level = 3) and not(../preceding-sibling::mn: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::mn: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>
+				<xsl:when test="$level = ''">6pt</xsl:when>
+				<xsl:otherwise>12pt</xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+		<!-- $namespace = 'iso' -->
+		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
+	</xsl:template> <!-- refine_title-style -->
+
 	<xsl:template name="processPrefaceSectionsDefault">
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -18872,6 +18983,12 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="reset-margins-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="clause-style">
 
 	</xsl:attribute-set>
@@ -19926,8 +20043,9 @@
 
 	<xsl:template name="setTextAlignment">
 		<xsl:param name="default">left</xsl:param>
+		<xsl:param name="skip_default">false</xsl:param>
 		<xsl:variable name="align" select="normalize-space(@align)"/>
-		<xsl:attribute name="text-align">
+		<xsl:variable name="text_align">
 			<xsl:choose>
 				<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
 				<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
@@ -19935,9 +20053,13 @@
 				<xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
 				<xsl:when test="ancestor::mn:td/@align"><xsl:value-of select="ancestor::mn:td/@align"/></xsl:when>
 				<xsl:when test="ancestor::mn:th/@align"><xsl:value-of select="ancestor::mn:th/@align"/></xsl:when>
+				<xsl:when test="$skip_default = 'true'"/>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
-		</xsl:attribute>
+		</xsl:variable>
+		<xsl:if test="normalize-space($text_align) != ''">
+			<xsl:attribute name="text-align"><xsl:value-of select="$text_align"/></xsl:attribute>
+		</xsl:if>
 		<xsl:if test="$align = 'indent'">
 			<xsl:attribute name="margin-left">7mm</xsl:attribute>
 		</xsl:if>
@@ -19945,8 +20067,10 @@
 
 	<xsl:template name="setBlockAttributes">
 		<xsl:param name="text_align_default">left</xsl:param>
+		<xsl:param name="skip_text_align_default">false</xsl:param>
 		<xsl:call-template name="setTextAlignment">
 			<xsl:with-param name="default" select="$text_align_default"/>
+			<xsl:with-param name="skip_default" select="$skip_text_align_default"/>
 		</xsl:call-template>
 		<xsl:call-template name="setKeepAttributes"/>
 		<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">