metanorma-iso 3.1.1 → 3.1.2

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

@@ -321,10 +321,19 @@
 		</xsl:for-each>
 	</xsl:variable>
 
-	<xsl:variable name="editorialgroup_">
+	<xsl:variable name="approvalgroup_">
 		<!-- Example: ISO/TC 46/SC 2 -->
 		<!-- ISO/SG SMART/SG TS/AG 1 -->
-		<xsl:variable name="approvalgroup" select="normalize-space(/mn:metanorma/mn:bibdata/mn:ext/mn:approvalgroup/@identifier)"/>
+		<!-- <xsl:variable name="approvalgroup" select="normalize-space(/mn:metanorma/mn:bibdata/mn:ext/mn:approvalgroup/@identifier)"/> -->
+		<xsl:variable name="contributor_authorizer_">
+			<xsl:copy-of select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'authorizer' and mn:description[normalize-space(@language) = ''] = 'Technical committee']]"/>
+		</xsl:variable>
+		<xsl:variable name="contributor_authorizer" select="xalan:nodeset($contributor_authorizer_)"/>
+		<xsl:variable name="organization_abbreviation" select="normalize-space($contributor_authorizer/mn:contributor/mn:organization/mn:abbreviation)"/>
+		<xsl:variable name="approvalgroup">
+			<xsl:if test="$organization_abbreviation = 'ISO' or      contains($organization_abbreviation, 'ISO/') or     contains($organization_abbreviation, '/ISO')"><xsl:value-of select="concat($organization_abbreviation, '/')"/></xsl:if>
+			<xsl:value-of select="normalize-space($contributor_authorizer/mn:contributor/mn:organization/mn:subdivision/mn:identifier[@type = 'full'])"/>
+		</xsl:variable>
 		<xsl:variable name="parts_by_slash">
 			<xsl:call-template name="split">
 				<xsl:with-param name="pText" select="$approvalgroup"/>
@@ -365,7 +374,7 @@
 			</xsl:choose>
 		</xsl:for-each>
 	</xsl:variable>
-	<xsl:variable name="editorialgroup" select="xalan:nodeset($editorialgroup_)"/>
+	<xsl:variable name="approvalgroup" select="xalan:nodeset($approvalgroup_)"/>
 
 	<xsl:variable name="secretariat_">
 		<xsl:variable name="value" select="normalize-space(/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:secretariat)"/>
@@ -882,11 +891,9 @@
 				<xsl:choose>
 					<xsl:when test="$layoutVersion = '1951'">
 						<fo:page-sequence master-reference="document{$document-master-reference_addon}" 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="insertFootnoteSeparatorCommon"/>
+
 							<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>
@@ -1076,7 +1083,7 @@
 										<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:static-content flow-name="xsl-footnote-separator" role="artifact">
 											<fo:block margin-bottom="6pt">
 												<fo:leader leader-pattern="rule" leader-length="51mm" rule-thickness="0.5pt"/>
 											</fo:block>
@@ -1086,7 +1093,7 @@
 										<xsl:with-param name="font-weight">normal</xsl:with-param>
 										<xsl:with-param name="is_footer">true</xsl:with-param>
 									</xsl:call-template>
-									<fo:flow flow-name="xsl-region-body" line-height="115%">
+									<fo:flow flow-name="xsl-region-body" line-height="115%" role="SKIP">
 
 										<xsl:if test="position() = 1">
 
@@ -1230,7 +1237,7 @@
 								<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:static-content flow-name="xsl-footnote-separator" role="artifact">
 								<fo:block>
 									<xsl:if test="$layoutVersion = '2024'">
 										<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -1249,7 +1256,7 @@
 								<xsl:with-param name="border_around_page" select="$border_around_page"/>
 								<xsl:with-param name="insert_header_first" select="normalize-space(position() = 1)"/>
 							</xsl:call-template>
-							<fo:flow flow-name="xsl-region-body">
+							<fo:flow flow-name="xsl-region-body" role="SKIP">
 
 								<!-- Information and documentation — Codes for transcription systems -->
 								<!-- <fo:block-container>
@@ -1874,10 +1881,18 @@
 															</xsl:choose>
 														</xsl:when>
 														<!-- <xsl:when test="$stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM'"><xsl:value-of select="$doctype_uppercased"/></xsl:when> -->
-														<xsl:when test="$stagename-header-coverpage != ''">
+														<xsl:when test="$stagename-header-coverpage != '' or normalize-space($stagename_localized_coverpage) != ''">
 															<xsl:attribute name="margin-top">12pt</xsl:attribute>
 
-															<xsl:value-of select="$stagename-header-coverpage"/>
+															<xsl:choose>
+																<xsl:when test="normalize-space($stagename_localized_coverpage) != ''">
+																	<!-- FINAL DRAFT<br/>International Standard-->
+																	<xsl:apply-templates select="xalan:nodeset($stagename_localized_coverpage)/node()"/>
+																</xsl:when>
+																<xsl:otherwise>
+																	<xsl:value-of select="$stagename-header-coverpage"/>
+																</xsl:otherwise>
+															</xsl:choose>
 
 															<!-- if there is iteration number, then print it -->
 															<xsl:variable name="iteration" select="number(/mn:metanorma/mn:bibdata/mn:status/mn:iteration)"/>
@@ -1891,6 +1906,7 @@
 																<xsl:when test="$doctype = 'amendment'">
 																	<xsl:value-of select="$updates-document-type_str"/>
 																</xsl:when>
+																<xsl:when test="normalize-space($stagename_localized_coverpage) != ''"/>
 																<xsl:otherwise>
 																	<xsl:value-of select="$doctype_localized"/>
 																</xsl:otherwise>
@@ -1973,108 +1989,128 @@
 												</fo:block>
 											</fo:block-container>
 										</fo:table-cell>
-										<fo:table-cell number-columns-spanned="2" padding-left="6mm">
-											<fo:block margin-top="2.5mm" line-height="1.1" role="SKIP">
+										<fo:table-cell number-columns-spanned="2" number-rows-spanned="2" padding-left="6mm">
 
-												<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="18pt" font-weight="bold" margin-bottom="3mm">
-															<xsl:value-of select="$edition_and_date"/>
-														</fo:block>
-													</xsl:if>
-												</xsl:if>
+											<fo:table width="100%" table-layout="fixed">
+												<fo:table-body>
+													<fo:table-row height="85mm">
+														<fo:table-cell>
 
-												<xsl:if test="$doctype = 'amendment'"> <!-- and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM') -->
-													<fo:block font-size="15pt" font-weight="bold" margin-bottom="3mm">
-														<xsl:value-of select="$doctype_uppercased"/>
-														<xsl:text> </xsl:text>
-														<xsl:variable name="amendment-number" select="/mn:metanorma/mn:bibdata/mn:ext/mn:structuredidentifier/mn:project-number/@amendment"/>
-														<xsl:if test="normalize-space($amendment-number) != ''">
-															<xsl:value-of select="$amendment-number"/><xsl:text> </xsl:text>
-														</xsl:if>
-													</fo:block>
-												<!-- </xsl:if>
-											
-												<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')"> -->
-													<xsl:if test="/mn:metanorma/mn:bibdata/mn:date[@type = 'updated']">
-														<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
-															<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'updated']"/>
-														</fo:block>
-													</xsl:if>
-												</xsl:if>
+															<fo:block margin-top="2.5mm" line-height="1.1" role="SKIP">
 
-												<xsl:variable name="date_corrected" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'corrected'])"/>
-												<xsl:if test="$date_corrected != ''">
-													<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"/>
-													</fo:block>
-												</xsl:if>
+																<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="18pt" font-weight="bold" margin-bottom="3mm">
+																			<xsl:value-of select="$edition_and_date"/>
+																		</fo:block>
+																	</xsl:if>
+																</xsl:if>
 
-												<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or              $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS' or              $stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
-													<xsl:if test="normalize-space($editorialgroup) != ''">
-														<fo:block margin-bottom="3mm">
-															<xsl:copy-of select="$editorialgroup"/>
-														</fo:block>
-													</xsl:if>
-													<xsl:if test="normalize-space($secretariat) != ''">
-														<fo:block margin-bottom="3mm">
-															<xsl:copy-of select="$secretariat"/>
-														</fo:block>
-													</xsl:if>
-												</xsl:if>
+																<xsl:if test="$doctype = 'amendment'"> <!-- and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM') -->
+																	<fo:block font-size="15pt" font-weight="bold" margin-bottom="3mm">
+																		<xsl:value-of select="$doctype_uppercased"/>
+																		<xsl:text> </xsl:text>
+																		<xsl:variable name="amendment-number" select="/mn:metanorma/mn:bibdata/mn:ext/mn:structuredidentifier/mn:project-number/@amendment"/>
+																		<xsl:if test="normalize-space($amendment-number) != ''">
+																			<xsl:value-of select="$amendment-number"/><xsl:text> </xsl:text>
+																		</xsl:if>
+																	</fo:block>
+																<!-- </xsl:if>
+															
+																<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')"> -->
+																	<xsl:if test="/mn:metanorma/mn:bibdata/mn:date[@type = 'updated']">
+																		<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
+																			<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'updated']"/>
+																		</fo:block>
+																	</xsl:if>
+																</xsl:if>
 
-												<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or                   $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS'">
+																<xsl:variable name="date_corrected" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'corrected'])"/>
+																<xsl:if test="$date_corrected != ''">
+																	<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"/>
+																	</fo:block>
+																</xsl:if>
 
-													<fo:block margin-bottom="3mm">
-													<!-- Voting begins on: -->
-														<xsl:value-of select="concat($i18n_voting_begins_on, ':')"/>
-														<fo:block font-weight="bold">
-															<xsl:variable name="v_date">
-																<xsl:call-template name="split">
-																	<xsl:with-param name="pText">
-																		<xsl:call-template name="insertVoteStarted"/>
-																	</xsl:with-param>
-																	<xsl:with-param name="sep" select="'-'"/>
-																	<xsl:with-param name="keep_sep">true</xsl:with-param>
-																</xsl:call-template>
-															</xsl:variable>
-															<xsl:for-each select="xalan:nodeset($v_date)/mnx:item">
-																<xsl:choose>
-																	<xsl:when test=". = '-'"><fo:inline font-weight="normal"><xsl:value-of select="."/></fo:inline></xsl:when>
-																	<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-																</xsl:choose>
-															</xsl:for-each>
-														</fo:block>
-													</fo:block>
+																<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or                  $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS' or                  $stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
+																	<xsl:if test="normalize-space($approvalgroup) != ''">
+																		<fo:block margin-bottom="3mm">
+																			<xsl:copy-of select="$approvalgroup"/>
+																		</fo:block>
+																	</xsl:if>
+																	<xsl:if test="normalize-space($secretariat) != ''">
+																		<fo:block margin-bottom="3mm">
+																			<xsl:copy-of select="$secretariat"/>
+																		</fo:block>
+																	</xsl:if>
+																</xsl:if>
 
-													<fo:block margin-bottom="3mm">
-														<!-- Voting terminates on: -->
-														<xsl:value-of select="concat($i18n_voting_terminates_on, ':')"/>
-														<fo:block font-weight="bold">
-															<xsl:variable name="v_date">
-																<xsl:call-template name="split">
-																	<xsl:with-param name="pText">
-																		<xsl:call-template name="insertVoteEnded"/>
-																	</xsl:with-param>
-																	<xsl:with-param name="sep" select="'-'"/>
-																	<xsl:with-param name="keep_sep">true</xsl:with-param>
-																</xsl:call-template>
-															</xsl:variable>
-															<xsl:for-each select="xalan:nodeset($v_date)/mnx:item">
-																<xsl:choose>
-																	<xsl:when test=". = '-'"><fo:inline font-weight="normal"><xsl:value-of select="."/></fo:inline></xsl:when>
-																	<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-																</xsl:choose>
-															</xsl:for-each>
-														</fo:block>
-													</fo:block>
-												</xsl:if>
-											</fo:block>
+																<xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or                       $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS'">
+
+																	<fo:block margin-bottom="3mm">
+																	<!-- Voting begins on: -->
+																		<xsl:value-of select="concat($i18n_voting_begins_on, ':')"/>
+																		<fo:block font-weight="bold">
+																			<xsl:variable name="v_date">
+																				<xsl:call-template name="split">
+																					<xsl:with-param name="pText">
+																						<xsl:call-template name="insertVoteStarted"/>
+																					</xsl:with-param>
+																					<xsl:with-param name="sep" select="'-'"/>
+																					<xsl:with-param name="keep_sep">true</xsl:with-param>
+																				</xsl:call-template>
+																			</xsl:variable>
+																			<xsl:for-each select="xalan:nodeset($v_date)/mnx:item">
+																				<xsl:choose>
+																					<xsl:when test=". = '-'"><fo:inline font-weight="normal"><xsl:value-of select="."/></fo:inline></xsl:when>
+																					<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+																				</xsl:choose>
+																			</xsl:for-each>
+																		</fo:block>
+																	</fo:block>
+
+																	<fo:block margin-bottom="3mm">
+																		<!-- Voting terminates on: -->
+																		<xsl:value-of select="concat($i18n_voting_terminates_on, ':')"/>
+																		<fo:block font-weight="bold">
+																			<xsl:variable name="v_date">
+																				<xsl:call-template name="split">
+																					<xsl:with-param name="pText">
+																						<xsl:call-template name="insertVoteEnded"/>
+																					</xsl:with-param>
+																					<xsl:with-param name="sep" select="'-'"/>
+																					<xsl:with-param name="keep_sep">true</xsl:with-param>
+																				</xsl:call-template>
+																			</xsl:variable>
+																			<xsl:for-each select="xalan:nodeset($v_date)/mnx:item">
+																				<xsl:choose>
+																					<xsl:when test=". = '-'"><fo:inline font-weight="normal"><xsl:value-of select="."/></fo:inline></xsl:when>
+																					<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+																				</xsl:choose>
+																			</xsl:for-each>
+																		</fo:block>
+																	</fo:block>
+																</xsl:if>
+															</fo:block>
+														</fo:table-cell>
+													</fo:table-row>
+													<fo:table-row height="85mm">
+														<fo:table-cell padding-left="-1mm" display-align="after">
+															<fo:block font-size="7pt" margin-right="20mm" font-family="Cambria">
+																<xsl:if test="$lang = 'ru'">
+																	<xsl:attribute name="margin-right">10mm</xsl:attribute>
+																</xsl:if>
+																<xsl:call-template name="insertDraftComments"/>
+															</fo:block>
+														</fo:table-cell>
+													</fo:table-row>
+												</fo:table-body>
+											</fo:table>
 
 										</fo:table-cell>
 									</fo:table-row>
@@ -2147,14 +2183,7 @@
 												</xsl:if>
 											</fo:block>
 										</fo:table-cell>
-										<fo:table-cell number-columns-spanned="2" padding-top="-3mm" padding-left="5mm" display-align="after">
-											<xsl:if test="$lang = 'fr'">
-												<xsl:attribute name="padding-top">-18mm</xsl:attribute>
-											</xsl:if>
-											<fo:block font-size="7pt" margin-right="20mm" font-family="Cambria">
-												<xsl:call-template name="insertDraftComments"/>
-											</fo:block>
-										</fo:table-cell>
+
 									</fo:table-row>
 
 									<fo:table-row height="13mm">
@@ -2199,10 +2228,14 @@
 											<xsl:if test="$stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM'">
 												<xsl:attribute name="font-size">7pt</xsl:attribute>
 											</xsl:if>
-											<!-- margin-top="-30mm"  -->
-											<fo:block> <!-- margin-top="-100mm" -->
+											<!-- <fo:block>
 												<xsl:call-template name="insertDraftComments"/>
-											</fo:block>
+											</fo:block> -->
+											<fo:block-container position="absolute" top="-47mm" width="52mm" height="100mm" role="SKIP">
+												<fo:block>
+													<xsl:call-template name="insertDraftComments"/>
+												</fo:block>
+											</fo:block-container>
 										</fo:table-cell>
 										<fo:table-cell role="SKIP">
 											<fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
@@ -2252,46 +2285,10 @@
 																		</xsl:choose>
 																	</xsl:variable>
 
-																	<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:copyright/mn:owner/mn:organization">
-																		<xsl:choose>
-																			<xsl:when test="mn:logo/mn:image">
-																				<xsl:apply-templates select="mn:logo/mn:image"/>
-																			</xsl:when>
-																			<xsl:when test="mn:abbreviation = 'ISO'">
-																				<xsl:choose>
-																					<xsl:when test="$layoutVersion = '1989' and $revision_date_num &lt; 19930101">
-																						<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-ISO-Logo-1987))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image ISO Logo"/>
-																					</xsl:when>
-																					<xsl:otherwise>
-																						<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-ISO-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image ISO Logo"/>
-																					</xsl:otherwise>
-																				</xsl:choose>
-																			</xsl:when>
-																			<xsl:when test="mn:abbreviation = 'IEC'">
-																				<xsl:choose>
-																					<xsl:when test="$layoutVersion = '1989' and $revision_date_num &lt; 19930101">
-																						<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEC-Logo-1989))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IEC Logo"/>
-																					</xsl:when>
-																					<xsl:otherwise>
-																						<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEC-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IEC Logo"/>
-																					</xsl:otherwise>
-																				</xsl:choose>
-																			</xsl:when>
-																			<xsl:when test="mn:abbreviation = 'IEEE'"/>
-																			<xsl:when test="mn:abbreviation = 'IDF' or mn:name = 'IDF'">
-																				<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IDF-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IDF Logo"/>
-																			</xsl:when>
-																			<xsl:otherwise/>
-																		</xsl:choose>
-																		<xsl:if test="position() != last()">
-																			<fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
-																		</xsl:if>
-																	</xsl:for-each>
-																	<xsl:if test="$copyrightAbbrIEEE != ''">
-																		<fo:block>
-																			<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEEE-Logo))}" content-height="11mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
-																		</fo:block>
-																	</xsl:if>
+																	<xsl:call-template name="insertLogoImages">
+																		<xsl:with-param name="content-height" select="$content-height"/>
+																	</xsl:call-template>
+
 																</fo:block>
 															</fo:table-cell>
 															<fo:table-cell display-align="center" role="SKIP">
@@ -2349,7 +2346,7 @@
 													</fo:table-cell>
 													<fo:table-cell>
 														<fo:block margin-bottom="3mm">
-															<xsl:copy-of select="$editorialgroup"/>
+															<xsl:copy-of select="$approvalgroup"/>
 														</fo:block>
 													</fo:table-cell>
 													<fo:table-cell>
@@ -2582,7 +2579,7 @@
 																		<fo:table-row role="SKIP">
 																			<fo:table-cell role="SKIP">
 																				<fo:block>
-																					<xsl:copy-of select="$editorialgroup"/>
+																					<xsl:copy-of select="$approvalgroup"/>
 																				</fo:block>
 																			</fo:table-cell>
 																			<fo:table-cell role="SKIP">
@@ -2612,7 +2609,7 @@
 															<xsl:if test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS'">
 																<fo:block-container border="0.5mm solid black" width="51mm" role="SKIP">
 																	<fo:block margin="2mm" role="SKIP">
-																			<fo:block margin-bottom="8pt"><xsl:copy-of select="$editorialgroup"/></fo:block>
+																			<fo:block margin-bottom="8pt"><xsl:copy-of select="$approvalgroup"/></fo:block>
 																			<fo:block margin-bottom="6pt"><xsl:copy-of select="$secretariat"/></fo:block>
 																			<fo:block margin-bottom="6pt">
 																				<!-- Voting begins on: -->
@@ -2851,10 +2848,10 @@
 									</xsl:otherwise>
 								</xsl:choose>
 
-								<xsl:if test="normalize-space($editorialgroup) != ''">
+								<xsl:if test="normalize-space($approvalgroup) != ''">
 									<!-- ISO/TC 34/SC 4/WG 3 -->
 									<fo:block margin-bottom="12pt">
-										<xsl:copy-of select="$editorialgroup"/>
+										<xsl:copy-of select="$approvalgroup"/>
 									</fo:block>
 								</xsl:if>
 
@@ -2964,86 +2961,137 @@
 		</xsl:choose>
 	</xsl:template>
 
-	<xsl:template name="insertLogoImages2024">
-		<xsl:variable name="content-height">20</xsl:variable>
-		<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:copyright/mn:owner/mn:organization">
-			<xsl:variable name="owner_number" select="count(ancestor::mn:copyright/preceding-sibling::mn:copyright) + 1"/>
-			<!-- https://github.com/metanorma/metanorma-iso/issues/1386 -->
-			<xsl:variable name="logo_width_">
-				<xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[starts-with(local-name(), 'logo-publisher-pdf-width-')]">
-					<xsl:if test="local-name() = concat('logo-publisher-pdf-width-', $owner_number)">
-						<xsl:value-of select="."/>
+	<xsl:template name="insertLogoImages">
+		<xsl:param name="content-height"/>
+		<xsl:choose>
+			<xsl:when test="mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description[normalize-space(@language) = ''] = 'Technical committee']/mn:organization">
+				<xsl:for-each select="mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description[normalize-space(@language) = ''] = 'Technical committee']/mn:organization">
+
+					<xsl:variable name="items">
+						<xsl:call-template name="split_abbreviation"/>
+					</xsl:variable>
+
+					<xsl:for-each select="xalan:nodeset($items)//mnx:item">
+						<xsl:call-template name="insertLogoImage">
+							<xsl:with-param name="content-height" select="$content-height"/>
+						</xsl:call-template>
+						<xsl:if test="position() != last()">
+							<fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
+						</xsl:if>
+					</xsl:for-each>
+					<xsl:if test="position() != last()">
+						<fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
 					</xsl:if>
 				</xsl:for-each>
-			</xsl:variable>
-			<xsl:variable name="logo_width">
-				<xsl:choose>
-					<xsl:when test="normalize-space($logo_width_) != '' and normalize-space(translate($logo_width_, '1234567890', '')) = ''"><xsl:value-of select="$logo_width_"/>px</xsl:when>
-					<xsl:otherwise><xsl:value-of select="$logo_width_"/></xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			<xsl:variable name="logo_height_">
-				<xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[starts-with(local-name(), 'logo-publisher-pdf-height-')]">
-					<xsl:if test="local-name() = concat('logo-publisher-pdf-height-', $owner_number)">
-						<xsl:value-of select="."/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:copyright/mn:owner/mn:organization">
+					<xsl:call-template name="insertLogoImage">
+						<xsl:with-param name="content-height" select="$content-height"/>
+					</xsl:call-template>
+					<xsl:if test="position() != last()">
+						<fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
 					</xsl:if>
 				</xsl:for-each>
-			</xsl:variable>
-			<xsl:variable name="logo_height">
-				<xsl:choose>
-					<xsl:when test="normalize-space($logo_height_) != '' and normalize-space(translate($logo_height_, '1234567890', '')) = ''"><xsl:value-of select="$logo_height_"/>px</xsl:when>
-					<xsl:otherwise><xsl:value-of select="$logo_height_"/></xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-		<!-- 	<fo:block>logo_width=<xsl:value-of select="$logo_width"/></fo:block>
-			<fo:block>logo_height=<xsl:value-of select="$logo_height"/></fo:block> -->
+			</xsl:otherwise>
+		</xsl:choose>
+		<xsl:if test="$copyrightAbbrIEEE != ''">
+			<fo:block>
+				<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEEE-Logo))}" content-height="11mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template name="split_abbreviation">
+		<xsl:variable name="items">
 			<xsl:choose>
-				<xsl:when test="mn:logo/mn:image">
-					<xsl:choose>
-						<xsl:when test="normalize-space($logo_width) != '' or normalize-space($logo_height) != ''">
-							<xsl:variable name="logo_image">
-								<xsl:for-each select="mn:logo/mn:image"> <!-- set context to logo/image -->
-									<xsl:element name="logo" namespace="{$namespace_full}">
-										<xsl:element name="image" namespace="{$namespace_full}">
-											<xsl:copy-of select="@*"/>
-											<xsl:if test="$logo_width != ''">
-												<xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
-											</xsl:if>
-											<xsl:if test="$logo_height != ''">
-												<xsl:attribute name="height"><xsl:value-of select="$logo_height"/></xsl:attribute>
-											</xsl:if>
-											<xsl:copy-of select="node()"/>
-										</xsl:element>
-									</xsl:element>
-								</xsl:for-each>
-							</xsl:variable>
-							<xsl:apply-templates select="xalan:nodeset($logo_image)//mn:logo/mn:image"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:apply-templates select="mn:logo/mn:image"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when>
-				<xsl:when test="mn:abbreviation = 'ISO'">
-					<fo:instream-foreign-object content-height="{$content-height}mm" fox:alt-text="Image ISO Logo">
-						<xsl:copy-of select="$Image-ISO-Logo-SVG"/>
-					</fo:instream-foreign-object>
-				</xsl:when>
-				<xsl:when test="mn:abbreviation = 'IEC'">
-					<fo:instream-foreign-object content-height="{$content-height}mm" fox:alt-text="Image IEC Logo">
-						<xsl:copy-of select="$Image-IEC-Logo-SVG"/>
-					</fo:instream-foreign-object>
-				</xsl:when>
-				<xsl:when test="mn:abbreviation = 'IEEE'"/>
-				<xsl:when test="mn:abbreviation = 'IDF' or mn:name = 'IDF'">
-					<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IDF-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IDF Logo"/>
+				<!-- ISO/IEC -->
+				<xsl:when test="contains(mn:abbreviation, '/')">
+					<xsl:call-template name="split">
+						<xsl:with-param name="pText" select="mn:abbreviation"/>
+						<xsl:with-param name="sep">/</xsl:with-param>
+					</xsl:call-template>
 				</xsl:when>
-				<xsl:otherwise/>
+				<xsl:otherwise>
+					<mnx:item><xsl:value-of select="mn:abbreviation"/></mnx:item>
+				</xsl:otherwise>
 			</xsl:choose>
-			<xsl:if test="position() != last()">
-				<fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
-			</xsl:if>
+		</xsl:variable>
+		<xsl:for-each select="xalan:nodeset($items)//mnx:item">
+			<xsl:copy>
+				<mn:abbreviation><xsl:value-of select="."/></mn:abbreviation>
+			</xsl:copy>
 		</xsl:for-each>
+	</xsl:template>
+
+	<xsl:template name="insertLogoImage">
+		<xsl:param name="content-height"/>
+		<xsl:choose>
+			<xsl:when test="mn:logo/mn:image">
+				<xsl:apply-templates select="mn:logo/mn:image"/>
+			</xsl:when>
+			<xsl:when test="mn:abbreviation = 'ISO'">
+				<xsl:choose>
+					<xsl:when test="$layoutVersion = '1989' and $revision_date_num &lt; 19930101">
+						<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-ISO-Logo-1987))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image ISO Logo"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-ISO-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image ISO Logo"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:when test="mn:abbreviation = 'IEC'">
+				<xsl:choose>
+					<xsl:when test="$layoutVersion = '1989' and $revision_date_num &lt; 19930101">
+						<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEC-Logo-1989))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IEC Logo"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEC-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IEC Logo"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:when test="mn:abbreviation = 'IEEE'"/>
+			<xsl:when test="mn:abbreviation = 'IDF' or mn:name = 'IDF'">
+				<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IDF-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IDF Logo"/>
+			</xsl:when>
+			<xsl:otherwise/>
+		</xsl:choose>
+	</xsl:template>
+
+	<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[normalize-space(@language) = ''] = 'Technical committee']/mn:organization">
+				<xsl:for-each select="mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description[normalize-space(@language) = ''] = 'Technical committee']/mn:organization">
+
+					<xsl:variable name="items">
+						<xsl:call-template name="split_abbreviation"/>
+					</xsl:variable>
+
+					<xsl:for-each select="xalan:nodeset($items)//mnx:item">
+						<xsl:call-template name="insertLogoImage2024">
+							<xsl:with-param name="content-height" select="$content-height"/>
+						</xsl:call-template>
+						<xsl:if test="position() != last()">
+							<fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
+						</xsl:if>
+					</xsl:for-each>
+					<xsl:if test="position() != last()">
+						<fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
+					</xsl:if>
+				</xsl:for-each>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:copyright/mn:owner/mn:organization">
+					<xsl:call-template name="insertLogoImage2024">
+						<xsl:with-param name="content-height" select="$content-height"/>
+					</xsl:call-template>
+					<xsl:if test="position() != last()">
+						<fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
+					</xsl:if>
+				</xsl:for-each>
+			</xsl:otherwise>
+		</xsl:choose>
 		<xsl:if test="$copyrightAbbrIEEE != ''">
 			<fo:block margin-top="2mm">
 				<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEEE-Logo2))}" content-width="{$content-height * 2 + 2}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image IEEE Logo"/>
@@ -3051,6 +3099,84 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="insertLogoImage2024">
+		<xsl:param name="content-height"/>
+		<xsl:variable name="owner_number" select="count(ancestor::mn:copyright/preceding-sibling::mn:copyright) + 1"/>
+		<!-- https://github.com/metanorma/metanorma-iso/issues/1386 -->
+		<xsl:variable name="logo_width_">
+			<xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[starts-with(local-name(), 'logo-publisher-pdf-width-')]">
+				<xsl:if test="local-name() = concat('logo-publisher-pdf-width-', $owner_number)">
+					<xsl:value-of select="."/>
+				</xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="logo_width">
+			<xsl:choose>
+				<xsl:when test="normalize-space($logo_width_) != '' and normalize-space(translate($logo_width_, '1234567890', '')) = ''"><xsl:value-of select="$logo_width_"/>px</xsl:when>
+				<xsl:otherwise><xsl:value-of select="$logo_width_"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="logo_height_">
+			<xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[starts-with(local-name(), 'logo-publisher-pdf-height-')]">
+				<xsl:if test="local-name() = concat('logo-publisher-pdf-height-', $owner_number)">
+					<xsl:value-of select="."/>
+				</xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="logo_height">
+			<xsl:choose>
+				<xsl:when test="normalize-space($logo_height_) != '' and normalize-space(translate($logo_height_, '1234567890', '')) = ''"><xsl:value-of select="$logo_height_"/>px</xsl:when>
+				<xsl:otherwise><xsl:value-of select="$logo_height_"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+	<!-- 	<fo:block>logo_width=<xsl:value-of select="$logo_width"/></fo:block>
+		<fo:block>logo_height=<xsl:value-of select="$logo_height"/></fo:block> -->
+		<xsl:choose>
+			<xsl:when test="mn:logo/mn:image">
+				<xsl:choose>
+					<xsl:when test="normalize-space($logo_width) != '' or normalize-space($logo_height) != ''">
+						<xsl:variable name="logo_image">
+							<xsl:for-each select="mn:logo/mn:image"> <!-- set context to logo/image -->
+								<xsl:element name="logo" namespace="{$namespace_full}">
+									<xsl:element name="image" namespace="{$namespace_full}">
+										<xsl:copy-of select="@*"/>
+										<xsl:if test="$logo_width != ''">
+											<xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
+										</xsl:if>
+										<xsl:if test="$logo_height != ''">
+											<xsl:attribute name="height"><xsl:value-of select="$logo_height"/></xsl:attribute>
+										</xsl:if>
+										<xsl:copy-of select="node()"/>
+									</xsl:element>
+								</xsl:element>
+							</xsl:for-each>
+						</xsl:variable>
+						<xsl:apply-templates select="xalan:nodeset($logo_image)//mn:logo/mn:image"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="mn:logo/mn:image"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:when test="mn:abbreviation = 'ISO'">
+				<fo:instream-foreign-object content-height="{$content-height}mm" fox:alt-text="Image ISO Logo">
+					<xsl:copy-of select="$Image-ISO-Logo-SVG"/>
+				</fo:instream-foreign-object>
+			</xsl:when>
+			<xsl:when test="mn:abbreviation = 'IEC'">
+				<fo:instream-foreign-object content-height="{$content-height}mm" fox:alt-text="Image IEC Logo">
+					<xsl:copy-of select="$Image-IEC-Logo-SVG"/>
+				</fo:instream-foreign-object>
+			</xsl:when>
+			<xsl:when test="mn:abbreviation = 'IEEE'"/>
+			<xsl:when test="mn:abbreviation = 'IDF' or mn:name = 'IDF'">
+				<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IDF-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IDF Logo"/>
+			</xsl:when>
+			<xsl:otherwise/>
+		</xsl:choose>
+
+	</xsl:template>
+
 	<xsl:template name="insertTitlesLangMain">
 		<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and @type = 'title-intro']"/>
 		<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and @type = 'title-main']"/>
@@ -15773,7 +15899,7 @@
 
 	<xsl:template name="insertFootnoteSeparatorCommon">
 		<xsl:param name="leader_length">30%</xsl:param>
-		<fo:static-content flow-name="xsl-footnote-separator">
+		<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
 			<fo:block>
 				<fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
 			</fo:block>
@@ -16674,12 +16800,18 @@
 		<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-title-page-style">
 		<xsl:attribute name="font-weight">normal</xsl:attribute>
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="role">SKIP</xsl:attribute>
 	</xsl:attribute-set> <!-- toc-title-page-style -->
 
+	<xsl:template name="refine_toc-title-page-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-item-block-style">
 	</xsl:attribute-set>
 
@@ -16709,7 +16841,7 @@
 	<xsl:attribute-set name="toc-leader-style">
 		<xsl:attribute name="font-size">9pt</xsl:attribute>
 		<xsl:attribute name="font-weight">normal</xsl:attribute>
-			<xsl:attribute name="leader-pattern">dots</xsl:attribute>
+		<xsl:attribute name="leader-pattern">dots</xsl:attribute>
 	</xsl:attribute-set> <!-- END: toc-leader-style -->
 
 	<xsl:attribute-set name="toc-pagenumber-style">
@@ -16722,6 +16854,9 @@
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-listof-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-listof-item-block-style">
 	</xsl:attribute-set>
 
@@ -17069,7 +17204,7 @@
 								</xsl:if>
 
 								<xsl:for-each select="$contents_nodes/mnx:doc">
-									<fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
+									<fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
 										<xsl:if test="@bundle = 'true'">
 											<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
 										</xsl:if>
@@ -17103,7 +17238,7 @@
 											</xsl:choose>
 										</fo:bookmark-title>
 
-										<xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
+										<xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
 
 										<xsl:call-template name="insertFigureBookmarks">
 											<xsl:with-param name="contents" select="mnx:contents"/>
@@ -18265,6 +18400,7 @@
 		<xsl:if test="$pos &gt;= 2">
 			<xsl:attribute name="space-before">18pt</xsl:attribute>
 		</xsl:if>
+		<xsl:attribute name="role">Sect</xsl:attribute>
 	</xsl:template> <!-- sections_element_style -->
 
 	<xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
@@ -18278,6 +18414,7 @@
 
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block>
+			<xsl:attribute name="role">Sect</xsl:attribute>
 			<xsl:call-template name="setId"/>
 			<xsl:call-template name="addReviewHelper"/>
 			<xsl:apply-templates/>
@@ -18339,6 +18476,7 @@
 				<xsl:call-template name="setNamedDestination"/>
 
 				<fo:block id="{@id}">
+					<xsl:attribute name="role">Sect</xsl:attribute>
 
 					<xsl:call-template name="setBlockSpanAll"/>