metanorma-ieee 1.5.3 → 1.5.5

data/lib/isodoc/ieee/ieee.amendment.xsl

@@ -85,6 +85,7 @@
 		</xsl:choose>
 	</xsl:variable>
 
+	<!-- title_prefix isn't using, keep here just for further checking the titles generated by Metanorma -->
 	<xsl:variable name="title_prefix">
 		<xsl:choose>
 			<xsl:when test="$current_template = 'draft'">
@@ -116,6 +117,11 @@
 
 	<xsl:variable name="line-height">1.8</xsl:variable>
 
+	<xsl:variable name="page_break_between_sections" select="normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:page-break-between-sections)"/>
+
+	<xsl:variable name="developed_by">Developed by the</xsl:variable>
+	<xsl:variable name="sponsored_by">Sponsored by the</xsl:variable>
+
 	<xsl:template name="layout-master-set">
 		<fo:layout-master-set>
 
@@ -132,7 +138,7 @@
 
 			<!-- IEEE standard cover page -->
 			<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
-				<fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
+				<fo:region-body margin-top="52mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/> <!-- margin-top="62mm" -->
 				<fo:region-before region-name="header" extent="62mm" precedence="true"/>
 				<fo:region-after region-name="footer" extent="25mm"/>
 				<fo:region-start region-name="left-region" extent="21.2mm"/>
@@ -228,6 +234,14 @@
 				<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
 			</fo:simple-page-master>
 
+			<fo:simple-page-master master-name="document-draft-two-columns" 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="2" column-gap="10mm"/>
+				<fo:region-before region-name="header" extent="{$marginTop}mm"/>
+				<fo:region-after region-name="footer" extent="{$marginBottom}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>
+
 			<!-- landscape -->
 			<fo:simple-page-master master-name="document-draft-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 				<fo:region-body margin-top="{$marginLeftRight1}mm" margin-bottom="{$marginLeftRight2}mm" margin-left="{$marginBottom}mm" margin-right="{$marginTop}mm"/>
@@ -242,16 +256,21 @@
 			<!-- ======================= -->
 			<!-- Standard document pages -->
 			<!-- ======================= -->
-			<fo:simple-page-master master-name="document-standard-first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="document-standard-first-page" 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"/>
 				<fo:region-before region-name="header_empty" extent="{$marginTop}mm"/>
 				<fo:region-after region-name="footer" extent="{$marginBottom}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:page-sequence-master master-name="document-standard-first">
+				<fo:repeatable-page-master-alternatives>
+					<fo:conditional-page-master-reference page-position="first" master-reference="document-standard-first-page"/>
+					<fo:conditional-page-master-reference page-position="any" master-reference="document-draft"/>
+				</fo:repeatable-page-master-alternatives>
+			</fo:page-sequence-master>
 			<fo:page-sequence-master master-name="document-standard">
 				<fo:repeatable-page-master-alternatives>
-					<fo:conditional-page-master-reference page-position="first" master-reference="document-standard-first"/>
 					<fo:conditional-page-master-reference page-position="any" master-reference="document-draft"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
@@ -336,12 +355,17 @@
 
 					<xsl:variable name="approved_date_year" select="substring(normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'issued']),1,4)"/>
 
+					<xsl:variable name="designation" select="/mn:metanorma/mn:bibdata/mn:docnumber"/>
+
 					<!-- IEEE Std 802.1X™-2020 -->
-					<xsl:variable name="standard_number">IEEE Std <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'IEEE']"/>-<xsl:value-of select="$approved_date_year"/></xsl:variable>
+					<!-- <xsl:variable name="standard_number">IEEE Std <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'IEEE']"/>-<xsl:value-of select="$approved_date_year"/></xsl:variable> -->
+					<xsl:variable name="standard_number_" select="/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'IEEE']"/>
+					<xsl:variable name="regex_tm" select="concat('(', $designation, ')', '(-\d{4})?')"/>
+					<xsl:variable name="standard_number" select="java:replaceAll(java:java.lang.String.new($standard_number_), $regex_tm,'$1™$2')"/>
+
 					<!-- <xsl:value-of select="substring(/mn:metanorma/mn:bibdata/mn:date[@type = 'published'],1,4)"/> -->
 
-					<xsl:variable name="designation" select="/mn:metanorma/mn:bibdata/mn:docnumber"/>
-					<xsl:variable name="draft_number" select="/mn:metanorma/mn:bibdata/mn:version/mn:draft"/>
+					<!-- <xsl:variable name="draft_number" select="/mn:metanorma/mn:bibdata/mn:version/mn:draft"/> -->
 					<xsl:variable name="revision_month" select="/mn:metanorma/mn:bibdata/mn:version/mn:revision-date"/>
 					<xsl:variable name="draft_month">
 						<xsl:call-template name="getMonthLocalizedByNum">
@@ -350,28 +374,21 @@
 					</xsl:variable>
 					<xsl:variable name="draft_year" select="substring($revision_month, 1, 4)"/>
 
-					<xsl:variable name="title_intro">
-						<!-- Example Local and Metropolitan Area Networks— -->
-						<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[@language = 'en']/node()"/>
-						<!-- <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[@language = 'intro' or @language = 'intro-en']/node()"/>
-						<xsl:if test="not(/mn:metanorma/mn:bibdata/mn:title[@language = 'intro' or @language = 'intro-en'])">
-						</xsl:if>
-						<xsl:if test="/mn:metanorma/mn:bibdata/mn:title[@language = 'intro' or @language = 'intro-en' or @language = 'en'] and /mn:metanorma/mn:bibdata/mn:title[@language = 'main' or @language = 'main-en']">—</xsl:if> -->
-					</xsl:variable>
-
+					<!-- <xsl:variable name="title_intro"> -->
 					<xsl:variable name="title_main">
-						<!-- Example: Port-Based Network Access Control -->
-						<!-- <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[@language = 'main' or @language = 'main-en']/node()"/> -->
+						<!-- Example: IEEE Standard Example Local and Metropolitan Area Networks -->
+						<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[@language = 'en' and @type = 'main']/node()"/>
 					</xsl:variable>
 
+					<xsl:variable name="docidentifier_draft" select="/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'IEEE-draft']"/>
+
 					<xsl:variable name="title">
 						<xsl:choose>
 							<xsl:when test="$current_template = 'standard'">
-								<xsl:copy-of select="$title_intro"/>
 								<xsl:copy-of select="$title_main"/>
 							</xsl:when>
 							<xsl:otherwise>
-								<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[1]/node()"/>
+								<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[@language = 'en' and @type = 'main']/node()"/>
 
 								<!-- Example: Amendment # -->
 								<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
@@ -397,16 +414,18 @@
 						</xsl:if>
 					</xsl:variable>
 
+					<!-- for page header -->
 					<xsl:variable name="document_id">
 						<xsl:choose>
 							<xsl:when test="$current_template = 'draft'">
 								<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
 									<xsl:text>IEEE </xsl:text>
 								</xsl:if>
-								<xsl:text>P</xsl:text>
+								<!-- <xsl:text>P</xsl:text>
 								<xsl:value-of select="$designation"/>
 								<xsl:text>/D</xsl:text>
-								<xsl:value-of select="$draft_number"/>
+								<xsl:value-of select="$draft_number"/> -->
+								<xsl:value-of select="$docidentifier_draft"/>
 								<xsl:text>, </xsl:text>
 								<xsl:value-of select="$draft_month"/>
 								<xsl:text> </xsl:text>
@@ -419,10 +438,19 @@
 					</xsl:variable>
 
 					<!-- <xsl:variable name="society" select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:society"/>  -->
-					<xsl:variable name="society" select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'authorizer']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Society']/mn:name"/>
+					<xsl:variable name="society">
+						<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'authorizer']/mn:description = 'committee'][1]/mn:organization">
+							<xsl:value-of select="normalize-space(concat(mn:abbreviation, ' ', mn:subdivision[@type = 'Society']/mn:name))"/>
+						</xsl:for-each>
+					</xsl:variable>
 
 					<!-- <xsl:variable name="committee" select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee"/> -->
-					<xsl:variable name="committee" select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'authorizer']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Committee']/mn:name"/>
+					<xsl:variable name="committee" select="normalize-space(/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'authorizer']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Committee']/mn:name)"/>
+
+					<xsl:variable name="enabler_">
+						<xsl:copy-of select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'enabler']]/mn:organization/node()"/>
+					</xsl:variable>
+					<xsl:variable name="enabler" select="xalan:nodeset($enabler_)"/>
 
 					<xsl:variable name="approved_by">IEEE SA Standards Board</xsl:variable>
 					<xsl:variable name="approved_date">
@@ -477,24 +505,25 @@
 					<xsl:call-template name="cover-page">
 						<xsl:with-param name="num" select="$num"/>
 						<xsl:with-param name="document_id" select="$document_id"/>
+						<xsl:with-param name="docidentifier_draft" select="$docidentifier_draft"/>
 						<xsl:with-param name="title" select="$title"/>
 						<xsl:with-param name="society" select="$society"/>
 						<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
 						<xsl:with-param name="copyright_year" select="$copyright_year"/>
 						<xsl:with-param name="designation" select="$designation"/>
-						<xsl:with-param name="draft_number" select="$draft_number"/>
+						<!-- <xsl:with-param name="draft_number" select="$draft_number"/> -->
 						<xsl:with-param name="committee" select="$committee"/>
+						<xsl:with-param name="enabler" select="$enabler"/>
 						<xsl:with-param name="approved_date" select="$approved_date"/>
 						<xsl:with-param name="approved_by" select="$approved_by"/>
-						<xsl:with-param name="title_intro" select="$title_intro"/>
 						<xsl:with-param name="title_main" select="$title_main"/>
 						<xsl:with-param name="standard_number" select="$standard_number"/>
 						<xsl:with-param name="history_text" select="$history_text"/>
 					</xsl:call-template>
 
 					<xsl:variable name="title_standard_coverpage_">
-						<xsl:choose>
-							<!-- title starts with lower-cased letter -->
+						<!-- <xsl:choose>
+							title starts with lower-cased letter
 							<xsl:when test="translate(substring($title_intro,1,1),$lower,'') = ''">
 								<fo:block font-size="18pt">
 									<xsl:value-of select="$title_prefix"/>
@@ -502,20 +531,22 @@
 								</fo:block>
 							</xsl:when>
 							<xsl:otherwise>
-								<!-- Example: IEEE Standard for -->
+								Example: IEEE Standard for
 								<fo:block font-size="18pt">
 								<xsl:value-of select="$title_prefix"/>
 							</fo:block>
 								<fo:block font-size="18pt" margin-left="6mm">
-									<!-- Example Local and Metropolitan Area Networks— -->
+									Example Local and Metropolitan Area Networks—
 									<xsl:copy-of select="$title_intro"/>
 								</fo:block>
 							</xsl:otherwise>
-						</xsl:choose>
-						<fo:block font-size="24pt" space-before="12pt">
-							<!-- Example: Port-Based Network Access Control -->
+						</xsl:choose> -->
+
+						<fo:block font-size="23pt"> <!-- 18pt -->
+							<!-- <xsl:value-of select="$title_prefix"/> -->
 							<xsl:copy-of select="$title_main"/>
 						</fo:block>
+
 					</xsl:variable>
 					<xsl:variable name="title_standard_coverpage" select="xalan:nodeset($title_standard_coverpage_)"/>
 
@@ -531,9 +562,7 @@
 
 								<xsl:call-template name="insertHeaderFooter">
 									<xsl:with-param name="document_id" select="$document_id"/>
-									<xsl:with-param name="title_prefix" select="$title_prefix"/>
 									<xsl:with-param name="title" select="$title"/>
-									<xsl:with-param name="doctype" select="$doctype"/>
 									<xsl:with-param name="copyright_year" select="$copyright_year"/>
 									<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
 									<xsl:with-param name="hideFooter"><xsl:if test="not(contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != '')">false</xsl:if></xsl:with-param>
@@ -561,37 +590,54 @@
 								<xsl:call-template name="insertFootnoteSeparator"/>
 
 								<xsl:call-template name="insertHeaderFooter">
-									<xsl:with-param name="doctype" select="$doctype"/>
 									<xsl:with-param name="copyright_year" select="$copyright_year"/>
 									<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
-									<xsl:with-param name="hideHeader">true</xsl:with-param>
+									<!-- <xsl:with-param name="hideHeader">true</xsl:with-param> -->
+									<xsl:with-param name="hideFooter">true</xsl:with-param>
 								</xsl:call-template>
 
 								<fo:flow flow-name="xsl-region-body">
-									<fo:block text-align="right" margin-top="2mm">
+									<fo:block text-align="right" margin-top="-11.5mm" id="__internal_layout__titlepage_{generate-id()}"> <!-- margin-top="2mm" -->
 										<fo:block font-size="12pt" font-weight="bold"><xsl:value-of select="$standard_number"/></fo:block>
 										<fo:block font-size="9pt"><xsl:value-of select="$history_text"/></fo:block>
 									</fo:block>
 
-									<fo:block font-weight="bold" space-before="13mm">
-										<xsl:copy-of select="$title_standard_coverpage"/>
-									</fo:block>
+									<fo:block-container width="105%"> <!-- width="135mm" -->
+										<fo:block font-weight="bold" space-before="25.5mm" line-height="1.15"> <!--  space-before="13mm" -->
+											<xsl:copy-of select="$title_standard_coverpage"/>
+										</fo:block>
+									</fo:block-container>
 
-									<fo:block font-size="10pt" space-before="9mm" space-after="4pt">Developed by the</fo:block>
-									<fo:block font-size="11pt" font-weight="bold">
-										<!-- Example: LAN/MAN Standards Committee -->
-										<xsl:value-of select="$committee"/>
-										<xsl:value-of select="$linebreak"/>
-										<xsl:text>of the</xsl:text>
-										<xsl:value-of select="$linebreak"/>
-										<!-- Example: IEEE Computer Society -->
-										<xsl:text>IEEE </xsl:text><xsl:value-of select="$society"/>
-										<xsl:value-of select="$linebreak"/>
-									</fo:block>
+									<xsl:if test="$committee != ''">
+										<fo:block font-size="10pt" space-before="11mm" space-after="4pt"><xsl:value-of select="$developed_by"/></fo:block>
+										<fo:block font-size="11pt" font-weight="bold" margin-top="4mm">
+											<!-- Example: LAN/MAN Standards Committee -->
+											<fo:block line-height="1.12"><xsl:value-of select="$committee"/></fo:block>
+											<fo:block font-weight="normal" font-size="10pt">of the</fo:block>
+											<!-- Example: IEEE Computer Society -->
+											<fo:block><xsl:value-of select="$society"/></fo:block>
+										</fo:block>
+									</xsl:if>
+
+									<xsl:if test="normalize-space($enabler) != ''">
+										<fo:block font-size="10pt" space-before="9mm" space-after="4pt"><xsl:value-of select="$sponsored_by"/></fo:block>
+										<fo:block font-size="11pt" font-weight="bold" margin-top="4mm">
+											<!-- Sponsored by the
+												LAN/MAN Standards Committee -->
+											<xsl:for-each select="$enabler/mn:subdivision">
+												<fo:block line-height="1.12"><xsl:value-of select="mn:subdivision/mn:name"/></fo:block>
+												<fo:block font-weight="normal" font-size="10pt">of the</fo:block>
+												<fo:block><xsl:value-of select="concat(../mn:abbreviation, ' ', mn:name)"/></fo:block>
+												<xsl:if test="position() != last()">
+													<fo:block font-weight="normal" font-size="10pt">and the</fo:block>
+												</xsl:if>
+											</xsl:for-each>
+										</fo:block>
+									</xsl:if>
 
 									<fo:block font-size="10pt" space-before="8mm" space-after="4pt">Approved <xsl:value-of select="$approved_date"/></fo:block>
 									<!-- Example: IEEE SA Standards Board -->
-									<fo:block font-size="11pt" font-weight="bold"><xsl:value-of select="$approved_by"/></fo:block>
+									<fo:block font-size="11pt" font-weight="bold" margin-top="4mm"><xsl:value-of select="$approved_by"/></fo:block>
 
 									<fo:block break-after="page"/>
 
@@ -628,26 +674,27 @@
 								</fo:flow>
 							</fo:page-sequence>
 
-							<fo:page-sequence master-reference="document-draft" force-page-count="no-force">
+							<!-- Example:
+								Important Notices and Disclaimers Concerning IEEE Standards Documents
+								IEEE Standards documents are made available for use subject to important notices and legal disclaimers. These notices and disclaimers, or a reference to this page (https://standards.ieee.org/ipr/disclaimers.html), appear in all standards and may be found under the heading “Important Notices and Disclaimers Concerning IEEE Standards Documents.”
+								...
+							-->
+							<fo:page-sequence master-reference="document-draft-two-columns" force-page-count="no-force">
 								<xsl:call-template name="insertFootnoteSeparator"/>
 								<xsl:call-template name="insertHeaderFooter">
 									<xsl:with-param name="document_id" select="$document_id"/>
-									<xsl:with-param name="title_prefix" select="$title_prefix"/>
 									<xsl:with-param name="title" select="$title"/>
-									<xsl:with-param name="doctype" select="$doctype"/>
 									<xsl:with-param name="copyright_year" select="$copyright_year"/>
 									<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
 								</xsl:call-template>
 
 								<fo:flow flow-name="xsl-region-body">
-									<fo:block>
-										<!-- Example:
-										Important Notices and Disclaimers Concerning IEEE Standards Documents
-										IEEE Standards documents are made available for use subject to important notices and legal disclaimers. These notices and disclaimers, or a reference to this page (https://standards.ieee.org/ipr/disclaimers.html), appear in all standards and may be found under the heading “Important Notices and Disclaimers Concerning IEEE Standards Documents.”
-										...
-										-->
-										<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
-									</fo:block>
+
+									<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
+
+									<xsl:if test="not(/mn:metanorma/mn:boilerplate/mn:legal-statement/*)">
+										<fo:block> </fo:block>
+									</xsl:if>
 								</fo:flow>
 							</fo:page-sequence>
 						</xsl:when> <!-- $current_template = 'standard' -->
@@ -656,7 +703,6 @@
 							<fo:page-sequence master-reference="document-nonstandard" force-page-count="no-force" font-family="Calibri Light">
 
 								<xsl:call-template name="insertHeaderFooter">
-									<xsl:with-param name="doctype" select="$doctype"/>
 									<xsl:with-param name="copyright_year" select="$copyright_year"/>
 									<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
 									<xsl:with-param name="hideHeader">true</xsl:with-param>
@@ -696,22 +742,14 @@
 					<!-- End Second page(s) -->
 					<!-- =================== -->
 
+					<xsl:variable name="updated_xml_with_pages">
+						<xsl:call-template name="processPrefaceAndMainSectionsIEEE_items"/>
+					</xsl:variable>
+
 					<!-- ================================ -->
 					<!-- PREFACE pages (Introduction, Contents -->
 					<!-- ================================ -->
 
-					<xsl:variable name="structured_xml_preface">
-						<xsl:apply-templates select="/*/mn:preface/mn:introduction" mode="flatxml"/>
-					</xsl:variable>
-
-					<!-- structured_xml_preface=<xsl:copy-of select="$structured_xml_preface"/> -->
-
-					<xsl:variable name="paged_xml_preface">
-						<xsl:call-template name="makePagedXML">
-							<xsl:with-param name="structured_xml" select="$structured_xml_preface"/>
-						</xsl:call-template>
-					</xsl:variable>
-
 					<xsl:if test="$debug = 'true'">
 						<redirect:write file="contents_.xml">
 							<xsl:copy-of select="$contents"/>
@@ -721,34 +759,53 @@
 					<xsl:choose>
 
 						<xsl:when test="$current_template = 'standard' or $current_template = 'draft'">
-							<fo:page-sequence master-reference="document-draft" id="prefaceSequence"> <!-- format="i" initial-page-number="1" -->
 
-								<xsl:call-template name="insertFootnoteSeparator"/>
+							<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
 
-								<xsl:call-template name="insertHeaderFooter">
-									<xsl:with-param name="document_id" select="$document_id"/>
-									<xsl:with-param name="title_prefix" select="$title_prefix"/>
-									<xsl:with-param name="title" select="$title"/>
-									<xsl:with-param name="doctype" select="$doctype"/>
-									<xsl:with-param name="copyright_year" select="$copyright_year"/>
-									<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
-								</xsl:call-template>
+								<!-- <xsl:for-each select=".//mn:page_sequence[parent::mn:preface][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]"> -->
+								<xsl:for-each select=".//mn:page_sequence[mn:introduction]">
 
-								<fo:flow flow-name="xsl-region-body">
+									<fo:page-sequence master-reference="document-draft"> <!-- format="i" initial-page-number="1" -->
 
-									<fo:block>
-										<xsl:for-each select="xalan:nodeset($paged_xml_preface)/mn:page">
-											<xsl:apply-templates select="*" mode="page"/>
-											<fo:block break-after="page"/>
-										</xsl:for-each>
-									</fo:block>
+										<xsl:call-template name="insertFootnoteSeparator"/>
 
-									<xsl:apply-templates select="/*/mn:preface/mn:clause[@type = 'toc']">
-										<xsl:with-param name="num" select="$num"/>
-									</xsl:apply-templates>
+										<xsl:call-template name="insertHeaderFooter">
+											<xsl:with-param name="document_id" select="$document_id"/>
+											<xsl:with-param name="title" select="$title"/>
+											<xsl:with-param name="copyright_year" select="$copyright_year"/>
+											<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
+										</xsl:call-template>
+
+										<fo:flow flow-name="xsl-region-body">
+
+											<fo:block>
+												<xsl:apply-templates/>
+											</fo:block>
+
+										</fo:flow>
+									</fo:page-sequence>
+								</xsl:for-each>
+							</xsl:for-each>
+
+							<xsl:for-each select="/*/mn:preface/mn:clause[@type = 'toc']">
+								<fo:page-sequence master-reference="document-draft">
+									<xsl:call-template name="insertFootnoteSeparator"/>
+
+									<xsl:call-template name="insertHeaderFooter">
+										<xsl:with-param name="document_id" select="$document_id"/>
+										<xsl:with-param name="title" select="$title"/>
+										<xsl:with-param name="copyright_year" select="$copyright_year"/>
+										<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
+									</xsl:call-template>
+
+									<fo:flow flow-name="xsl-region-body">
+										<xsl:apply-templates select=".">
+											<xsl:with-param name="num" select="$num"/>
+										</xsl:apply-templates>
+									</fo:flow>
+								</fo:page-sequence>
+							</xsl:for-each>
 
-								</fo:flow>
-							</fo:page-sequence>
 						</xsl:when> <!-- 'standard' or 'draft' -->
 
 						<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
@@ -760,7 +817,6 @@
 							<fo:page-sequence master-reference="page-toc" force-page-count="no-force">
 
 								<xsl:call-template name="insertHeaderFooter">
-									<xsl:with-param name="doctype" select="$doctype"/>
 									<xsl:with-param name="copyright_year" select="$copyright_year"/>
 									<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
 									<xsl:with-param name="hideHeader">true</xsl:with-param>
@@ -806,232 +862,283 @@
 					</xsl:choose>
 
 					<!-- ================================ -->
-					<!-- END: PREFACE pages (Table of Contents, Foreword -->
+					<!-- END: PREFACE pages (Introduction, Table of Contents  -->
 					<!-- ================================ -->
 
-					<!-- item - page sequence -->
-					<xsl:variable name="structured_xml_">
+					<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
 
-						<xsl:choose>
+						<!-- Introduction, Acknowledgements, Abstract for whitepaper and report  -->
+						<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
+							<xsl:for-each select=".//mn:page_sequence[parent::mn:preface][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
+								<xsl:call-template name="insert_page-sequence">
+									<xsl:with-param name="document_id" select="$document_id"/>
+									<xsl:with-param name="title" select="$title"/>
+									<xsl:with-param name="doctype" select="$doctype"/>
+									<xsl:with-param name="copyright_year" select="$copyright_year"/>
+									<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
+									<xsl:with-param name="is_first_sequence" select="normalize-space(position() = 1)"/>
+								</xsl:call-template>
+							</xsl:for-each>
+						</xsl:if>
 
-							<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
+						<xsl:for-each select=".//mn:page_sequence[parent::mn:sections][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
+							<xsl:call-template name="insert_page-sequence">
+								<xsl:with-param name="document_id" select="$document_id"/>
+								<xsl:with-param name="title" select="$title"/>
+								<xsl:with-param name="doctype" select="$doctype"/>
+								<xsl:with-param name="copyright_year" select="$copyright_year"/>
+								<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
+								<xsl:with-param name="is_first_sequence" select="normalize-space(position() = 1)"/>
+							</xsl:call-template>
+						</xsl:for-each>
 
-								<item>
-									<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:introduction" mode="flatxml"/>
-								</item>
+						<!-- Annexes, Bibliography and Index -->
+						<xsl:for-each select=".//mn:page_sequence[not(parent::mn:preface) and not(parent::mn:sections)][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
+							<xsl:call-template name="insert_page-sequence">
+								<xsl:with-param name="document_id" select="$document_id"/>
+								<xsl:with-param name="title" select="$title"/>
+								<xsl:with-param name="doctype" select="$doctype"/>
+								<xsl:with-param name="copyright_year" select="$copyright_year"/>
+								<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
+							</xsl:call-template>
+						</xsl:for-each>
 
-								<item>
-									<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:acknowledgements" mode="flatxml"/>
-								</item>
+					</xsl:for-each>
 
-								<item>
-									<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract" mode="flatxml"/>
-								</item>
+					<!-- ===================== -->
+					<!-- End IEEE pages -->
+					<!-- ===================== -->
 
-								<xsl:for-each select="/*/mn:sections/*"> <!-- each section starts with a new page -->
-									<item>
-										<xsl:apply-templates select="." mode="flatxml"/>
-									</item>
-								</xsl:for-each>
-							</xsl:when> <!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
+					<xsl:call-template name="back-page"/>
 
-							<xsl:when test="$current_template = 'standard'">
-								<xsl:for-each select="/*/mn:sections/*"> <!-- each section starts with a new page -->
-									<item>
-										<xsl:apply-templates select="." mode="flatxml"/>
-									</item>
-								</xsl:for-each>
-							</xsl:when> <!-- $current_template = 'standard' -->
+					<xsl:if test="not(xalan:nodeset($updated_xml_with_pages)//mn:page_sequence[*])">
+						<fo:page-sequence master-reference="document-nonstandard" force-page-count="no-force">
+							<fo:flow flow-name="xsl-region-body">
+								<fo:block><!-- prevent fop error for empty document --></fo:block>
+							</fo:flow>
+						</fo:page-sequence>
+					</xsl:if>
 
-							<xsl:otherwise>
-								<item>
-									<xsl:apply-templates select="/*/mn:sections/*" mode="flatxml"/>
-								</item>
-							</xsl:otherwise>
-						</xsl:choose>
+				</xsl:for-each>
+			</xsl:for-each> <!-- END of //metanorma (former ieee-standard) iteration -->
 
-						<!-- Annexes -->
-						<xsl:for-each select="/*/mn:annex">
-							<item>
-								<xsl:apply-templates select="." mode="flatxml"/>
-							</item>
-						</xsl:for-each>
+			<xsl:if test="not(//mn:metanorma)">
+				<fo:page-sequence master-reference="document-nonstandard" force-page-count="no-force">
+					<fo:flow flow-name="xsl-region-body">
+						<fo:block><!-- prevent fop error for empty document --></fo:block>
+					</fo:flow>
+				</fo:page-sequence>
+			</xsl:if>
 
-						<!-- Bibliography -->
-						<xsl:for-each select="/*/mn:bibliography/*">
-							<item><xsl:apply-templates select="." mode="flatxml"/></item>
-						</xsl:for-each>
+		</fo:root>
+	</xsl:template>
 
-						<item>
-							<xsl:copy-of select="//mn:indexsect"/>
-						</item>
+	<xsl:template name="processPrefaceAndMainSectionsIEEE_items">
+		<xsl:variable name="updated_xml_step_move_pagebreak">
+			<xsl:element name="{$root_element}" namespace="{$namespace_full}">
+				<xsl:call-template name="copyCommonElements"/>
 
-					</xsl:variable>
+				<xsl:element name="preface" namespace="{$namespace_full}"> <!-- save context element -->
+					<xsl:element name="page_sequence" namespace="{$namespace_full}">
+						<xsl:for-each select="/*/mn:preface/mn:introduction">
+							<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+						</xsl:for-each>
+					</xsl:element>
 
-					<!-- page break before each section -->
-					<xsl:variable name="structured_xml">
-						<xsl:for-each select="xalan:nodeset($structured_xml_)/item[*]">
-							<xsl:element name="pagebreak" namespace="{$namespace_full}"/>
-							<xsl:copy-of select="./*"/>
+					<xsl:element name="page_sequence" namespace="{$namespace_full}">
+						<xsl:for-each select="/*/mn:preface/mn:acknowledgements">
+							<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
 						</xsl:for-each>
-					</xsl:variable>
+					</xsl:element>
 
-					<!-- structured_xml=<xsl:copy-of select="$structured_xml" />=end structured_xml -->
+					<xsl:element name="page_sequence" namespace="{$namespace_full}">
+						<xsl:for-each select="/*/mn:preface/mn:abstract">
+							<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+						</xsl:for-each>
+					</xsl:element>
 
-					<xsl:variable name="paged_xml">
-						<xsl:call-template name="makePagedXML">
-							<xsl:with-param name="structured_xml" select="$structured_xml"/>
-						</xsl:call-template>
-					</xsl:variable>
+				</xsl:element>
 
-					<xsl:if test="$debug = 'true'">
-						<redirect:write file="paged_xml.xml">
-							<xsl:copy-of select="$paged_xml"/>
-						</redirect:write>
-					</xsl:if>
+				<xsl:element name="sections" namespace="{$namespace_full}"> <!-- save context element -->
+					<xsl:choose>
+						<xsl:when test="$page_break_between_sections = 'true'">
+							<xsl:for-each select="/*/mn:sections/*[not(contains(@class, 'zzSTDTitle'))]"> <!-- each section starts with a new page -->
+								<xsl:element name="page_sequence" namespace="{$namespace_full}">
+									<xsl:if test="position() = 1">
+										<xsl:copy-of select="ancestor::mn:sections/*[contains(@class, 'zzSTDTitle')]"/> <!-- put title on the 1st page -->
+									</xsl:if>
+									<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+								</xsl:element>
+							</xsl:for-each>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:element name="page_sequence" namespace="{$namespace_full}">
+								<xsl:apply-templates select="/*/mn:sections/*" mode="update_xml_step_move_pagebreak"/>
+							</xsl:element>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:element>
 
-					<!-- paged_xml=<xsl:copy-of select="$paged_xml"/> -->
+				<!-- Annexes -->
+				<xsl:for-each select="/*/mn:annex">
+					<xsl:element name="page_sequence" namespace="{$namespace_full}">
+						<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+					</xsl:element>
+				</xsl:for-each>
 
-					<xsl:for-each select="xalan:nodeset($paged_xml)/mn:page[*]">
-						<fo:page-sequence master-reference="document-draft" force-page-count="no-force">
+				<!-- Bibliography -->
+				<xsl:for-each select="/*/mn:bibliography/*">
+					<xsl:element name="page_sequence" namespace="{$namespace_full}">
+						<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+					</xsl:element>
+				</xsl:for-each>
 
-							<xsl:if test="@orientation = 'landscape'">
-								<xsl:attribute name="master-reference">document-draft-<xsl:value-of select="@orientation"/></xsl:attribute>
-							</xsl:if>
+				<xsl:element name="page_sequence" namespace="{$namespace_full}">
+					<xsl:copy-of select="//mn:indexsect"/>
+				</xsl:element>
 
-							<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
-								<xsl:attribute name="master-reference">document-nonstandard</xsl:attribute>
-								<xsl:if test="@orientation = 'landscape'">
-									<xsl:attribute name="master-reference">document-nonstandard<xsl:value-of select="@orientation"/></xsl:attribute>
-								</xsl:if>
-							</xsl:if>
+			</xsl:element>
+		</xsl:variable>
 
-							<xsl:if test="$current_template = 'standard'">
-								<xsl:attribute name="master-reference">document-standard</xsl:attribute>
-								<xsl:if test="@orientation = 'landscape'">
-									<xsl:attribute name="master-reference">document-standard<xsl:value-of select="@orientation"/></xsl:attribute>
-								</xsl:if>
-							</xsl:if>
+		<xsl:variable name="updated_xml_step_move_pagebreak_filename" select="concat($output_path,'_main_', java:getTime(java:java.util.Date.new()), '.xml')"/>
 
-							<!-- <xsl:if test="position() = 1">
-								<xsl:attribute name="initial-page-number">1</xsl:attribute>
-							</xsl:if> -->
-							<xsl:if test=".//mn:indexsect">
-								<xsl:attribute name="master-reference">index</xsl:attribute>
-							</xsl:if>
+		<redirect:write file="{$updated_xml_step_move_pagebreak_filename}">
+			<xsl:copy-of select="$updated_xml_step_move_pagebreak"/>
+		</redirect:write>
 
-							<xsl:call-template name="insertFootnoteSeparator"/>
+		<xsl:copy-of select="document($updated_xml_step_move_pagebreak_filename)"/>
 
-							<xsl:choose>
-								<xsl:when test="$current_template = 'standard' or $current_template = 'draft'">
-									<xsl:call-template name="insertHeaderFooter">
-										<xsl:with-param name="document_id" select="$document_id"/>
-										<xsl:with-param name="title_prefix" select="$title_prefix"/>
-										<xsl:with-param name="title" select="$title"/>
-										<xsl:with-param name="doctype" select="$doctype"/>
-										<xsl:with-param name="copyright_year" select="$copyright_year"/>
-										<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
-										<xsl:with-param name="orientation">@orientation</xsl:with-param>
-									</xsl:call-template>
-								</xsl:when>
-								<xsl:otherwise> <!-- ($current_template = 'international-standard' and $isDraft = 'false') or $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
-									<xsl:call-template name="insertHeaderFooter">
-										<xsl:with-param name="doctype" select="$doctype"/>
-										<xsl:with-param name="copyright_year" select="$copyright_year"/>
-										<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
-										<xsl:with-param name="hideHeader">true</xsl:with-param>
-									</xsl:call-template>
-								</xsl:otherwise>
-							</xsl:choose>
+		<xsl:if test="$debug = 'true'">
+			<redirect:write file="page_sequence_preface_and_main.xml">
+				<xsl:copy-of select="$updated_xml_step_move_pagebreak"/>
+			</redirect:write>
+		</xsl:if>
 
-							<fo:flow flow-name="xsl-region-body">
-								<!-- debugpage=<xsl:copy-of select="."/> -->
+		<xsl:call-template name="deleteFile">
+			<xsl:with-param name="filepath" select="$updated_xml_step_move_pagebreak_filename"/>
+		</xsl:call-template>
 
-								<!-- <xsl:if test="position() = 1">
-									
-									<xsl:choose>
-										<xsl:when test="$current_template = 'draft'">
-											<fo:block font-family="Arial" font-size="23pt" font-weight="bold" margin-top="70pt" margin-bottom="48pt">
-											
-												<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
-													<xsl:attribute name="font-size">24pt</xsl:attribute>
-												</xsl:if>
-												
-												<xsl:copy-of select="$title_prefix"/>
-												<xsl:copy-of select="$title"/>
-												
-											</fo:block>
-										</xsl:when>
-										
-										<xsl:when test="$current_template = 'standard'">
-											<fo:block font-family="Arial" font-weight="bold" margin-top="13mm" space-after="12pt">
-												<fo:block font-weight="bold" space-before="13mm">
-													<xsl:copy-of select="$title_standard_coverpage"/>
-												</fo:block>
-											</fo:block>
-										</xsl:when>
-										
-										<xsl:otherwise>  --><!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
-
-											<!-- <xsl:attribute name="font-family">Calibri Light</xsl:attribute>
-											<xsl:attribute name="font-size">12pt</xsl:attribute>
-											
-											<fo:block font-family="Arial Black" font-size="20pt" margin-top="18pt">
-												<xsl:copy-of select="$title"/>
-											</fo:block>
-											<xsl:call-template name="addBlueBox"/>
-											<fo:block margin-bottom="12pt">&#xa0;</fo:block>
-										</xsl:otherwise>
-									</xsl:choose>
-									
-								</xsl:if> -->
+	</xsl:template> <!-- processPrefaceAndMainSectionsIEEE_items -->
 
-								<xsl:apply-templates select="*" mode="page"/>
-								<xsl:if test="position() = last()"><fo:block id="lastBlockMain"/></xsl:if>
-							</fo:flow>
-						</fo:page-sequence>
-					</xsl:for-each>
-					<!-- ===================== -->
-					<!-- End IEEE pages -->
-					<!-- ===================== -->
+	<xsl:template name="insert_page-sequence">
+		<xsl:param name="document_id"/>
+		<xsl:param name="title"/>
+		<xsl:param name="doctype"/>
+		<xsl:param name="copyright_year"/>
+		<xsl:param name="copyright_holder"/>
+		<xsl:param name="is_first_sequence"/>
 
-					<xsl:call-template name="back-page"/>
+		<fo:page-sequence master-reference="document-draft" force-page-count="no-force">
 
-					<xsl:if test="not(xalan:nodeset($paged_xml)/mn:page[*])">
-						<fo:page-sequence master-reference="document-nonstandard" force-page-count="no-force">
-							<fo:flow flow-name="xsl-region-body">
-								<fo:block><!-- prevent fop error for empty document --></fo:block>
-							</fo:flow>
-						</fo:page-sequence>
-					</xsl:if>
+			<xsl:if test="@orientation = 'landscape'">
+				<xsl:attribute name="master-reference">document-draft-<xsl:value-of select="@orientation"/></xsl:attribute>
+			</xsl:if>
 
-				</xsl:for-each>
-			</xsl:for-each> <!-- END of //metanorma (former ieee-standard) iteration -->
+			<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
+				<xsl:attribute name="master-reference">document-nonstandard</xsl:attribute>
+				<xsl:if test="@orientation = 'landscape'">
+					<xsl:attribute name="master-reference">document-nonstandard<xsl:value-of select="@orientation"/></xsl:attribute>
+				</xsl:if>
+			</xsl:if>
 
-			<xsl:if test="not(//mn:metanorma)">
-				<fo:page-sequence master-reference="document-nonstandard" force-page-count="no-force">
-					<fo:flow flow-name="xsl-region-body">
-						<fo:block><!-- prevent fop error for empty document --></fo:block>
-					</fo:flow>
-				</fo:page-sequence>
+			<xsl:if test="$current_template = 'standard'">
+				<xsl:attribute name="master-reference">document-standard<xsl:if test="position() = 1 and $is_first_sequence = 'true'">-first</xsl:if></xsl:attribute>
+				<xsl:if test="@orientation = 'landscape'">
+					<xsl:attribute name="master-reference">document-standard<xsl:value-of select="@orientation"/></xsl:attribute>
+				</xsl:if>
 			</xsl:if>
 
-		</fo:root>
-	</xsl:template>
+			<!-- <xsl:if test="position() = 1">
+				<xsl:attribute name="initial-page-number">1</xsl:attribute>
+			</xsl:if> -->
+			<xsl:if test=".//mn:indexsect">
+				<xsl:attribute name="master-reference">index</xsl:attribute>
+			</xsl:if>
+
+			<xsl:call-template name="insertFootnoteSeparator"/>
+
+			<xsl:choose>
+				<xsl:when test="$current_template = 'standard' or $current_template = 'draft'">
+					<xsl:call-template name="insertHeaderFooter">
+						<xsl:with-param name="document_id" select="$document_id"/>
+						<xsl:with-param name="title" select="$title"/>
+						<xsl:with-param name="copyright_year" select="$copyright_year"/>
+						<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
+						<xsl:with-param name="orientation">@orientation</xsl:with-param>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise> <!-- ($current_template = 'international-standard' and $isDraft = 'false') or $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
+					<xsl:call-template name="insertHeaderFooter">
+						<xsl:with-param name="copyright_year" select="$copyright_year"/>
+						<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
+						<xsl:with-param name="hideHeader">true</xsl:with-param>
+					</xsl:call-template>
+				</xsl:otherwise>
+			</xsl:choose>
+
+			<fo:flow flow-name="xsl-region-body">
+				<!-- debugpage=<xsl:copy-of select="."/> -->
+
+				<!-- <xsl:if test="position() = 1">
+					
+					<xsl:choose>
+						<xsl:when test="$current_template = 'draft'">
+							<fo:block font-family="Arial" font-size="23pt" font-weight="bold" margin-top="70pt" margin-bottom="48pt">
+							
+								<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
+									<xsl:attribute name="font-size">24pt</xsl:attribute>
+								</xsl:if>
+								
+								<xsl:copy-of select="$title_prefix"/>
+								<xsl:copy-of select="$title"/>
+								
+							</fo:block>
+						</xsl:when>
+						
+						<xsl:when test="$current_template = 'standard'">
+							<fo:block font-family="Arial" font-weight="bold" margin-top="13mm" space-after="12pt">
+								<fo:block font-weight="bold" space-before="13mm">
+									<xsl:copy-of select="$title_standard_coverpage"/>
+								</fo:block>
+							</fo:block>
+						</xsl:when>
+						
+						<xsl:otherwise>  --><!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
+
+							<!-- <xsl:attribute name="font-family">Calibri Light</xsl:attribute>
+							<xsl:attribute name="font-size">12pt</xsl:attribute>
+							
+							<fo:block font-family="Arial Black" font-size="20pt" margin-top="18pt">
+								<xsl:copy-of select="$title"/>
+							</fo:block>
+							<xsl:call-template name="addBlueBox"/>
+							<fo:block margin-bottom="12pt">&#xa0;</fo:block>
+						</xsl:otherwise>
+					</xsl:choose>
+					
+				</xsl:if> -->
+
+				<!-- <xsl:apply-templates select="*" /> --> <!--  mode="page" -->
+				<xsl:apply-templates/> <!--  mode="page" -->
+				<!-- <xsl:if test="position() = last()"><fo:block id="lastBlockMain"/></xsl:if> -->
+			</fo:flow>
+		</fo:page-sequence>
+	</xsl:template> <!-- insert_page-sequence -->
 
 	<xsl:template name="cover-page">
 		<xsl:param name="num"/>
 		<xsl:param name="document_id"/>
+		<xsl:param name="docidentifier_draft"/>
 		<xsl:param name="title"/>
 		<xsl:param name="society"/>
 		<xsl:param name="copyright_holder"/>
 		<xsl:param name="copyright_year"/>
 		<xsl:param name="designation"/>
-		<xsl:param name="draft_number"/>
+		<!-- <xsl:param name="draft_number"/> -->
 		<xsl:param name="committee"/>
+		<xsl:param name="enabler"/>
 		<xsl:param name="approved_date"/>
 		<xsl:param name="approved_by"/>
-		<xsl:param name="title_intro"/>
 		<xsl:param name="title_main"/>
 		<xsl:param name="standard_number"/>
 		<xsl:param name="history_text"/>
@@ -1065,10 +1172,7 @@
 
 					<xsl:call-template name="insertHeaderFooter">
 						<xsl:with-param name="document_id" select="$document_id"/>
-						<xsl:with-param name="title_prefix" select="$title_prefix"/>
 						<xsl:with-param name="title" select="$title"/>
-						<xsl:with-param name="doctype" select="$doctype"/>
-
 						<xsl:with-param name="copyright_year" select="$copyright_year"/>
 						<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
 						<xsl:with-param name="hideFooter">true</xsl:with-param>
@@ -1081,29 +1185,60 @@
 									<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
 										<xsl:attribute name="font-size">24pt</xsl:attribute>
 									</xsl:if>
-									<xsl:text>P</xsl:text>
+									<!-- <xsl:text>P</xsl:text>
 									<xsl:value-of select="$designation"/>
 									<xsl:text>™/D</xsl:text>
-									<xsl:value-of select="$draft_number"/>
+									<xsl:value-of select="$draft_number"/> -->
+
+									<!-- add tm after number, i.e. from P2830/D1 to P2830™/D1 -->
+									<xsl:variable name="regex_tm" select="concat('(', $designation, ')', '(-\/)?')"/>
+									<xsl:value-of select="java:replaceAll(java:java.lang.String.new($docidentifier_draft), $regex_tm,'$1™$2')"/>
+
 									<xsl:value-of select="$linebreak"/>
-									<xsl:copy-of select="$title_prefix"/>
+									<!-- <xsl:copy-of select="$title_prefix"/> -->
 									<xsl:copy-of select="$title"/>
 
 									<!-- <xsl:copy-of select="$draft_title_part"/> -->
 								</fo:block>
-								<fo:block>Developed by the</fo:block>
-								<fo:block> </fo:block>
-								<fo:block font-size="11pt" font-weight="bold">
-									<!-- <Committee Name> -->
-									<xsl:value-of select="$committee"/>
-								</fo:block>
-								<fo:block>of the</fo:block>
-								<fo:block font-size="11pt" font-weight="bold">
-									 <!-- IEEE <Society Name> -->
-									<xsl:text>IEEE </xsl:text><xsl:value-of select="$society"/>
-								</fo:block>
-								<fo:block> </fo:block>
-								<fo:block> </fo:block>
+
+								<xsl:if test="$committee != ''">
+									<fo:block><xsl:value-of select="$developed_by"/></fo:block>
+									<fo:block> </fo:block>
+									<fo:block font-size="11pt" font-weight="bold">
+										<!-- <Committee Name> -->
+										<xsl:value-of select="$committee"/>
+									</fo:block>
+									<fo:block>of the</fo:block>
+									<fo:block font-size="11pt" font-weight="bold">
+										 <!-- IEEE <Society Name> -->
+										<xsl:value-of select="$society"/>
+									</fo:block>
+									<fo:block> </fo:block>
+									<fo:block> </fo:block>
+								</xsl:if>
+
+								<xsl:if test="normalize-space($enabler) != ''">
+									<!-- Sponsored by the
+									LAN/MAN Standards Committee -->
+									<fo:block><xsl:value-of select="$sponsored_by"/></fo:block>
+									<fo:block> </fo:block>
+									<xsl:for-each select="$enabler/mn:subdivision">
+										<fo:block font-size="11pt" font-weight="bold">
+											<xsl:value-of select="mn:subdivision/mn:name"/>
+										</fo:block>
+										<fo:block>of the</fo:block>
+										<fo:block font-size="11pt" font-weight="bold">
+											<xsl:value-of select="../mn:abbreviation"/><xsl:text> </xsl:text>
+											<xsl:value-of select="mn:name"/>
+										</fo:block>
+										<xsl:if test="position() != last()">
+											<fo:block>and the</fo:block>
+										</xsl:if>
+									</xsl:for-each>
+									<fo:block> </fo:block>
+									<fo:block> </fo:block>
+								</xsl:if>
+
 								<fo:block>
 									<!-- Approved <Date Approved> -->
 									<xsl:text>Approved </xsl:text>
@@ -1174,13 +1309,12 @@
 
 			<xsl:when test="$current_template = 'standard'">
 				<xsl:call-template name="insertCoverPage_Standard">
-					<xsl:with-param name="title_intro" select="$title_intro"/>
 					<xsl:with-param name="title_main" select="$title_main"/>
 					<xsl:with-param name="society" select="$society"/>
 					<xsl:with-param name="committee" select="$committee"/>
+					<xsl:with-param name="enabler" select="$enabler"/>
 					<xsl:with-param name="standard_number" select="$standard_number"/>
 					<xsl:with-param name="history" select="$history_text"/>
-					<xsl:with-param name="standard_title_prefix" select="$title_prefix"/>
 					<xsl:with-param name="cutoff_date" select="$cutoff_date"/>
 					<xsl:with-param name="expiration_date" select="$expiration_date"/>
 				</xsl:call-template>
@@ -1220,7 +1354,7 @@
 												<xsl:attribute name="margin-top">12pt</xsl:attribute>
 											</xsl:if>
 
-											<fo:block text-align-last="justify">
+											<fo:block text-align-last="justify" role="SKIP">
 												<xsl:attribute name="margin-left"><xsl:value-of select="$margin-left * (@level - 1)"/>mm</xsl:attribute>
 												<xsl:if test="@type = 'annex'">
 													<xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -1283,14 +1417,14 @@
 
 											<xsl:attribute name="margin-left"><xsl:value-of select="$provisional-distance-between-starts * (@level - 1)"/>mm</xsl:attribute>
 
-											<fo:list-item>
-												<fo:list-item-label end-indent="label-end()">
-													<fo:block>
+											<fo:list-item role="SKIP">
+												<fo:list-item-label end-indent="label-end()" role="SKIP">
+													<fo:block role="SKIP">
 														<xsl:value-of select="@section"/>
 													</fo:block>
 												</fo:list-item-label>
-												<fo:list-item-body start-indent="body-start()">
-													<fo:block text-align-last="justify">
+												<fo:list-item-body start-indent="body-start()" role="SKIP">
+													<fo:block text-align-last="justify" role="SKIP">
 
 														<xsl:if test="@type = 'annex'">
 															<xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -1451,17 +1585,9 @@
 		<fo:block>
 			<fo:footnote>
 				<fo:inline/>
-				<fo:footnote-body font-family="Arial" font-size="7pt">
+				<fo:footnote-body xsl:use-attribute-sets="feedback-statement-style">
 
-					<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
-						<xsl:attribute name="font-family">Calibri Light</xsl:attribute>
-						<xsl:attribute name="font-size">9pt</xsl:attribute>
-						<xsl:attribute name="line-height">1.2</xsl:attribute>
-					</xsl:if>
-
-					<xsl:if test="$current_template = 'standard'">
-						<xsl:attribute name="font-size">8pt</xsl:attribute>
-					</xsl:if>
+					<xsl:call-template name="refine_feedback-statement-style"/>
 
 					<fo:block>
 						<fo:inline font-size="1pt" id="footnote_footer_{generate-id()}"><xsl:value-of select="$hair_space"/></fo:inline>
@@ -1473,7 +1599,7 @@
 	</xsl:template>
 
 	<xsl:template match="mn:boilerplate/mn:feedback-statement//mn:p" priority="2">
-		<fo:block margin-bottom="6pt">
+		<fo:block xsl:use-attribute-sets="feedback-statement-p-style">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -1485,13 +1611,17 @@
 
 	<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause[@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants']" priority="2">
 		<fo:block break-after="page"/>
-		<fo:block id="{@id}">
-			<xsl:apply-templates/>
-		</fo:block>
+		<!-- <fo:block id="{@id}" font-size="1pt" span="all">&#xa0;</fo:block> -->
+		<xsl:apply-templates/>
 	</xsl:template>
 
 	<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause[@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants']/mn:clause" priority="2">
-		<fo:block id="{@id}" space-before="12pt">
+		<fo:block id="{@id}" space-before="12pt" font-size="1pt" span="all" keep-with-next="always"> </fo:block>
+		<xsl:apply-templates/>
+	</xsl:template>
+
+	<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause[not(@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants')]" priority="2">
+		<fo:block id="{@id}" span="all">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -1501,18 +1631,10 @@
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
 		</xsl:variable>
-		<fo:block font-family="Arial" font-weight="bold" margin-bottom="12pt" space-before="18pt" keep-with-next="always" keep-together.within-column="always" role="H{$level}">
-			<xsl:attribute name="font-size">
-				<xsl:choose>
-					<xsl:when test="$level = '1'">12pt</xsl:when>
-					<xsl:otherwise>11pt</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
+		<fo:block xsl:use-attribute-sets="legal-statement-title-style" role="H{$level}">
+			<xsl:copy-of select="parent::mn:clause[@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants']/@id"/>
 
-			<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
-				<xsl:attribute name="font-family">Arial Black</xsl:attribute>
-				<xsl:attribute name="font-size">13pt</xsl:attribute>
-			</xsl:if>
+			<xsl:call-template name="refine_legal-statement-title-style"/>
 
 			<xsl:apply-templates/>
 		</fo:block>
@@ -1520,12 +1642,14 @@
 
 	<xsl:template match="mn:boilerplate/mn:legal-statement//mn:p" priority="2">
 		<xsl:choose>
-			<xsl:when test="@type = 'officemember' and not(preceding-sibling::*[1][self::mn:p][@type = 'officemember'])"> <!-- special case -->
+			<xsl:when test="(@type = 'officemember' and not(preceding-sibling::*[1][self::mn:p][@type = 'officemember'])) or    (@type = 'officeorgmember' and not(preceding-sibling::*[1][self::mn:p][@type = 'officeorgmember']))"> <!-- special case -->
+
+				<xsl:variable name="type" select="@type"/>
 
 				<xsl:variable name="officemembers_">
 					<officemember><xsl:copy-of select="node()"/></officemember>
 					<xsl:variable name="pos_curr" select="count(preceding-sibling::*) + 1"/>
-					<xsl:variable name="pos_end_" select="count(following-sibling::*[not(@type = 'officemember')][1]/preceding-sibling::*)"/>
+					<xsl:variable name="pos_end_" select="count(following-sibling::*[not(@type = $type)][1]/preceding-sibling::*)"/>
 					<xsl:variable name="pos_end">
 						<xsl:choose>
 							<xsl:when test="$pos_end_ = 0">9999</xsl:when>
@@ -1541,98 +1665,137 @@
 
 				<xsl:variable name="officemembers_count" select="count($officemembers/officemember)"/>
 
-				<xsl:variable name="cols">3</xsl:variable>
+				<xsl:variable name="cols"><xsl:choose><xsl:when test="$type = 'officemember'">3</xsl:when><xsl:otherwise>2</xsl:otherwise></xsl:choose></xsl:variable>
 
 				<xsl:variable name="mod" select="$officemembers_count mod $cols"/>
 				<xsl:variable name="floor" select="floor($officemembers_count div $cols)"/>
 
 				<xsl:variable name="max">
 					<xsl:choose>
-						<xsl:when test="$mod = 0"><xsl:value-of select="$officemembers_count div 3"/></xsl:when>
+						<xsl:when test="$mod = 0"><xsl:value-of select="$officemembers_count div $cols"/></xsl:when>
 						<xsl:otherwise><xsl:value-of select="$floor + 1"/></xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
-
-				<!-- <fo:block>DEBUG officemembers_count=<xsl:value-of select="$officemembers_count"/></fo:block> -->
-				<!-- <fo:block>mod=<xsl:value-of select="$mod"/></fo:block>
-				<fo:block>floor=<xsl:value-of select="$floor"/></fo:block>
-				<fo:block>max=<xsl:value-of select="$max"/></fo:block> -->
-
-				<!-- From https://github.com/metanorma/metanorma-ieee/issues/533#issuecomment-3178212854:
-				Algorithm:
-					3 cases: 0 extra, all balanced; 1 extra, place in middle, 2 extra, place on both sides.
-
-					The number of rows in each column is "ceil(names/cols)".
-					The number of extras is calculated as "names mod cols"
-					In the 1 extra case, place an additional line break after the "floor(names/cols)"-th item.
-					In the 2 extra case, place an additional line break after the "ceil(names/cols) + floor(names/cols)"-th item
-				-->
-
-				<xsl:variable name="number_in_each_column" select="ceiling($officemembers_count div $cols)"/>
-				<!-- <fo:block>DEBUG number_in_each_column=<xsl:value-of select="$number_in_each_column"/></fo:block> -->
-				<xsl:variable name="number_extras" select="$officemembers_count mod $cols"/>
-				<!-- <fo:block>DEBUG number_extras=<xsl:value-of select="$number_extras"/></fo:block> -->
-
-				<xsl:variable name="officemembers_updated_">
-					<xsl:for-each select="$officemembers/officemember">
-						<xsl:copy-of select="."/>
-						<xsl:choose>
-							<xsl:when test="$number_extras = 1 and position() = $floor">
-								<officemember/>
-							</xsl:when>
-							<xsl:when test="$number_extras = 2 and position() = ($number_in_each_column + $floor)">
-								<officemember/>
-							</xsl:when>
-						</xsl:choose>
-					</xsl:for-each>
-				</xsl:variable>
-				<xsl:variable name="officemembers_updated" select="xalan:nodeset($officemembers_updated_)"/>
-
-				<fo:block font-size="9pt">
-					<fo:block> </fo:block>
-					<fo:table width="100%" table-layout="fixed">
-						<fo:table-column column-width="proportional-column-width(55)"/>
-						<fo:table-column column-width="proportional-column-width(55)"/>
-						<fo:table-column column-width="proportional-column-width(42)"/>
-						<fo:table-body>
-							<xsl:for-each select="$officemembers_updated/officemember[position() &lt;= $number_in_each_column]"> <!-- $max -->
-								<fo:table-row>
-									<fo:table-cell padding-right="3mm">
-										<fo:block>
-											<xsl:apply-templates/>
-										</fo:block>
-									</fo:table-cell>
-									<fo:table-cell padding-right="3mm">
-										<fo:block>
-											<xsl:apply-templates select="following-sibling::*[number($number_in_each_column)]/node()"/> <!-- $max -->
-										</fo:block>
-									</fo:table-cell>
-									<fo:table-cell>
-										<fo:block>
-											<xsl:apply-templates select="following-sibling::*[number($number_in_each_column) * 2]/node()"/> <!-- $max -->
-										</fo:block>
-									</fo:table-cell>
-								</fo:table-row>
+
+				<xsl:choose>
+					<xsl:when test="$type = 'officemember'">
+						<!-- 3-column table -->
+
+						<!-- <fo:block>DEBUG officemembers_count=<xsl:value-of select="$officemembers_count"/></fo:block> -->
+						<!-- <fo:block>mod=<xsl:value-of select="$mod"/></fo:block>
+						<fo:block>floor=<xsl:value-of select="$floor"/></fo:block>
+						<fo:block>max=<xsl:value-of select="$max"/></fo:block> -->
+
+						<!-- From https://github.com/metanorma/metanorma-ieee/issues/533#issuecomment-3178212854:
+						Algorithm:
+							3 cases: 0 extra, all balanced; 1 extra, place in middle, 2 extra, place on both sides.
+
+							The number of rows in each column is "ceil(names/cols)".
+							The number of extras is calculated as "names mod cols"
+							In the 1 extra case, place an additional line break after the "floor(names/cols)"-th item.
+							In the 2 extra case, place an additional line break after the "ceil(names/cols) + floor(names/cols)"-th item
+						-->
+
+						<xsl:variable name="number_in_each_column" select="ceiling($officemembers_count div $cols)"/>
+						<!-- <fo:block>DEBUG number_in_each_column=<xsl:value-of select="$number_in_each_column"/></fo:block> -->
+						<xsl:variable name="number_extras" select="$officemembers_count mod $cols"/>
+						<!-- <fo:block>DEBUG number_extras=<xsl:value-of select="$number_extras"/></fo:block> -->
+
+						<xsl:variable name="officemembers_updated_">
+							<xsl:for-each select="$officemembers/officemember">
+								<xsl:copy-of select="."/>
+								<xsl:choose>
+									<xsl:when test="$number_extras = 1 and position() = $floor">
+										<officemember/>
+									</xsl:when>
+									<xsl:when test="$number_extras = 2 and position() = ($number_in_each_column + $floor)">
+										<officemember/>
+									</xsl:when>
+								</xsl:choose>
 							</xsl:for-each>
-						</fo:table-body>
-					</fo:table>
-				</fo:block>
+						</xsl:variable>
+						<xsl:variable name="officemembers_updated" select="xalan:nodeset($officemembers_updated_)"/>
+
+						<fo:block font-size="9pt" span="all">
+							<fo:block> </fo:block>
+							<fo:table width="100%" table-layout="fixed">
+								<fo:table-column column-width="proportional-column-width(55)"/>
+								<fo:table-column column-width="proportional-column-width(55)"/>
+								<fo:table-column column-width="proportional-column-width(42)"/>
+								<fo:table-body>
+									<xsl:for-each select="$officemembers_updated/officemember[position() &lt;= $number_in_each_column]"> <!-- $max -->
+										<fo:table-row>
+											<fo:table-cell padding-right="3mm">
+												<fo:block>
+													<xsl:apply-templates/>
+												</fo:block>
+											</fo:table-cell>
+											<fo:table-cell padding-right="3mm">
+												<fo:block>
+													<xsl:apply-templates select="following-sibling::*[number($number_in_each_column)]/node()"/> <!-- $max -->
+												</fo:block>
+											</fo:table-cell>
+											<fo:table-cell>
+												<fo:block>
+													<xsl:apply-templates select="following-sibling::*[number($number_in_each_column) * 2]/node()"/> <!-- $max -->
+												</fo:block>
+											</fo:table-cell>
+										</fo:table-row>
+									</xsl:for-each>
+								</fo:table-body>
+							</fo:table>
+						</fo:block>
+					</xsl:when>
+					<xsl:otherwise> <!-- $type = 'officeorgmember' -->
+						<!-- 2-column table -->
+						<fo:block span="all"> </fo:block>
+						<fo:block font-size="9pt" margin-right="10mm">
+							<xsl:for-each select="$officemembers/officemember">
+								<fo:block margin-left="4mm" text-indent="-4mm">
+									<xsl:apply-templates/>
+								</fo:block>
+							</xsl:for-each>
+							<!-- <fo:table width="100%" table-layout="fixed">
+								<fo:table-column column-width="proportional-column-width(1)"/>
+								<fo:table-column column-width="proportional-column-width(1)"/>
+								<fo:table-body>
+									<xsl:for-each select="$officemembers/officemember[position() &lt;= $max]">
+										<fo:table-row>
+											<fo:table-cell padding-right="3mm">
+												<fo:block margin-left="4mm" text-indent="-4mm">
+													<xsl:apply-templates/>
+												</fo:block>
+											</fo:table-cell>
+											<fo:table-cell padding-right="3mm">
+												<fo:block margin-left="4mm" text-indent="-4mm">
+													<xsl:apply-templates select="following-sibling::*[number($max)]/node()"/>
+												</fo:block>
+											</fo:table-cell>
+										</fo:table-row>
+									</xsl:for-each>
+								</fo:table-body>
+							</fo:table> -->
+						</fo:block>
+						<fo:block span="all"> </fo:block>
+					</xsl:otherwise>
+				</xsl:choose>
 
-				<xsl:if test="following-sibling::*[1][not(@type = 'officemember' or @type = 'emeritus_sign')]">
-					<fo:block font-size="10pt" space-after="12pt" keep-with-previous="always"> </fo:block>
+				<xsl:if test="following-sibling::*[1][not(@type = 'officemember' or @type = 'officeorgmember' or @type = 'emeritus_sign')]">
+					<fo:block font-size="10pt" space-after="12pt" keep-with-previous="always" span="all"> </fo:block>
 				</xsl:if>
-			</xsl:when> <!-- @type = 'officemember' -->
+			</xsl:when> <!-- @type = 'officemember' or @type = 'officeorgmember' -->
 
 			<xsl:when test="@type = 'officemember' and preceding-sibling::*[1][self::mn:p][@type = 'officemember']"><!-- skip --></xsl:when>
+			<xsl:when test="@type = 'officeorgmember' and preceding-sibling::*[1][self::mn:p][@type = 'officeorgmember']"><!-- skip --></xsl:when>
 
 			<xsl:when test="@type = 'emeritus_sign'">
-				<fo:block font-size="9pt" margin-left="9.4mm" space-before="6pt" space-after="12pt" keep-with-previous="always">
+				<fo:block font-size="9pt" margin-left="9.4mm" space-before="6pt" space-after="12pt" keep-with-previous="always" span="all">
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
 
 			<xsl:when test="@type = 'officeorgrepmemberhdr'">
-				<fo:block text-align-last="justify" space-after="12pt">
+				<fo:block text-align-last="justify" space-after="12pt" span="all">
 					<!-- before tab - left aligned text -->
 					<xsl:apply-templates select="mn:tab[1]/preceding-sibling::node()"/>
 					<fo:inline keep-together.within-line="always">
@@ -1644,7 +1807,7 @@
 			</xsl:when>
 
 			<xsl:when test="@type = 'officeorgrepmember'">
-				<fo:block text-align-last="justify" space-after="6pt" font-size="9pt">
+				<fo:block text-align-last="justify" space-after="6pt" font-size="9pt" span="all">
 					<!-- before tab - left aligned text -->
 					<xsl:apply-templates select="mn:tab[1]/preceding-sibling::node()"/>
 					<fo:inline keep-together.within-line="always">
@@ -1685,7 +1848,7 @@
 
 				<xsl:variable name="attributes" select="xalan:nodeset($attributes_)"/>
 
-				<fo:block space-after="12pt">
+				<fo:block space-after="12pt" span="all">
 
 					<xsl:for-each select="$attributes/attributes/@*">
 						<xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
@@ -1806,61 +1969,23 @@
 		</xsl:copy>
 	</xsl:template>
 
-	<xsl:template name="makePagedXML">
-		<xsl:param name="structured_xml"/>
+	<xsl:template match="mn:p[@class = 'zzSTDTitle1']" priority="4">
 		<xsl:choose>
-			<xsl:when test="not(xalan:nodeset($structured_xml)/mn:pagebreak)">
-				<xsl:element name="page" namespace="{$namespace_full}">
-					<xsl:copy-of select="xalan:nodeset($structured_xml)"/>
-				</xsl:element>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:for-each select="xalan:nodeset($structured_xml)/mn:pagebreak">
-
-					<xsl:variable name="pagebreak_id" select="generate-id()"/>
-					<!-- <xsl:variable name="pagebreak_previous_orientation" select="normalize-space(preceding-sibling::mn:pagebreak[1]/@orientation)"/> -->
-
-					<!-- copy elements before pagebreak -->
-					<xsl:element name="page" namespace="{$namespace_full}">
-						<xsl:if test="not(preceding-sibling::mn:pagebreak)">
-							<xsl:copy-of select="../@*"/>
-						</xsl:if>
-						<!-- copy previous pagebreak orientation -->
-						<xsl:copy-of select="preceding-sibling::mn:pagebreak[1]/@orientation"/>
-						<!-- <xsl:if test="$pagebreak_previous_orientation != ''">
-							<xsl:attribute name="orientation"><xsl:value-of select="$pagebreak_previous_orientation"/></xsl:attribute>
-						</xsl:if> -->
-						<xsl:copy-of select="preceding-sibling::node()[following-sibling::mn:pagebreak[1][generate-id(.) = $pagebreak_id]][not(self::mn:pagebreak)]"/>
-					</xsl:element>
-
-					<!-- copy elements after last page break -->
-					<xsl:if test="position() = last() and following-sibling::node()">
-						<xsl:element name="page" namespace="{$namespace_full}">
-							<xsl:copy-of select="@orientation"/>
-							<xsl:copy-of select="following-sibling::node()"/>
-						</xsl:element>
-					</xsl:if>
+			<xsl:when test="$current_template = 'draft' or $current_template = 'standard'">
+				<fo:block-container width="140mm" role="SKIP">
+					<fo:block xsl:use-attribute-sets="p-zzSTDTitle1-style">
 
-				</xsl:for-each>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
+						<xsl:call-template name="refine_p-zzSTDTitle1-style"/>
 
-	<xsl:template match="mn:p[@class = 'zzSTDTitle1']" priority="4">
-		<xsl:choose>
-			<xsl:when test="$current_template = 'draft'">
-				<fo:block font-family="Arial" font-size="23pt" font-weight="bold" margin-top="70pt" margin-bottom="48pt">
-					<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
-						<xsl:attribute name="font-size">24pt</xsl:attribute>
-					</xsl:if>
-					<xsl:apply-templates/>
-				</fo:block>
+						<xsl:apply-templates/>
+					</fo:block>
+				</fo:block-container>
 			</xsl:when>
-			<xsl:when test="$current_template = 'standard'">
+			<!-- <xsl:when test="$current_template = 'standard'">
 				<fo:block font-family="Arial" font-weight="bold" margin-top="13mm" space-after="12pt">
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 				</fo:block>
-			</xsl:when>
+			</xsl:when> -->
 			<xsl:otherwise> <!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
 
 				<fo:block font-family="Arial Black" font-size="20pt" margin-top="18pt">
@@ -2015,17 +2140,20 @@
 
 		<xsl:choose>
 			<xsl:when test="$current_template = 'standard'">
-				<fo:list-block xsl:use-attribute-sets="toc-listof-item-style">
-					<fo:list-item>
-						<fo:list-item-label end-indent="label-end()">
-							<fo:block>
+				<fo:list-block xsl:use-attribute-sets="toc-listof-item-style" role="TOCI">
+					<fo:list-item role="SKIP">
+						<fo:list-item-label end-indent="label-end()" role="SKIP">
+							<fo:block role="SKIP">
 								<fo:basic-link internal-destination="{@id}">
+									<xsl:call-template name="setAltText">
+										<xsl:with-param name="value" select="@alt-text"/>
+									</xsl:call-template>
 									<xsl:value-of select="substring-before(.,'—')"/>
 								</fo:basic-link>
 							</fo:block>
 						</fo:list-item-label>
-						<fo:list-item-body start-indent="body-start()">
-							<fo:block text-align-last="justify">
+						<fo:list-item-body start-indent="body-start()" role="SKIP">
+							<fo:block text-align-last="justify" role="SKIP">
 								<fo:basic-link internal-destination="{@id}">
 									<xsl:call-template name="setAltText">
 										<xsl:with-param name="value" select="@alt-text"/>
@@ -2079,227 +2207,26 @@
 	<!-- ==================== -->
 	<!-- display titles       -->
 	<!-- ==================== -->
-	<xsl:template match="mn:bibdata/mn:title[@type = 'title-intro']">
-		<xsl:apply-templates/>
+	<!-- <xsl:template match="mn:bibdata/mn:title[@type = 'title-intro']">
+		<xsl:apply-templates />
 		<xsl:text>—</xsl:text>
-	</xsl:template>
+	</xsl:template> -->
 
 	<xsl:template match="mn:bibdata/mn:title[@type = 'title-main']">
 		<xsl:apply-templates/>
 	</xsl:template>
 
+	<xsl:template match="mn:bibdata/mn:title[@type = 'main']">
+		<xsl:apply-templates/>
+	</xsl:template>
+
 	<!-- ==================== -->
 	<!-- display titles       -->
 	<!-- ==================== -->
 
-	<!-- ================================= -->
-	<!-- XML Flattening -->
-	<!-- ================================= -->
-	<xsl:template match="@*|node()" mode="flatxml">
-		<xsl:copy>
-			<xsl:apply-templates select="@*|node()" mode="flatxml"/>
-		</xsl:copy>
-	</xsl:template>
-
-	<xsl:template match="processing-instruction()" mode="flatxml">
-		<xsl:copy-of select="."/>
-	</xsl:template>
-
-	<xsl:template match="mn:preface//mn:clause[@type = 'front_notes']" mode="flatxml" priority="2">
-		<!-- ignore processing (source STS is front/notes) -->
-	</xsl:template>
-
-	<xsl:template match="mn:foreword |            mn:foreword//mn:clause |            mn:preface//mn:clause[not(@type = 'corrigenda') and not(@type = 'related-refs') and not(@type = 'toc') ] |            mn:introduction |            mn:introduction//mn:clause |            mn:sections//mn:clause |             mn:annex |             mn:annex//mn:clause |             mn:references |            mn:bibliography/mn:clause |             mn:sections//mn:terms |             mn:sections//mn:definitions |            mn:annex//mn:definitions" mode="flatxml" name="clause">
-		<!-- From:
-		<clause>
-			<title>...</title>
-			<p>...</p>
-		</clause>
-		To:
-			<clause/>
-			<title>...</title>
-			<p>...</p>
-		-->
-		<xsl:copy>
-			<xsl:apply-templates select="@*" mode="flatxml"/>
-			<xsl:attribute name="keep-with-next">always</xsl:attribute>
-			<xsl:if test="self::mn:foreword or self::mn:introduction or    parent::mn:preface or parent::mn:sections or     (self::mn:references and parent::mn:bibliography) or    (self::mn:clause and parent::mn:bibliography) or    self::mn:annex or     parent::mn:annex">
-				<xsl:attribute name="mainsection">true</xsl:attribute>
-			</xsl:if>
-
-		</xsl:copy>
-		<xsl:apply-templates mode="flatxml"/>
-
-	</xsl:template>
-
-	<xsl:template match="mn:term" mode="flatxml" priority="2">
-		<xsl:copy>
-			<xsl:apply-templates select="@*" mode="flatxml"/>
-			<xsl:attribute name="keep-with-next">always</xsl:attribute>
-			<xsl:variable name="level">
-				<xsl:call-template name="getLevel"/>
-			</xsl:variable>
-			<xsl:attribute name="depth"><xsl:value-of select="$level"/></xsl:attribute>
-			<xsl:attribute name="ancestor">sections</xsl:attribute>
-			<xsl:apply-templates select="node()[not(self::mn:term)]" mode="flatxml"/>
-		</xsl:copy>
-		<xsl:apply-templates select="mn:term" mode="flatxml"/>
-	</xsl:template>
-
-	<xsl:template match="mn:introduction//mn:fmt-title | mn:foreword//mn:fmt-title | mn:sections//mn:fmt-title | mn:annex//mn:fmt-title | mn:bibliography/mn:clause/mn:fmt-title | mn:references/mn:fmt-title" mode="flatxml" priority="2"> <!-- | mn:term -->
-		<xsl:copy>
-			<xsl:apply-templates select="@*" mode="flatxml"/>
-			<xsl:attribute name="keep-with-next">always</xsl:attribute>
-			<xsl:variable name="level">
-				<xsl:call-template name="getLevel"/>
-			</xsl:variable>
-			<xsl:attribute name="depth"><xsl:value-of select="$level"/></xsl:attribute>
-			<xsl:if test="parent::mn:annex">
-				<xsl:attribute name="depth">1</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="../@inline-header = 'true'">
-				<xsl:copy-of select="../@inline-header"/>
-			</xsl:if>
-			<xsl:attribute name="ancestor">
-				<xsl:choose>
-					<xsl:when test="ancestor::mn:foreword">foreword</xsl:when>
-					<xsl:when test="ancestor::mn:introduction">introduction</xsl:when>
-					<xsl:when test="ancestor::mn:sections">sections</xsl:when>
-					<xsl:when test="ancestor::mn:annex">annex</xsl:when>
-					<xsl:when test="ancestor::mn:bibliography">bibliography</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
-
-			<xsl:apply-templates mode="flatxml"/>
-		</xsl:copy>
-	</xsl:template>
-
-	<!-- recalculate table width -->
-	<!-- 210 - (15+22+20) = 153 -->
-	<xsl:variable name="max_table_width_mm" select="$pageWidth - ($marginLeftRight1 + $marginLeftRight2)"/>
-	<!-- 153 / 25.4 * 96 dpi = 578px-->
-	<xsl:variable name="max_table_width_px" select="round($max_table_width_mm div 25.4 * 96)"/>
-	<!-- landscape table -->
-	<xsl:variable name="max_table_landscape_width_mm" select="$pageHeight - ($marginTop + $marginBottom)"/>
-	<xsl:variable name="max_table_landscape_width_px" select="round($max_table_landscape_width_mm div 25.4 * 96)"/>
-
-	<xsl:template match="mn:table/@width[contains(., 'px')]" mode="flatxml">
-		<xsl:variable name="width" select="number(substring-before(., 'px'))"/>
-		<xsl:variable name="isLandscapeTable" select="../preceding-sibling::*[not(self::mn:table)][1]/@orientation = 'landscape'"/>
-		<xsl:attribute name="width">
-			<xsl:choose>
-				<xsl:when test="normalize-space($isLandscapeTable) = 'true' and $width &gt; $max_table_landscape_width_px"><xsl:value-of select="$max_table_landscape_width_px"/>px</xsl:when>
-				<xsl:when test="normalize-space($isLandscapeTable) = 'false' and $width &gt; $max_table_width_px"><xsl:value-of select="$max_table_width_px"/>px</xsl:when>
-				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-			</xsl:choose>
-		</xsl:attribute>
-	</xsl:template>
-
-	<!-- add @to = figure, table, clause -->
-	<!-- add @depth = from  -->
-	<xsl:template match="mn:fmt-xref" mode="flatxml">
-		<xsl:copy>
-			<xsl:apply-templates select="@*" mode="flatxml"/>
-			<xsl:variable name="target" select="@target"/>
-			<xsl:attribute name="to">
-				<xsl:value-of select="local-name(//*[@id = current()/@target][1])"/>
-			</xsl:attribute>
-			<xsl:attribute name="depth">
-				<xsl:value-of select="//*[@id = current()/@target][1]/mn:fmt-title/@depth"/>
-			</xsl:attribute>
-			<xsl:apply-templates select="node()" mode="flatxml"/>
-		</xsl:copy>
-	</xsl:template>
-
-	<xsl:template match="text()" mode="flatxml">
-		<xsl:choose>
-			<xsl:when test="contains(., $non_breaking_hyphen)">
-				<xsl:call-template name="replaceChar">
-					<xsl:with-param name="text" select="."/>
-					<xsl:with-param name="replace" select="$non_breaking_hyphen"/>
-					<xsl:with-param name="by" select="'-'"/>
-				</xsl:call-template>
-			</xsl:when>
-			<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-		</xsl:choose>
-
-	</xsl:template>
-
-	<!-- remove newlines chars (0xd 0xa, 0xa, 0xd) in p, em, strong (except in sourcecode). -->
-	<xsl:template match="*[not(ancestor::mn:sourcecode)]/*[self::mn:p or self::mn:strong or self::mn:em]/text()" mode="flatxml">
-		<xsl:choose>
-			<xsl:when test=". = '&#13;' or . = '&#10;' or . = '&#13;&#10;'"/>
-			<xsl:when test="contains(., $non_breaking_hyphen)">
-				<xsl:call-template name="replaceChar">
-					<xsl:with-param name="text" select="."/>
-					<xsl:with-param name="replace" select="$non_breaking_hyphen"/>
-					<xsl:with-param name="by" select="'-'"/>
-				</xsl:call-template>
-			</xsl:when>
-			<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<!-- change @reference to actual value, and add skip_footnote_body="true" for repeatable (2nd, 3rd, ...) -->
-	<!--
-	<fn reference="1">
-			<p id="_8e5cf917-f75a-4a49-b0aa-1714cb6cf954">Formerly denoted as 15 % (m/m).</p>
-		</fn>
-	-->
-
-	<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:fmt-name))]" mode="flatxml">
-		<xsl:variable name="p_fn_">
-			<xsl:call-template name="get_fn_list"/>
-		</xsl:variable>
-		<xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
-		<xsl:variable name="gen_id" select="generate-id(.)"/>
-
-		<xsl:copy>
-			<xsl:apply-templates select="@*" mode="flatxml"/>
-			<xsl:attribute name="skip_footnote_body"> <!-- false for repeatable footnote -->
-				<xsl:value-of select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
-			</xsl:attribute>
-			<xsl:apply-templates select="node()" mode="flatxml"/>
-		</xsl:copy>
-	</xsl:template>
-
-	<!-- <xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" mode="flatxml">
-		<xsl:variable name="p_fn_">
-			<xsl:call-template name="get_fn_list"/>
-		</xsl:variable>
-		<xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
-		<xsl:variable name="gen_id" select="generate-id(.)"/>
-		<xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
-		<xsl:variable name="reference" select="@reference"/>  --><!-- @reference added to bibitem/note in step 'update_xml_step2' -->
-		<!-- fn sequence number in document -->
-		<!-- <xsl:variable name="current_fn_number" select="count($p_fn//fn[@reference = $reference]/preceding-sibling::fn) + 1" />
-		<xsl:copy>
-			<xsl:apply-templates select="@*" mode="flatxml"/> -->
-			<!-- put actual reference number -->
-			<!-- <xsl:attribute name="current_fn_number">
-				<xsl:value-of select="$current_fn_number"/>
-			</xsl:attribute>
-			<xsl:apply-templates select="node()" mode="flatxml"/>
-		</xsl:copy>
-	</xsl:template> -->
-
-	<xsl:template match="mn:p[@type = 'section-title']" priority="3" mode="flatxml">
-		<xsl:copy>
-			<xsl:apply-templates select="@*" mode="flatxml"/>
-			<xsl:if test="@depth = '1'">
-				<xsl:attribute name="mainsection">true</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select="node()" mode="flatxml"/>
-		</xsl:copy>
-	</xsl:template>
-
-	<!-- ================================= -->
-	<!-- END of XML Flattening -->
-	<!-- ================================= -->
-
-	<xsl:template match="*" priority="3" mode="page">
+	<!-- <xsl:template match="*" priority="3" mode="page">
 		<xsl:call-template name="elementProcessing"/>
-	</xsl:template>
+	</xsl:template> -->
 
 	<xsl:template match="mn:clauses_union/*" priority="3" mode="clauses_union">
 		<xsl:call-template name="elementProcessing"/>
@@ -2369,12 +2296,16 @@
 
 	<!-- Bibliography -->
 	<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
-		<fo:block font-size="16pt" font-weight="bold" margin-top="6pt" margin-bottom="36pt" keep-with-next="always" role="H1">
-				<xsl:apply-templates/>
-			</fo:block>
+		<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:template>
 
-	<xsl:template match="mn:fmt-title[@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3">
+	<!-- <xsl:template match="mn:fmt-title[@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3"> -->
+	<xsl:template match="mn:fmt-title[../@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3">
 		<fo:block>
 			<xsl:attribute name="space-before">
 				<xsl:call-template name="getTitleMarginTop"/>
@@ -2404,24 +2335,25 @@
 		<xsl:choose>
 			<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
 				<xsl:choose>
-					<xsl:when test="$level = 2">22.4pt</xsl:when>
-					<xsl:when test="$level = 3">4.6pt</xsl:when>
+					<xsl:when test="$level = 2">28.4pt</xsl:when> <!-- 22.4pt -->
+					<xsl:when test="$level = 3">12.6pt</xsl:when> <!-- 4.6pt -->
 					<xsl:otherwise>0mm</xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
 			<xsl:when test="$current_template = 'standard'">
 				<xsl:choose>
-					<xsl:when test="$level = 1">12pt</xsl:when>
-					<xsl:when test="$level = 2">12pt</xsl:when>
-					<xsl:when test="$level &gt;= 3">12pt</xsl:when>
+					<xsl:when test="$level = 1 and (ancestor::mn:preface or ancestor::mn:introduction or ancestor::mn:annex)">12pt</xsl:when> <!-- 12pt -->
+					<xsl:when test="$level = 1">20pt</xsl:when> <!-- 12pt -->
+					<xsl:when test="$level = 2">20pt</xsl:when>
+					<xsl:when test="$level &gt;= 3">18pt</xsl:when>
 					<xsl:otherwise>0mm</xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:choose>
-					<xsl:when test="$level = 1">18pt</xsl:when>
-					<xsl:when test="$level = 2">18pt</xsl:when>
-					<xsl:when test="$level &gt;= 3">12pt</xsl:when>
+					<xsl:when test="$level = 1">26pt</xsl:when> <!-- 18pt -->
+					<xsl:when test="$level = 2">28pt</xsl:when> <!-- 20pt -->
+					<xsl:when test="$level &gt;= 3">18pt</xsl:when> <!-- 12pt -->
 					<xsl:otherwise>0mm</xsl:otherwise>
 				</xsl:choose>
 			</xsl:otherwise>
@@ -2429,6 +2361,9 @@
 	</xsl:template>
 
 	<xsl:template name="getTitleMarginBottom">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
 				<xsl:choose>
@@ -2436,7 +2371,14 @@
 					<xsl:otherwise>12pt</xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
-			<xsl:otherwise>12pt</xsl:otherwise>
+			<xsl:otherwise>
+				<xsl:choose>
+					<xsl:when test="$level = 1 and (ancestor::mn:preface or ancestor::mn:introduction)">12pt</xsl:when>
+					<xsl:when test="$level = 1 and not(following-sibling::*[1][self::mn:clause])">12pt</xsl:when>
+					<xsl:when test="$level = 1">24pt</xsl:when>
+					<xsl:otherwise>12pt</xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
 
@@ -2481,7 +2423,8 @@
 				<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">normal</xsl:when>
 				<xsl:otherwise>
 					<xsl:choose>
-						<xsl:when test="@ancestor = 'annex' and $level = 1">normal</xsl:when>
+						<!-- <xsl:when test="@ancestor = 'annex' and $level = 1">normal</xsl:when> -->
+						<xsl:when test="ancestor::mn:annex and $level = 1">normal</xsl:when>
 						<xsl:otherwise>bold</xsl:otherwise>
 					</xsl:choose>
 				</xsl:otherwise>
@@ -2503,7 +2446,7 @@
 
 		<xsl:variable name="element-name">
 			<xsl:choose>
-				<xsl:when test="@inline-header = 'true'">fo:inline</xsl:when>
+				<xsl:when test="../@inline-header = 'true'">fo:inline</xsl:when>
 				<xsl:otherwise>fo:block</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -2514,6 +2457,8 @@
 				<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
 				<xsl:attribute name="font-weight"><xsl:value-of select="$font-weight"/></xsl:attribute>
 				<xsl:attribute name="space-before"><xsl:value-of select="$margin-top"/></xsl:attribute>
+				<!-- <xsl:attribute name="margin-top"><xsl:value-of select="$margin-top"/></xsl:attribute> -->
+				<xsl:if test="ancestor::mn:introduction"><xsl:attribute name="margin-top"><xsl:value-of select="$margin-top"/></xsl:attribute></xsl:if>
 				<xsl:attribute name="margin-bottom"><xsl:value-of select="$margin-bottom"/></xsl:attribute>
 				<xsl:attribute name="keep-with-next">always</xsl:attribute>
 				<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
@@ -2596,7 +2541,8 @@
 			</xsl:otherwise>
 		</xsl:choose>
 
-		<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and preceding-sibling::*[1][self::mn:references[@normative = 'false']]">
+		<!-- <xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and preceding-sibling::*[1][self::mn:references[@normative = 'false']]"> -->
+		<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and ancestor::*[1][self::mn:references[@normative = 'false']]">
 			<xsl:call-template name="addBlueBox"/>
 		</xsl:if>
 
@@ -2615,13 +2561,16 @@
 	</xsl:template>
 
 	<!-- add blue box after first break in Annex title -->
-	<xsl:template match="mn:br[not(preceding-sibling::mn:br)][ancestor::mn:fmt-title[preceding-sibling::*[1][self::mn:annex]]]" priority="2">
+	<xsl:template match="mn:br[ancestor::mn:fmt-title[parent::mn:annex]]" priority="2">
 		<xsl:choose>
 			<xsl:when test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') ">
-				<xsl:call-template name="addBlueBox"/>
+				<xsl:if test="not(preceding-sibling::mn:br)">
+					<xsl:call-template name="addBlueBox"/>
+				</xsl:if>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:value-of select="$linebreak"/>
+				<!-- <xsl:value-of select="$linebreak"/> -->
+				<fo:block font-size="1pt" margin-top="3mm"> </fo:block>
 			</xsl:otherwise>
 
 		</xsl:choose>
@@ -2636,8 +2585,10 @@
 		<fo:block>@ancestor=<xsl:value-of select="@ancestor"/></fo:block> -->
 		<xsl:variable name="font-size">
 			<xsl:choose>
-				<xsl:when test="@ancestor = 'sections' and $level = '2'">11pt</xsl:when>
-				<xsl:when test="@ancestor = 'sections' and $level &gt; 2">11pt</xsl:when>
+				<!-- <xsl:when test="@ancestor = 'sections' and $level = '2'">11pt</xsl:when>
+				<xsl:when test="@ancestor = 'sections' and $level &gt; 2">11pt</xsl:when> -->
+				<xsl:when test="$level = '2'">11pt</xsl:when>
+				<xsl:when test="$level &gt; 2">11pt</xsl:when>
 				<xsl:otherwise>11.5pt</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -2650,12 +2601,14 @@
 		</xsl:variable>
 
 		<fo:block margin-bottom="16pt">
-			<xsl:if test="@ancestor = 'sections' and $level &gt; 2">
+			<!-- <xsl:if test="@ancestor = 'sections' and $level &gt; 2"> -->
+			<xsl:if test="$level &gt; 2">
 				<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 			</xsl:if>
 			<xsl:copy-of select="@id"/>
 			<fo:block font-size="{$font-size}" font-weight="bold" margin-bottom="6pt" keep-with-next="always" role="H{$level}">
-					<xsl:if test="@ancestor = 'sections' and $level &gt; 2">
+					<!-- <xsl:if test="@ancestor = 'sections' and $level &gt; 2"> -->
+					<xsl:if test="$level &gt; 2">
 						<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
 					</xsl:if>
 					<!-- term/name -->
@@ -2691,12 +2644,6 @@
 		<xsl:call-template name="termsource"/>
 	</xsl:template>
 
-	<xsl:template name="titleAmendment">
-		<fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always">
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -2712,11 +2659,11 @@
 
 		<xsl:choose>
 
-			<xsl:when test="preceding-sibling::*[1][self::mn:fmt-title]/@inline-header = 'true' and $inline-header = 'false'"/> <!-- paragraph displayed in title template -->
+			<xsl:when test="preceding-sibling::*[1][self::mn:fmt-title]/../@inline-header = 'true' and $inline-header = 'false'"/> <!-- paragraph displayed in title template -->
 
 			<xsl:otherwise>
 
-				<xsl:variable name="previous-element" select="local-name(preceding-sibling::*[1])"/>
+				<!-- <xsl:variable name="previous-element" select="local-name(preceding-sibling::*[1])"/> -->
 				<xsl:variable name="element-name">fo:block</xsl:variable>
 					<!-- <xsl:choose>
 						<xsl:when test="$inline = 'true'">fo:inline</xsl:when> -->
@@ -2823,27 +2770,7 @@
 	<xsl:template match="mn:ul | mn:ol" mode="list" priority="2">
 		<fo:list-block xsl:use-attribute-sets="list-style">
 
-			<xsl:if test="parent::mn:admonition[@type = 'commentary']">
-				<xsl:attribute name="margin-left">7mm</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="preceding-sibling::*[1][self::mn:p]">
-				<xsl:attribute name="margin-top">6pt</xsl:attribute>
-			</xsl:if>
-
-			<xsl:if test="ancestor::mn:note or ancestor::mn:termnote">
-				<xsl:attribute name="provisional-distance-between-starts">4mm</xsl:attribute>
-			</xsl:if>
-
-			<xsl:variable name="processing_instruction_type" select="normalize-space(preceding-sibling::*[1]/processing-instruction('list-type'))"/>
-			<xsl:if test="self::mn:ul and normalize-space($processing_instruction_type) = 'simple'">
-				<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
-			</xsl:if>
-
-			<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
-				<xsl:attribute name="line-height">1.3</xsl:attribute>
-				<xsl:attribute name="margin-left">6.2mm</xsl:attribute>
-				<xsl:attribute name="provisional-distance-between-starts">6.5mm</xsl:attribute>
-			</xsl:if>
+			<xsl:call-template name="refine_list-style"/>
 
 			<xsl:apply-templates select="node()[not(self::mn:note)]"/>
 		</fo:list-block>
@@ -2947,7 +2874,7 @@
 		<xsl:value-of select="normalize-space()"/>
 	</xsl:template>
 
-	<xsl:template match="mn:bibitem[preceding-sibling::mn:references[1][not(@normative='true')]]" priority="3">
+	<xsl:template match="mn:bibitem[ancestor::mn:references[1][not(@normative='true')]]" priority="3">
 		<xsl:call-template name="bibitem_non_normative"/>
 	</xsl:template>
 
@@ -2955,7 +2882,9 @@
 	<!-- Index processing -->
 	<!-- =================== -->
 
-	<xsl:template match="mn:indexsect"/>
+	<xsl:template match="mn:indexsect">
+		<xsl:apply-templates select="." mode="index"/>
+	</xsl:template>
 	<xsl:template match="mn:indexsect" mode="index">
 		<fo:block id="{@id}" span="all">
 			<xsl:apply-templates select="mn:title"/>
@@ -3057,20 +2986,17 @@
 	<xsl:template name="insertFootnoteSeparator">
 		<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
 			<fo:block>
-				<fo:leader leader-pattern="rule" rule-thickness="0.5pt" leader-length="35%">
-					<xsl:if test="$current_template = 'whitepaper' or $current_template= 'icap-whitepaper' or $current_template = 'industry-connection-report'">
-						<xsl:attribute name="rule-thickness">1pt</xsl:attribute>
-						<xsl:attribute name="leader-length">51mm</xsl:attribute>
-					</xsl:if>
+				<fo:leader xsl:use-attribute-sets="footnote-separator-leader-style">
+
+					<xsl:call-template name="refine_footnote-separator-leader-style"/>
+
 				</fo:leader>
 			</fo:block>
 		</fo:static-content>
 	</xsl:template>
 
 	<xsl:template name="insertHeaderFooter">
-		<xsl:param name="doctype"/>
 		<xsl:param name="document_id"/>
-		<xsl:param name="title_prefix"/>
 		<xsl:param name="title"/>
 
 		<xsl:param name="copyright_year"/>
@@ -3099,7 +3025,7 @@
 					<xsl:value-of select="$document_id"/>
 				</fo:block>
 				<fo:block>
-					<xsl:copy-of select="$title_prefix"/>
+					<!-- <xsl:copy-of select="$title_prefix"/> -->
 					<xsl:copy-of select="$title"/>
 				</fo:block>
 
@@ -3182,38 +3108,59 @@
 			</xsl:choose>
 		</xsl:variable>
 
+		<xsl:if test="$hideHeader = 'false'">
+			<xsl:call-template name="insertHeader">
+				<xsl:with-param name="orientation" select="$orientation"/>
+				<xsl:with-param name="header" select="$header"/>
+			</xsl:call-template>
+		</xsl:if>
+
+		<xsl:if test="$hideFooter = 'false'">
+			<xsl:call-template name="insertFooter">
+				<xsl:with-param name="orientation" select="$orientation"/>
+				<xsl:with-param name="footer" select="$footer"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template name="insertHeader">
+		<xsl:param name="orientation"/>
+		<xsl:param name="header"/>
 		<xsl:choose>
 			<xsl:when test="$orientation = 'landscape'">
-				<xsl:if test="$hideHeader = 'false'">
-					<fo:static-content flow-name="right-region-landscape" role="artifact">
-						<fo:block-container reference-orientation="270" margin-left="13mm">
-							<xsl:copy-of select="$header"/>
-						</fo:block-container>
-					</fo:static-content>
-				</xsl:if>
-				<xsl:if test="$hideFooter = 'false'">
-					<fo:static-content flow-name="left-region-landspace" role="artifact">
-						<fo:block-container reference-orientation="270" margin-left="13mm">
-							<xsl:copy-of select="$footer"/>
-						</fo:block-container>
-					</fo:static-content>
-				</xsl:if>
+				<fo:static-content flow-name="right-region-landscape" role="artifact">
+					<fo:block-container reference-orientation="270" margin-left="13mm">
+						<xsl:copy-of select="$header"/>
+					</fo:block-container>
+				</fo:static-content>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:if test="$hideHeader = 'false'">
-					<fo:static-content flow-name="header" role="artifact">
-						<fo:block-container margin-top="12.7mm">
-							<xsl:copy-of select="$header"/>
-						</fo:block-container>
-					</fo:static-content>
-				</xsl:if>
-				<xsl:if test="$hideFooter = 'false'">
-					<fo:static-content flow-name="footer" role="artifact">
-						<fo:block-container display-align="after" height="100%">
-							<xsl:copy-of select="$footer"/>
-						</fo:block-container>
-					</fo:static-content>
-				</xsl:if>
+				<fo:static-content flow-name="header" role="artifact">
+					<fo:block-container margin-top="12.7mm">
+						<xsl:copy-of select="$header"/>
+					</fo:block-container>
+				</fo:static-content>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="insertFooter">
+		<xsl:param name="orientation"/>
+		<xsl:param name="footer"/>
+		<xsl:choose>
+			<xsl:when test="$orientation = 'landscape'">
+				<fo:static-content flow-name="left-region-landspace" role="artifact">
+					<fo:block-container reference-orientation="270" margin-left="13mm">
+						<xsl:copy-of select="$footer"/>
+					</fo:block-container>
+				</fo:static-content>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:static-content flow-name="footer" role="artifact">
+					<fo:block-container display-align="after" height="100%">
+						<xsl:copy-of select="$footer"/>
+					</fo:block-container>
+				</fo:static-content>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
@@ -3371,13 +3318,12 @@
 	<!-- Cover Pages -->
 	<!-- =============================== -->
 	<xsl:template name="insertCoverPage_Standard">
-		<xsl:param name="title_intro"/>
 		<xsl:param name="title_main"/>
 		<xsl:param name="society"/>
 		<xsl:param name="committee"/>
+		<xsl:param name="enabler"/>
 		<xsl:param name="standard_number"/>
 		<xsl:param name="history"/>
-		<xsl:param name="standard_title_prefix"/>
 		<xsl:param name="cutoff_date"/>
 		<xsl:param name="expiration_date"/>
 
@@ -3398,7 +3344,7 @@
 						</fo:instream-foreign-object>
 					</fo:block>
 				</fo:block-container>
-				<fo:block-container position="absolute" left="191mm" top="-1mm">
+				<fo:block-container position="absolute" left="191mm" top="-1mm" id="__internal_layout__covepage_bluebox_{generate-id()}">
 					<fo:block font-size="1">
 						<fo:instream-foreign-object content-width="26mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Boxes">
 							<xsl:copy-of select="$Image-Blue-Boxes-svg"/>
@@ -3409,7 +3355,7 @@
 
 			<fo:static-content flow-name="right-region" role="artifact">
 				<fo:block-container font-family="Montserrat ExtraBold" font-weight="normal" reference-orientation="90" font-size="45.9pt" text-align="right">
-					<fo:block margin-right="-6mm" margin-top="-2mm">
+					<fo:block margin-right="-4mm" margin-top="0mm">
 						<fo:instream-foreign-object content-width="2.5mm" content-height="11.9mm" scaling="non-uniform" fox:alt-text="Image Box">
 							<xsl:call-template name="insertImageBoxSVG">
 								<xsl:with-param name="color">rgb(38,172,226)</xsl:with-param>
@@ -3424,43 +3370,108 @@
 			</fo:static-content>
 
 			<fo:flow flow-name="xsl-region-body" font-family="Calibri">
-				<fo:block-container height="81mm" display-align="center" font-weight="bold">
+				<fo:block-container height="100mm" width="150mm" font-weight="bold"> <!-- height="81mm" display-align="center"  -->
 
-					<xsl:choose>
-						<!-- title starts with lower-cased letter -->
+					<!-- <xsl:choose>
+						title starts with lower-cased letter
 						<xsl:when test="translate(substring($title_intro,1,1),$lower,'') = ''">
 							<fo:block font-size="22pt">
-								<xsl:value-of select="$standard_title_prefix"/>
+								<xsl:value-of select="$title_prefix"/>
 								<xsl:copy-of select="$title_intro"/>
 							</fo:block>
 						</xsl:when>
-
 						<xsl:otherwise>
-							<!-- Example: IEEE Standard for -->
+							Example: IEEE Standard for
 							<fo:block font-size="22pt" space-after="2pt">
-								<xsl:value-of select="$standard_title_prefix"/>
+								<xsl:value-of select="$title_prefix"/>
 							</fo:block>
 							<fo:block font-size="22pt" margin-left="3mm">
-								<!-- Example: Local and Metropolitan Area Networks— -->
+								Example: Local and Metropolitan Area Networks—
 								<xsl:copy-of select="$title_intro"/>
 							</fo:block>
 						</xsl:otherwise>
-					</xsl:choose>
+					</xsl:choose> -->
 
-					<fo:block font-size="25pt" space-before="32pt">
-						<!-- Example: Port-Based Network Access Control -->
+					<fo:block font-size="25pt"> <!-- 22pt -->
+						<!-- <xsl:value-of select="$title_prefix"/> -->
 						<xsl:copy-of select="$title_main"/>
 					</fo:block>
+
 				</fo:block-container>
 
-				<fo:block-container>
-					<fo:block font-size="16pt">
-						<!-- Example: IEEE Computer Society -->
-						<xsl:text>IEEE </xsl:text><xsl:value-of select="$society"/>
+				<fo:block font-size="16pt">
+					<!-- Example: IEEE Computer Society -->
+					<xsl:value-of select="$society"/>
+				</fo:block>
+
+				<fo:block-container height="56mm" display-align="after">
+
+					<fo:block font-size="12pt" space-before="13mm">
+						<xsl:if test="$committee != ''">
+							<fo:block>
+								<!-- Developed by the
+									LAN/MAN Standards Committee -->
+								<xsl:value-of select="$developed_by"/>
+								<xsl:value-of select="$linebreak"/>
+								<xsl:value-of select="$committee"/>
+							</fo:block>
+						</xsl:if>
+						<xsl:if test="normalize-space($enabler) != ''">
+							<fo:block> </fo:block>
+							<fo:block>
+								<!-- Sponsored by the
+									LAN/MAN Standards Committee -->
+								<xsl:value-of select="$sponsored_by"/>
+								<xsl:value-of select="$linebreak"/>
+								<xsl:for-each select="$enabler/mn:subdivision/mn:subdivision/mn:name">
+									<xsl:value-of select="."/>
+									<xsl:if test="position() != last()">
+										<xsl:value-of select="$linebreak"/>
+										<xsl:text>and the</xsl:text>
+										<xsl:value-of select="$linebreak"/>
+									</xsl:if>
+								</xsl:for-each>
+							</fo:block>
+						</xsl:if>
 					</fo:block>
-					<fo:block font-size="12pt" space-before="13mm">Developed by the</fo:block>
-					<!-- LAN/MAN Standards Committee -->
-					<fo:block font-size="12pt"><xsl:value-of select="$committee"/></fo:block>
+
+					<xsl:variable name="coverpage_statement" select="normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:coverpage-statement)"/>
+					<xsl:if test="$coverpage_statement != '' or /mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']]/mn:organization/mn:logo">
+						<fo:block font-size="12pt">
+							<fo:block> </fo:block>
+							<fo:table width="168mm" table-layout="fixed">
+								<fo:table-column column-width="100mm"/>
+								<fo:table-column column-width="68mm"/>
+								<fo:table-body>
+									<fo:table-row>
+										<fo:table-cell>
+											<fo:block><xsl:value-of select="$coverpage_statement"/></fo:block>
+										</fo:table-cell>
+										<fo:table-cell text-align="center">
+											<fo:block>
+												<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']]/mn:organization">
+													<fo:block>
+														<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:attribute name="width">32mm</xsl:attribute>
+																		<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"/>
+													</fo:block>
+												</xsl:for-each>
+											</fo:block>
+										</fo:table-cell>
+									</fo:table-row>
+								</fo:table-body>
+							</fo:table>
+						</fo:block>
+					</xsl:if>
 
 					<xsl:if test="normalize-space($cutoff_date) != ''">
 						<fo:block> </fo:block>
@@ -3477,9 +3488,11 @@
 						</fo:block>
 					</xsl:if>
 
-					<fo:block font-size="12pt" font-weight="bold" space-before="40mm"><xsl:value-of select="$standard_number"/></fo:block>
-					<fo:block font-size="10pt"><xsl:value-of select="$history"/></fo:block>
+				</fo:block-container>
 
+				<fo:block-container position="absolute" left="0mm" top="168mm">
+					<fo:block font-size="12pt" font-weight="bold"><xsl:value-of select="$standard_number"/></fo:block>
+					<fo:block font-size="10pt"><xsl:value-of select="$history"/></fo:block>
 				</fo:block-container>
 			</fo:flow>
 		</fo:page-sequence>
@@ -3489,7 +3502,7 @@
 		<fo:page-sequence master-reference="cover-and-back-page-industry-connection-report" force-page-count="no-force">
 			<fo:static-content flow-name="header" role="artifact">
 
-				<fo:block-container position="absolute" left="65.5mm" top="0mm">
+				<fo:block-container position="absolute" left="65.5mm" top="0mm" id="__internal_layout__covepage_bluebox_{generate-id()}">
 					<fo:block font-size="1">
 						<fo:instream-foreign-object content-height="93.5mm" content-width="64.1mm" fox:alt-text="Image Boxes">
 							<xsl:copy-of select="$Image-Blue-Boxes-svg"/>
@@ -3725,7 +3738,7 @@
 						</fo:instream-foreign-object>
 					</fo:block>
 				</fo:block-container>
-				<fo:block-container position="absolute" left="191mm" top="-1mm">
+				<fo:block-container position="absolute" left="191mm" top="-1mm" id="__internal_layout__backpage_bluebox_{generate-id()}">
 					<fo:block font-size="1">
 						<fo:instream-foreign-object content-width="26mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Boxes">
 							<xsl:copy-of select="$Image-Blue-Boxes-svg"/>
@@ -3736,7 +3749,7 @@
 
 			<fo:flow flow-name="xsl-region-body" font-family="Calibri">
 
-				<fo:block font-family="Montserrat ExtraBold" font-size="32pt" font-weight="normal" margin-top="44mm" line-height="0.9">
+				<fo:block font-family="Montserrat ExtraBold" font-size="32pt" font-weight="normal" margin-top="42mm" line-height="0.9">
 					<fo:block>RAISING THE</fo:block>
 					<fo:block>WORLD’S</fo:block>
 					<fo:block>STANDARDS</fo:block>
@@ -4096,6 +4109,7 @@
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
 	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -4639,6 +4653,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -4653,10 +4668,10 @@
 
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
 
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -5552,10 +5567,16 @@
 	<xsl:attribute-set name="license-statement-style">
 	</xsl:attribute-set> <!-- license-statement-style -->
 
+	<xsl:template name="refine_license-statement-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="license-statement-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- license-statement-title-style -->
 
+	<xsl:template name="refine_license-statement-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="license-statement-p-style">
 		<xsl:attribute name="margin-top">6pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -5569,23 +5590,75 @@
 	<xsl:attribute-set name="legal-statement-style">
 	</xsl:attribute-set> <!-- legal-statement-style -->
 
+	<xsl:template name="refine_legal-statement-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="legal-statement-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="font-family">Arial</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="space-before">18pt</xsl:attribute>
+		<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+		<xsl:attribute name="span">all</xsl:attribute>
+		<xsl:attribute name="font-size">11pt</xsl:attribute>
 	</xsl:attribute-set> <!-- legal-statement-title-style -->
 
+	<xsl:template name="refine_legal-statement-title-style">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<xsl:if test="$level = '1'">
+			<xsl:attribute name="font-size">12pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
+			<xsl:attribute name="font-family">Arial Black</xsl:attribute>
+			<xsl:attribute name="font-size">13pt</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="legal-statement-p-style">
 	</xsl:attribute-set> <!-- legal-statement-p-style -->
 
+	<xsl:template name="refine_legal-statement-p-style">
+		<xsl:if test="@align">
+			<xsl:attribute name="text-align">
+				<xsl:value-of select="@align"/>
+			</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="feedback-statement-style">
+			<xsl:attribute name="font-family">Arial</xsl:attribute>
+			<xsl:attribute name="font-size">7pt</xsl:attribute>
 	</xsl:attribute-set> <!-- feedback-statement-style -->
 
+	<xsl:template name="refine_feedback-statement-style">
+		<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
+			<xsl:attribute name="font-family">Calibri Light</xsl:attribute>
+			<xsl:attribute name="font-size">9pt</xsl:attribute>
+			<xsl:attribute name="line-height">1.2</xsl:attribute>
+		</xsl:if>
+		<!-- <xsl:if test="$current_template = 'standard'">
+				<xsl:attribute name="font-size">8pt</xsl:attribute>
+			</xsl:if> -->
+	</xsl:template>
+
 	<xsl:attribute-set name="feedback-statement-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- feedback-statement-title-style -->
 
+	<xsl:template name="refine_feedback-statement-title-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="feedback-statement-p-style">
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- feedback-statement-p-style -->
 
+	<xsl:template name="refine_feedback-statement-p-style">
+	</xsl:template>
+
 	<!-- End boilerplate sections styles -->
 
 	<!-- ================================= -->
@@ -5611,6 +5684,7 @@
 
 	<xsl:template match="mn:license-statement">
 		<fo:block xsl:use-attribute-sets="license-statement-style">
+			<xsl:call-template name="refine_license-statement-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- license-statement -->
@@ -5628,6 +5702,7 @@
 	<xsl:template match="mn:legal-statement">
 		<xsl:param name="isLegacy">false</xsl:param>
 		<fo:block xsl:use-attribute-sets="legal-statement-style">
+			<xsl:call-template name="refine_legal-statement-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- legal-statement -->
@@ -5808,6 +5883,27 @@
 	<xsl:attribute-set name="sourcecode-container-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_sourcecode-container-style">
+		<xsl:if test="not(ancestor::mn:li) or ancestor::mn:example">
+			<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="ancestor::mn:example">
+			<xsl:attribute name="margin-right">0mm</xsl:attribute>
+		</xsl:if>
+
+		<xsl:copy-of select="@id"/>
+
+		<xsl:if test="parent::mn:note">
+			<xsl:attribute name="margin-left">
+				<xsl:choose>
+					<xsl:when test="not(ancestor::mn:table)"><xsl:value-of select="$note-body-indent"/></xsl:when>
+					<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
@@ -5820,6 +5916,12 @@
 	<xsl:template name="refine_sourcecode-style">
 	</xsl:template> <!-- refine_sourcecode-style -->
 
+	<xsl:attribute-set name="sourcecode-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -5828,6 +5930,9 @@
 		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
 	</xsl:attribute-set> <!-- sourcecode-name-style -->
 
+	<xsl:template name="refine_sourcecode-name-style">
+	</xsl:template>
+
 	<xsl:template name="add-zero-spaces-equal">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-equals">==========</xsl:variable>
@@ -5915,24 +6020,8 @@
 			<xsl:otherwise>
 				<fo:block-container xsl:use-attribute-sets="sourcecode-container-style" role="SKIP">
 
-					<xsl:if test="not(ancestor::mn:li) or ancestor::mn:example">
-						<xsl:attribute name="margin-left">0mm</xsl:attribute>
-					</xsl:if>
-
-					<xsl:if test="ancestor::mn:example">
-						<xsl:attribute name="margin-right">0mm</xsl:attribute>
-					</xsl:if>
-
-					<xsl:copy-of select="@id"/>
+					<xsl:call-template name="refine_sourcecode-container-style"/>
 
-					<xsl:if test="parent::mn:note">
-						<xsl:attribute name="margin-left">
-							<xsl:choose>
-								<xsl:when test="not(ancestor::mn:table)"><xsl:value-of select="$note-body-indent"/></xsl:when>
-								<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
-							</xsl:choose>
-						</xsl:attribute>
-					</xsl:if>
 					<fo:block-container margin-left="0mm" role="SKIP">
 
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
@@ -6259,6 +6348,7 @@
 	<xsl:template match="mn:sourcecode/mn:fmt-name">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="sourcecode-name-style">
+				<xsl:call-template name="refine_sourcecode-name-style"/>
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -6308,11 +6398,30 @@
 		<xsl:attribute name="margin-top">5pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
 		<xsl:attribute name="font-size">95%</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- pre-style -->
+
+	<xsl:template name="refine_pre-style">
+	</xsl:template>
 
 	<xsl:attribute-set name="tt-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_tt-style">
+		<xsl:variable name="_font-size"> <!-- inherit -->
+		</xsl:variable>
+		<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
+		<xsl:if test="$font-size != ''">
+			<xsl:attribute name="font-size">
+				<xsl:choose>
+					<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+					<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
+					<xsl:when test="ancestor::mn:note or ancestor::mn:example"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
+					<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:variable name="color-added-text">
 		<xsl:text>rgb(0, 255, 0)</xsl:text>
 	</xsl:variable>
@@ -6325,9 +6434,14 @@
 				<xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_add-style">
+	</xsl:template>
+
 	<xsl:variable name="add-style">
-			<add-style xsl:use-attribute-sets="add-style"/>
-		</xsl:variable>
+		<add-style xsl:use-attribute-sets="add-style">
+			<xsl:call-template name="refine_add-style"/>
+		</add-style>
+	</xsl:variable>
 	<xsl:template name="append_add-style">
 		<xsl:copy-of select="xalan:nodeset($add-style)/add-style/@*"/>
 	</xsl:template>
@@ -6340,24 +6454,77 @@
 		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_del-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="strong-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_strong_style">
+		<xsl:if test="ancestor::*['preferred']">
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_strong_style -->
+
+	<xsl:attribute-set name="em-style">
+		<xsl:attribute name="font-style">italic</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_em_style">
+	</xsl:template> <!-- refine_em_style -->
+
+	<xsl:attribute-set name="sup-style">
+		<xsl:attribute name="font-size">80%</xsl:attribute>
+		<xsl:attribute name="vertical-align">super</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sup-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="sub-style">
+		<xsl:attribute name="font-size">80%</xsl:attribute>
+		<xsl:attribute name="vertical-align">sub</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sub-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="underline-style">
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_underline-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="hi-style">
+		<xsl:attribute name="background-color">yellow</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_hi-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="strike-style">
+		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_strike-style">
+	</xsl:template>
+
 	<xsl:template match="mn:br">
 		<xsl:value-of select="$linebreak"/>
 	</xsl:template>
 
-		<xsl:template match="mn:em">
-		<fo:inline font-style="italic">
-			<xsl:call-template name="refine_italic_style"/>
+	<xsl:template match="mn:em">
+		<fo:inline xsl:use-attribute-sets="em-style">
+			<xsl:call-template name="refine_em_style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
 
-	<xsl:template name="refine_italic_style">
-	</xsl:template>
-
 	<xsl:template match="mn:strong | *[local-name()='b']">
 		<xsl:param name="split_keep-within-line"/>
-		<fo:inline font-weight="bold">
-
+		<fo:inline xsl:use-attribute-sets="strong-style">
 			<xsl:call-template name="refine_strong_style"/>
 
 			<xsl:apply-templates>
@@ -6366,44 +6533,27 @@
 		</fo:inline>
 	</xsl:template>
 
-	<xsl:template name="refine_strong_style">
-		<xsl:if test="ancestor::*['preferred']">
-			<xsl:attribute name="role">SKIP</xsl:attribute>
-		</xsl:if>
-	</xsl:template>
-
 	<xsl:template match="*[local-name()='padding']">
 		<fo:inline padding-right="{@value}"> </fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:sup">
-		<fo:inline font-size="80%" vertical-align="super">
+		<fo:inline xsl:use-attribute-sets="sup-style">
+			<xsl:call-template name="refine_sup-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:sub">
-		<fo:inline font-size="80%" vertical-align="sub">
+		<fo:inline xsl:use-attribute-sets="sub-style">
+			<xsl:call-template name="refine_sub-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:tt">
 		<fo:inline xsl:use-attribute-sets="tt-style">
-
-			<xsl:variable name="_font-size"> <!-- inherit -->
-			</xsl:variable>
-			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
-			<xsl:if test="$font-size != ''">
-				<xsl:attribute name="font-size">
-					<xsl:choose>
-						<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
-						<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
-						<xsl:when test="ancestor::mn:note or ancestor::mn:example"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
-						<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</xsl:if>
+			<xsl:call-template name="refine_tt-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template> <!-- tt -->
@@ -6422,7 +6572,8 @@
 	</xsl:template>
 
 	<xsl:template match="mn:underline">
-		<fo:inline text-decoration="underline">
+		<fo:inline xsl:use-attribute-sets="underline-style">
+			<xsl:call-template name="refine_underline-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -6580,6 +6731,7 @@
 
 	<xsl:template match="mn:del">
 		<fo:inline xsl:use-attribute-sets="del-style">
+			<xsl:call-template name="refine_del-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -6589,7 +6741,8 @@
 
 	<!-- highlight text -->
 	<xsl:template match="mn:hi | mn:span[@class = 'fmt-hi']" priority="3">
-		<fo:inline background-color="yellow">
+		<fo:inline xsl:use-attribute-sets="hi-style">
+			<xsl:call-template name="refine_hi-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -6675,7 +6828,8 @@
   </xsl:template>
 
 	<xsl:template match="mn:strike">
-		<fo:inline text-decoration="line-through">
+		<fo:inline xsl:use-attribute-sets="strike-style">
+			<xsl:call-template name="refine_strike-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -6755,6 +6909,7 @@
 
 	<xsl:template match="mn:pre" name="pre">
 		<fo:block xsl:use-attribute-sets="pre-style">
+			<xsl:call-template name="refine_pre-style"/>
 			<xsl:copy-of select="@id"/>
 			<xsl:choose>
 
@@ -6785,22 +6940,40 @@
 	<xsl:attribute-set name="permission-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_permission-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="permission-name-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_permission-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="permission-label-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_permission-label-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="requirement-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_requirement-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="requirement-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_requirement-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="requirement-label-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_requirement-label-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="subject-style">
 	</xsl:attribute-set>
 
@@ -6828,18 +7001,28 @@
 	<xsl:attribute-set name="recommendation-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_recommendation-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="recommendation-name-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_recommendation-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="recommendation-label-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_recommendation-label-style">
+	</xsl:template>
+
 	<!-- ========== -->
 	<!-- permission -->
 	<!-- ========== -->
 	<xsl:template match="mn:permission">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
+			<xsl:call-template name="refine_permission-style"/>
 			<xsl:apply-templates select="mn:fmt-name"/>
 			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
 		</fo:block>
@@ -6848,6 +7031,7 @@
 	<xsl:template match="mn:permission/mn:fmt-name">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="permission-name-style">
+				<xsl:call-template name="refine_permission-name-style"/>
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -6855,6 +7039,7 @@
 
 	<xsl:template match="mn:permission/mn:label">
 		<fo:block xsl:use-attribute-sets="permission-label-style">
+			<xsl:call-template name="refine_permission-label-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -6867,6 +7052,7 @@
 	<xsl:template match="mn:requirement">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
+			<xsl:call-template name="refine_requirement-style"/>
 			<xsl:apply-templates select="mn:fmt-name"/>
 			<xsl:apply-templates select="mn:label"/>
 			<xsl:apply-templates select="@obligation"/>
@@ -6879,6 +7065,7 @@
 		<xsl:if test="normalize-space() != ''">
 
 			<fo:block xsl:use-attribute-sets="requirement-name-style">
+				<xsl:call-template name="refine_requirement-name-style"/>
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -6886,6 +7073,7 @@
 
 	<xsl:template match="mn:requirement/mn:label">
 		<fo:block xsl:use-attribute-sets="requirement-label-style">
+			<xsl:call-template name="refine_requirement-label-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -6911,6 +7099,7 @@
 	<xsl:template match="mn:recommendation">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
+			<xsl:call-template name="refine_recommendation-style"/>
 			<xsl:apply-templates select="mn:fmt-name"/>
 			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
 		</fo:block>
@@ -6920,6 +7109,7 @@
 		<xsl:if test="normalize-space() != ''">
 
 			<fo:block xsl:use-attribute-sets="recommendation-name-style">
+				<xsl:call-template name="refine_recommendation-name-style"/>
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -6927,6 +7117,7 @@
 
 	<xsl:template match="mn:recommendation/mn:label">
 		<fo:block xsl:use-attribute-sets="recommendation-label-style">
+			<xsl:call-template name="refine_recommendation-label-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -7107,34 +7298,70 @@
 	<xsl:attribute-set name="term-style">
 	</xsl:attribute-set> <!-- term-style -->
 
+	<xsl:template name="refine_term-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="term-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- term-name-style -->
 
-		<xsl:attribute-set name="preferred-block-style">
+	<xsl:template name="refine_term-name-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="preferred-style">
+	</xsl:attribute-set> <!-- preferred-style -->
+
+	<xsl:template name="refine_preferred-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="preferred-block-style">
 	</xsl:attribute-set> <!-- preferred-block-style -->
 
+	<xsl:template name="refine_preferred-block-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="preferred-term-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- preferred-term-style -->
 
+	<xsl:template name="refine_preferred-term-style">
+		<xsl:if test="mn:strong">
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="domain-style">
 	</xsl:attribute-set> <!-- domain-style -->
 
+	<xsl:template name="refine_domain-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="admitted-style">
 	</xsl:attribute-set> <!-- admitted-style -->
 
+	<xsl:template name="refine_admitted-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="deprecates-style">
 	</xsl:attribute-set> <!-- deprecates-style -->
 
+	<xsl:template name="refine_deprecates-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_related-block-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="definition-style">
 	</xsl:attribute-set> <!-- definition-style -->
 
+	<xsl:template name="refine_definition-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="termsource-style">
 	</xsl:attribute-set> <!-- termsource-style -->
 
@@ -7144,9 +7371,15 @@
 	<xsl:attribute-set name="termsource-text-style">
 	</xsl:attribute-set> <!-- termsource-text-style -->
 
+	<xsl:template name="refine_termsource-text-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="origin-style">
 	</xsl:attribute-set> <!-- origin-style -->
 
+	<xsl:template name="refine_origin-style">
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- term      -->
 	<!-- ====== -->
@@ -7162,9 +7395,8 @@
 	<xsl:template match="mn:term">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
+			<xsl:call-template name="refine_term-style"/>
 
-			<xsl:if test="parent::mn:term and not(preceding-sibling::mn:term)">
-			</xsl:if>
 			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
 		</fo:block>
 	</xsl:template>
@@ -7240,6 +7472,7 @@
 	<!-- text SOURCE: -->
 	<xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
 		<fo:inline xsl:use-attribute-sets="termsource-text-style">
+			<xsl:call-template name="refine_termsource-text-style"/>
 			<xsl:value-of select="."/>
 		</fo:inline>
 	</xsl:template>
@@ -7252,6 +7485,7 @@
 						<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
 					</xsl:if>
 					<fo:inline xsl:use-attribute-sets="origin-style">
+						<xsl:call-template name="refine_origin-style"/>
 						<xsl:apply-templates/>
 					</fo:inline>
 				</fo:basic-link>
@@ -7301,9 +7535,12 @@
 		</xsl:variable>
 		<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
 
+			<xsl:call-template name="refine_preferred-block-style"/>
+
 			<xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
 
 				<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
+					<xsl:call-template name="refine_term-name-style"/>
 
 					<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
 						<xsl:call-template name="setIDforNamedDestination"/>
@@ -7314,7 +7551,7 @@
 			</xsl:if>
 
 			<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
-				<xsl:call-template name="setStyle_preferred"/>
+				<xsl:call-template name="refine_preferred-term-style"/>
 
 				<xsl:apply-templates/>
 			</fo:block>
@@ -7335,22 +7572,18 @@
 
 	<xsl:template match="mn:fmt-admitted">
 		<fo:block xsl:use-attribute-sets="admitted-style">
+			<xsl:call-template name="refine_admitted-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="mn:fmt-deprecates">
 		<fo:block xsl:use-attribute-sets="deprecates-style">
+			<xsl:call-template name="refine_deprecates-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template name="setStyle_preferred">
-		<xsl:if test="mn:strong">
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-		</xsl:if>
-	</xsl:template>
-
 	<!-- regarding ISO 10241-1:2011,  If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
 	<!-- in metanorma xml preferred terms delimited by semicolons -->
 	<xsl:template match="mn:fmt-preferred/text()[contains(., ';')] | mn:fmt-preferred/mn:strong/text()[contains(., ';')]">
@@ -7360,6 +7593,7 @@
 
 	<xsl:template match="mn:fmt-related">
 		<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
+			<xsl:call-template name="refine_related-block-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -7374,6 +7608,7 @@
 	<!-- ========== -->
 	<xsl:template match="mn:fmt-definition">
 		<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
+			<xsl:call-template name="refine_definition-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -7403,6 +7638,9 @@
 	</xsl:attribute-set> <!-- termexample-style -->
 
 	<xsl:template name="refine_termexample-style">
+		<xsl:if test="preceding-sibling::*[1][self::mn:termnote]">
+			<xsl:attribute name="margin-top">6pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_termexample-style -->
 
 	<xsl:attribute-set name="termexample-name-style">
@@ -7426,6 +7664,9 @@
 	<xsl:attribute-set name="example-body-style">
 	</xsl:attribute-set> <!-- example-body-style -->
 
+	<xsl:template name="refine_example-body-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="example-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="padding-right">9mm</xsl:attribute>
@@ -7455,7 +7696,12 @@
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:apply-templates select="mn:fmt-name"/>
-			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
+			<fo:block-container margin-left="11mm">
+				<fo:block-container margin-left="0mm">
+					<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
+				</fo:block-container>
+			</fo:block-container>
+
 		</fo:block>
 	</xsl:template>
 
@@ -7475,9 +7721,8 @@
 		<xsl:choose>
 			<xsl:when test="contains($element, 'block')">
 				<fo:block xsl:use-attribute-sets="example-p-style">
-					<xsl:if test="not(preceding-sibling::mn:p)">
-						<xsl:attribute name="margin-top">6pt</xsl:attribute>
-					</xsl:if>
+
+					<xsl:call-template name="refine_example-p-style"/>
 
 					<xsl:apply-templates/>
 				</fo:block>
@@ -7530,6 +7775,7 @@
 						</fo:block>
 
 						<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+							<xsl:call-template name="refine_example-body-style"/>
 							<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 								<xsl:variable name="example_body">
 									<xsl:apply-templates select="node()[not(self::mn:fmt-name)]">
@@ -7592,6 +7838,7 @@
 						<xsl:if test="*[not(self::mn:fmt-name)][position() &gt; 1]">
 							<!-- display further elements in blocks -->
 							<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+								<xsl:call-template name="refine_example-body-style"/>
 								<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 									<xsl:apply-templates select="*[not(self::mn:fmt-name)][position() &gt; 1]">
 										<xsl:with-param name="fo_element" select="'block'"/>
@@ -7726,6 +7973,12 @@
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-style -->
 
+	<xsl:attribute-set name="table-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -7861,6 +8114,9 @@
 		<!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
 	</xsl:attribute-set> <!-- table-fn-number-style -->
 
+	<xsl:template name="refine_table-fn-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-fmt-fn-label-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="baseline-shift">30%</xsl:attribute>
@@ -7870,30 +8126,12 @@
 	<xsl:template name="refine_table-fmt-fn-label-style">
 	</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>
-	</xsl:attribute-set>
-
 	<xsl:attribute-set name="table-fn-body-style">
 	</xsl:attribute-set>
 
-	<xsl:attribute-set name="figure-fn-number-style">
-		<xsl:attribute name="padding-right">5mm</xsl:attribute>
-	</xsl:attribute-set> <!-- figure-fn-number-style -->
-
-	<xsl:attribute-set name="figure-fmt-fn-label-style">
-		<xsl:attribute name="font-size">80%</xsl:attribute>
-		<xsl:attribute name="vertical-align">super</xsl:attribute>
-	</xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
-
-	<xsl:template name="refine_figure-fmt-fn-label-style">
+	<xsl:template name="refine_table-fn-body-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="figure-fn-body-style">
-		<xsl:attribute name="text-align">justify</xsl:attribute>
-		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-	</xsl:attribute-set>
 	<!-- ========================== -->
 	<!-- END Table styles -->
 	<!-- ========================== -->
@@ -9168,6 +9406,7 @@
 					</xsl:apply-templates>
 
 					<fo:inline xsl:use-attribute-sets="table-fn-body-style">
+						<xsl:call-template name="refine_table-fn-body-style"/>
 						<!-- <xsl:copy-of select="./node()"/> -->
 						<xsl:apply-templates/>
 					</fo:inline>
@@ -9186,6 +9425,7 @@
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
 			<fo:inline xsl:use-attribute-sets="table-fn-number-style" role="SKIP">
+				<xsl:call-template name="refine_table-fn-number-style"/>
 
 				<!-- tab is padding-right -->
 				<xsl:apply-templates select=".//mn:tab">
@@ -10057,9 +10297,18 @@
 	<xsl:attribute-set name="dl-block-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_dl-block-style">
+		<xsl:if test="@key = 'true' and ancestor::mn:figure">
+			<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="dt-row-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_dt-row-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="dt-cell-style">
 	</xsl:attribute-set>
 
@@ -10082,6 +10331,9 @@
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- dl-name-style -->
 
+	<xsl:template name="refine_dl-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
 	</xsl:attribute-set>
@@ -10120,9 +10372,7 @@
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
 		<fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP">
 
-			<xsl:if test="@key = 'true' and ancestor::mn:figure">
-				<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-			</xsl:if>
+			<xsl:call-template name="refine_dl-block-style"/>
 
 			<xsl:call-template name="setBlockSpanAll"/>
 			<xsl:if test="not(ancestor::mn:quote)">
@@ -10418,6 +10668,8 @@
 		<xsl:if test="$process = 'true'">
 			<fo:block xsl:use-attribute-sets="dl-name-style">
 
+				<xsl:call-template name="refine_dl-name-style"/>
+
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -10606,6 +10858,8 @@
 		<xsl:param name="split_keep-within-line"/>
 
 		<fo:table-row xsl:use-attribute-sets="dt-row-style">
+			<xsl:call-template name="refine_dt-row-style"/>
+
 			<xsl:call-template name="insert_dt_cell">
 				<xsl:with-param name="key_iso" select="$key_iso"/>
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -10815,15 +11069,22 @@
 	<xsl:attribute-set name="appendix-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_appendix-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="appendix-example-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_appendix-example-style">
+	</xsl:template>
+
 	<!-- ======================== -->
 	<!-- Appendix processing -->
 	<!-- ======================== -->
 	<xsl:template match="mn:appendix">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
+			<xsl:call-template name="refine_appendix-style"/>
 			<xsl:apply-templates select="mn:fmt-title"/>
 		</fo:block>
 		<xsl:apply-templates select="node()[not(self::mn:fmt-title)]"/>
@@ -10842,6 +11103,7 @@
 	<xsl:template match="mn:appendix//mn:example" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
+			<xsl:call-template name="refine_appendix-example-style"/>
 			<xsl:apply-templates select="mn:fmt-name"/>
 		</fo:block>
 		<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
@@ -10850,7 +11112,16 @@
 	<xsl:attribute-set name="xref-style">
 		<xsl:attribute name="color">blue</xsl:attribute>
 		<xsl:attribute name="text-decoration">underline</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- xref-style -->
+
+	<xsl:template name="refine_xref-style">
+		<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[self::mn:table or self::mn:dl])">
+			<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="parent::mn:add">
+			<xsl:call-template name="append_add-style"/>
+		</xsl:if>
+	</xsl:template> <!-- refine_xref-style -->
 
 	<xsl:template match="mn:fmt-xref">
 		<xsl:call-template name="insert_basic_link">
@@ -10859,12 +11130,8 @@
 					<xsl:call-template name="getAltText"/>
 				</xsl:variable>
 				<fo:basic-link internal-destination="{@target}" fox:alt-text="{$alt_text}" xsl:use-attribute-sets="xref-style">
-					<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[self::mn:table or self::mn:dl])">
-						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="parent::mn:add">
-						<xsl:call-template name="append_add-style"/>
-					</xsl:if>
+					<xsl:call-template name="refine_xref-style"/>
+
 					<xsl:apply-templates/>
 				</fo:basic-link>
 			</xsl:with-param>
@@ -10981,16 +11248,16 @@
 		<xsl:attribute name="margin-top">12pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="text-align">justify</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- note-style -->
 
 	<xsl:template name="refine_note-style">
-	</xsl:template>
+	</xsl:template> <!-- refine_note-style -->
 
 	<xsl:variable name="note-body-indent">10mm</xsl:variable>
 	<xsl:variable name="note-body-indent-table">5mm</xsl:variable>
 
 	<xsl:attribute-set name="note-name-style">
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- note-name-style -->
 
 	<xsl:template name="refine_note-name-style">
 	</xsl:template> <!-- refine_note-name-style -->
@@ -11004,20 +11271,29 @@
 
 	<xsl:attribute-set name="note-p-style">
 		<xsl:attribute name="text-align">justify</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- note-p-style -->
+
+	<xsl:template name="refine_note-p-style">
+	</xsl:template>
 
 	<xsl:attribute-set name="termnote-style">
 		<xsl:attribute name="font-size">9pt</xsl:attribute>
-		<xsl:attribute name="margin-top">12pt</xsl:attribute>
-		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="margin-top">6pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		<xsl:attribute name="text-align">justify</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- termnote-style -->
 
 	<xsl:template name="refine_termnote-style">
+		<xsl:if test="preceding-sibling::*[1][self::mn:fmt-definition]">
+			<xsl:attribute name="margin-top">12pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="not(following-sibling::*)">
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_termnote-style -->
 
 	<xsl:attribute-set name="termnote-name-style">
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- termnote-name-style -->
 
 	<xsl:template name="refine_termnote-name-style">
 	</xsl:template>
@@ -11025,6 +11301,9 @@
 	<xsl:attribute-set name="termnote-p-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termnote-p-style">
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- note      -->
 	<!-- termnote -->
@@ -11085,11 +11364,13 @@
 		<xsl:choose>
 			<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
 				<fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
+					<xsl:call-template name="refine_note-p-style"/>
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
+					<xsl:call-template name="refine_note-p-style"/>
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -11181,11 +11462,13 @@
 		<xsl:choose>
 			<xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
 				<fo:inline xsl:use-attribute-sets="termnote-p-style">
+					<xsl:call-template name="refine_termnote-p-style"/>
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="termnote-p-style">
+					<xsl:call-template name="refine_termnote-p-style"/>
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -11198,7 +11481,7 @@
 	<xsl:attribute-set name="quote-style">
 		<xsl:attribute name="margin-left">12mm</xsl:attribute>
 		<xsl:attribute name="margin-right">12mm</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- quote-style -->
 
 	<xsl:template name="refine_quote-style">
 	</xsl:template>
@@ -11207,6 +11490,9 @@
 		<xsl:attribute name="text-align">right</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_quote-source-style">
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -11235,6 +11521,7 @@
 				</fo:block-container>
 				<xsl:if test="mn:author or mn:fmt-source or mn:attribution">
 					<fo:block xsl:use-attribute-sets="quote-source-style">
+						<xsl:call-template name="refine_quote-source-style"/>
 						<!-- — ISO, ISO 7301:2011, Clause 1 -->
 						<xsl:apply-templates select="mn:author"/>
 						<xsl:apply-templates select="mn:fmt-source"/>
@@ -11297,6 +11584,15 @@
 	<xsl:attribute-set name="figure-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_figure-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="figure-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="font-family">Arial</xsl:attribute>
@@ -11305,7 +11601,7 @@
 		<xsl:attribute name="margin-top">12pt</xsl:attribute>
 		<xsl:attribute name="space-after">6pt</xsl:attribute>
 		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- figure-name-style -->
 
 	<xsl:template name="refine_figure-name-style">
 		<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
@@ -11317,7 +11613,7 @@
 	<xsl:attribute-set name="image-style">
 		<xsl:attribute name="role">SKIP</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- image-style -->
 
 	<xsl:template name="refine_image-style">
 	</xsl:template>
@@ -11327,14 +11623,51 @@
 		<xsl:attribute name="content-height">100%</xsl:attribute>
 		<xsl:attribute name="scaling">uniform</xsl:attribute>
 		<xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- image-graphic-style -->
+
+	<xsl:template name="refine_image-graphic-style">
+	</xsl:template>
 
 	<xsl:attribute-set name="figure-source-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_figure-source-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-pseudocode-p-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_figure-pseudocode-p-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="figure-fn-number-style">
+		<xsl:attribute name="padding-right">5mm</xsl:attribute>
+	</xsl:attribute-set> <!-- figure-fn-number-style -->
+
+	<xsl:template name="refine_figure-fn-number-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="figure-fmt-fn-label-style">
+		<xsl:attribute name="font-size">80%</xsl:attribute>
+		<xsl:attribute name="vertical-align">super</xsl:attribute>
+	</xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
+
+	<xsl:template name="refine_figure-fmt-fn-label-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="figure-fn-body-style">
+		<xsl:attribute name="text-align">justify</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-fn-body-style">
+		<xsl:variable name="key_iso">
+		</xsl:variable>
+		<xsl:if test="normalize-space($key_iso) = 'true'">
+			<xsl:attribute name="margin-bottom">0</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- ============================ -->
 	<!-- figure's footnotes rendering -->
 	<!-- ============================ -->
@@ -11447,9 +11780,8 @@
 									</fo:table-cell>
 									<fo:table-cell>
 										<fo:block xsl:use-attribute-sets="figure-fn-body-style">
-											<xsl:if test="normalize-space($key_iso) = 'true'">
-												<xsl:attribute name="margin-bottom">0</xsl:attribute>
-											</xsl:if>
+											<xsl:call-template name="refine_figure-fn-body-style"/>
+
 											<!-- <xsl:copy-of select="./node()"/> -->
 											<xsl:apply-templates/>
 										</fo:block>
@@ -11467,6 +11799,7 @@
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
 			<fo:inline xsl:use-attribute-sets="figure-fn-number-style" role="SKIP">
+				<xsl:call-template name="refine_figure-fn-number-style"/>
 				<xsl:attribute name="padding-right">0mm</xsl:attribute>
 
 				<!-- tab is padding-right -->
@@ -11504,6 +11837,7 @@
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 		</xsl:if>
 		<fo:inline xsl:use-attribute-sets="figure-fn-number-style figure-fmt-fn-label-style"> <!-- id="{@id}"  -->
+			<xsl:call-template name="refine_figure-fn-number-style"/>
 			<!-- <xsl:value-of select="@reference"/> -->
 			<xsl:apply-templates/>
 		</fo:inline>
@@ -11549,6 +11883,8 @@
 
 			<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
 
+				<xsl:call-template name="refine_figure-style"/>
+
 				<xsl:for-each select="mn:fmt-name"> <!-- set context -->
 					<xsl:call-template name="setIDforNamedDestination"/>
 				</xsl:for-each>
@@ -11592,6 +11928,7 @@
 
 	<xsl:template match="mn:figure[@class = 'pseudocode']//mn:p">
 		<fo:block xsl:use-attribute-sets="figure-pseudocode-p-style">
+			<xsl:call-template name="refine_figure-pseudocode-p-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -11721,6 +12058,8 @@
 										</xsl:variable>
 										<xsl:copy-of select="xalan:nodeset($image-graphic-style_attributes)/attributes/@*"/>
 
+										<xsl:call-template name="refine_image-graphic-style"/>
+
 										<xsl:if test="not(@mimetype = 'image/svg+xml') and not(ancestor::mn:table)">
 											<xsl:variable name="scale">
 												<xsl:call-template name="getImageScale">
@@ -12420,6 +12759,9 @@
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- formula-style -->
 
+	<xsl:template name="refine_formula-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="formula-stem-block-style">
 		<xsl:attribute name="text-align">center</xsl:attribute>
 		<xsl:attribute name="text-align">left</xsl:attribute>
@@ -12490,6 +12832,8 @@
 	<xsl:template match="mn:formula[mn:fmt-name]/mn:fmt-stem">
 		<fo:block xsl:use-attribute-sets="formula-style">
 
+			<xsl:call-template name="refine_formula-style"/>
+
 			<fo:table table-layout="fixed" width="100%">
 				<fo:table-column column-width="95%"/>
 				<fo:table-column column-width="5%"/>
@@ -12899,11 +13243,33 @@
 	<!-- ======================================= -->
 
 	<xsl:attribute-set name="list-style">
-		<xsl:attribute name="provisional-distance-between-starts">8mm</xsl:attribute>
+		<xsl:attribute name="provisional-distance-between-starts">7mm</xsl:attribute>
 		<xsl:attribute name="margin-top">8pt</xsl:attribute>
 	</xsl:attribute-set> <!-- list-style -->
 
 	<xsl:template name="refine_list-style">
+		<xsl:if test="parent::mn:admonition[@type = 'commentary']">
+			<xsl:attribute name="margin-left">7mm</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="preceding-sibling::*[1][self::mn:p]">
+			<!-- <xsl:attribute name="margin-top">6pt</xsl:attribute> -->
+			<xsl:attribute name="margin-top">12pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="ancestor::mn:note or ancestor::mn:termnote">
+			<xsl:attribute name="provisional-distance-between-starts">4mm</xsl:attribute>
+		</xsl:if>
+
+		<xsl:variable name="processing_instruction_type" select="normalize-space(preceding-sibling::*[1]/processing-instruction('list-type'))"/>
+		<xsl:if test="self::mn:ul and normalize-space($processing_instruction_type) = 'simple'">
+			<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
+			<xsl:attribute name="line-height">1.3</xsl:attribute>
+			<xsl:attribute name="margin-left">6.2mm</xsl:attribute>
+			<xsl:attribute name="provisional-distance-between-starts">6.5mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_list-style -->
 
 	<xsl:attribute-set name="list-name-style">
@@ -12912,6 +13278,9 @@
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- list-name-style -->
 
+	<xsl:template name="refine_list-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="list-item-style">
 	</xsl:attribute-set>
 
@@ -13147,11 +13516,16 @@
 				</fo:block-container>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block role="SKIP">
-					<xsl:apply-templates select="." mode="list">
-						<xsl:with-param name="indent" select="$indent"/>
-					</xsl:apply-templates>
-				</fo:block>
+				<fo:block-container margin-left="4mm">
+					<fo:block-container margin-left="0mm">
+						<fo:block role="SKIP">
+							<xsl:apply-templates select="." mode="list">
+								<xsl:with-param name="indent" select="$indent"/>
+							</xsl:apply-templates>
+						</fo:block>
+					</fo:block-container>
+				</fo:block-container>
+
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
@@ -13226,6 +13600,7 @@
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
 			<fo:block xsl:use-attribute-sets="list-name-style">
+				<xsl:call-template name="refine_list-name-style"/>
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -13286,26 +13661,54 @@
 	<!-- END Lists processing -->
 	<!-- ===================================== -->
 
+	<xsl:attribute-set name="footnote-separator-leader-style">
+		<xsl:attribute name="leader-pattern">rule</xsl:attribute>
+		<xsl:attribute name="rule-thickness">0.5pt</xsl:attribute>
+		<xsl:attribute name="leader-length">35%</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_footnote-separator-leader-style">
+		<xsl:if test="$current_template = 'whitepaper' or $current_template= 'icap-whitepaper' or $current_template = 'industry-connection-report'">
+			<xsl:attribute name="rule-thickness">1pt</xsl:attribute>
+			<xsl:attribute name="leader-length">51mm</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>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_fn-container-body-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="fn-reference-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">65%</xsl:attribute>
 		<xsl:attribute name="vertical-align">super</xsl:attribute>
-
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- fn-reference-style -->
 
 	<xsl:template name="refine_fn-reference-style">
+		<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
+		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
 	</xsl:template> <!-- refine_fn-reference-style -->
 
 	<xsl:attribute-set name="fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_fn-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="fn-num-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">65%</xsl:attribute>
 		<xsl:attribute name="vertical-align">super</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- fn-num-style -->
+
+	<xsl:template name="refine_fn-num-style">
+	</xsl:template>
 
 	<xsl:attribute-set name="fn-body-style">
 		<xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -13314,7 +13717,7 @@
 		<xsl:attribute name="start-indent">0</xsl:attribute>
 		<xsl:attribute name="font-size">8pt</xsl:attribute>
 		<!-- <xsl:attribute name="margin-bottom">5pt</xsl:attribute> -->
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- fn-body-style" -->
 
 	<xsl:template name="refine_fn-body-style">
 		<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
@@ -13386,10 +13789,12 @@
 					<xsl:choose>
 						<xsl:when test="ancestor::mn:bibitem">
 							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
+								<xsl:call-template name="refine_bibitem-note-fn-style"/>
 							</fn_styles>
 						</xsl:when>
 						<xsl:otherwise>
 							<fn_styles xsl:use-attribute-sets="fn-num-style">
+								<xsl:call-template name="refine_fn-num-style"/>
 							</fn_styles>
 						</xsl:otherwise>
 					</xsl:choose>
@@ -13399,9 +13804,12 @@
 					<xsl:copy-of select="."/>
 				</xsl:for-each>
 
-				<xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
+				<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
+				<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
 					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
-				</xsl:if>
+				</xsl:if> -->
+
+				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
 
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
@@ -13424,10 +13832,12 @@
 			<xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false' or $footnote_body_from_table = 'true'">
 
 				<fo:footnote xsl:use-attribute-sets="fn-style" role="SKIP">
+					<xsl:call-template name="refine_fn-style"/>
 					<xsl:copy-of select="$footnote_inline"/>
 					<fo:footnote-body role="Note">
 
 						<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
+							<xsl:call-template name="refine_fn-container-body-style"/>
 
 							<xsl:variable name="fn_block">
 								<xsl:call-template name="refine_fn-body-style"/>
@@ -13528,6 +13938,9 @@
 		<xsl:attribute name="space-after">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-style -->
 
+	<xsl:template name="refine_admonition-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="admonition-container-style">
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -13535,13 +13948,23 @@
 		<xsl:attribute name="padding-bottom">2mm</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-container-style -->
 
+	<xsl:template name="refine_admonition-container-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="admonition-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-name-style -->
 
+	<xsl:template name="refine_admonition-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="admonition-p-style">
 		<xsl:attribute name="text-align">justify</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-p-style -->
+
+	<xsl:template name="refine_admonition-p-style">
+	</xsl:template>
+
 	<!-- end admonition -->
 
 	<!-- ================ -->
@@ -13551,6 +13974,8 @@
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
 
+			<xsl:call-template name="refine_admonition-style"/>
+
 			<xsl:call-template name="setBlockSpanAll"/>
 				<xsl:if test="@type = 'editorial'">
 					<xsl:attribute name="border">none</xsl:attribute>
@@ -13567,6 +13992,8 @@
 					<xsl:attribute name="text-align">left</xsl:attribute>
 				</xsl:if>
 					<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
+
+						<xsl:call-template name="refine_admonition-container-style"/>
 							<xsl:if test="@type = 'editorial' or not(@type)">
 								<xsl:attribute name="padding">0mm</xsl:attribute>
 							</xsl:if>
@@ -13576,6 +14003,7 @@
 							</xsl:if>
 								<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 									<fo:block xsl:use-attribute-sets="admonition-p-style">
+										<xsl:call-template name="refine_admonition-p-style"/>
 										<fo:inline>
 											<xsl:call-template name="displayAdmonitionName">
 												<xsl:with-param name="sep">: </xsl:with-param>
@@ -13640,6 +14068,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="admonition-p-style">
+					<xsl:call-template name="refine_admonition-p-style"/>
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -13651,21 +14080,43 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
+	<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="margin-top">6pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">36pt</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:template>
+
 	<!-- bibitem in Normative References (references/@normative="true") -->
 	<xsl:attribute-set name="bibitem-normative-style">
 		<xsl:attribute name="margin-top">12pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-normative-style -->
 
+	<xsl:template name="refine_bibitem-normative-style">
+	</xsl:template>
+
 	<!-- bibitem in Normative References (references/@normative="true"), renders as list -->
 	<xsl:attribute-set name="bibitem-normative-list-style">
 		<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-normative-list-style -->
 
+	<xsl:template name="refine_bibitem-normative-list-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="bibitem-non-normative-style">
 	</xsl:attribute-set> <!-- bibitem-non-normative-style -->
 
+	<xsl:template name="refine_bibitem-non-normative-style">
+	</xsl:template>
+
 	<!-- bibitem in bibliography section (references/@normative="false"), renders as list -->
 	<xsl:attribute-set name="bibitem-non-normative-list-style">
 		<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
@@ -13674,20 +14125,40 @@
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
 
+	<xsl:template name="refine_bibitem-non-normative-list-style">
+		<xsl:variable name="bibitem_label">
+			<xsl:apply-templates select="mn:biblio-tag">
+				<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
+			</xsl:apply-templates>
+		</xsl:variable>
+		<xsl:if test="string-length(normalize-space($bibitem_label)) &gt; 5">
+			<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="bibitem-non-normative-list-item-style">
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_bibitem-non-normative-list-item-style">
+	</xsl:template>
+
 	<!-- bibitem in bibliography section (references/@normative="false"), list body -->
 	<xsl:attribute-set name="bibitem-normative-list-body-style">
 		<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_bibitem-normative-list-body-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="bibitem-non-normative-list-body-style">
 		<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-non-normative-list-body-style -->
 
+	<xsl:template name="refine_bibitem-non-normative-list-body-style">
+	</xsl:template>
+
 	<!-- footnote reference number for bibitem, in the text  -->
 	<xsl:attribute-set name="bibitem-note-fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
@@ -13696,6 +14167,9 @@
 		<xsl:attribute name="baseline-shift">30%</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-note-fn-style -->
 
+	<xsl:template name="refine_bibitem-note-fn-style">
+	</xsl:template>
+
 	<!-- footnote number on the page bottom -->
 	<xsl:attribute-set name="bibitem-note-fn-number-style">
 		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
@@ -13715,6 +14189,9 @@
 	<xsl:attribute-set name="references-non-normative-style">
 	</xsl:attribute-set> <!-- references-non-normative-style -->
 
+	<xsl:template name="refine_references-non-normative-style">
+	</xsl:template>
+
 		<!-- ======================= -->
 	<!-- Bibliography rendering -->
 	<!-- ======================= -->
@@ -13755,6 +14232,7 @@
 		<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
 
 		<fo:block xsl:use-attribute-sets="references-non-normative-style">
+			<xsl:call-template name="refine_references-non-normative-style"/>
 			<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
 		</fo:block>
 	</xsl:template> <!-- references -->
@@ -13768,29 +14246,25 @@
 		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
+			<xsl:call-template name="refine_bibitem-normative-style"/>
+
 			<xsl:call-template name="processBibitem"/>
 		</fo:block>
 
 	</xsl:template> <!-- bibitem -->
 
 	<!-- Bibliography (non-normative references) -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
+	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
 		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
 		<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
-				<xsl:variable name="bibitem_label">
-					<xsl:apply-templates select="mn:biblio-tag">
-						<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
-					</xsl:apply-templates>
-				</xsl:variable>
-				<xsl:if test="string-length(normalize-space($bibitem_label)) &gt; 5">
-					<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="refine_bibitem-non-normative-list-style"/>
+
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
-					<fo:block role="SKIP">
+					<fo:block role="SKIP" id="__internal_layout__bibitem_{@id}_{generate-id()}">
 						<fo:inline role="SKIP">
 								<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report')">
 									<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
@@ -13803,6 +14277,7 @@
 				</fo:list-item-label>
 				<fo:list-item-body start-indent="body-start()">
 					<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
+						<xsl:call-template name="refine_bibitem-non-normative-list-body-style"/>
 						<xsl:call-template name="processBibitem">
 							<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
 						</xsl:call-template>
@@ -13813,12 +14288,17 @@
 
 	</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
 
+	<!-- bibitem's notes will be processing in 'processBibitemFollowingNotes' -->
+	<xsl:template match="mn:references/mn:note" priority="2"/> <!-- [not(@normative='true')] -->
+
 	<xsl:template name="insertListItem_Bibitem">
 		<xsl:choose>
 			<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
 			<xsl:otherwise>
 				<xsl:call-template name="setNamedDestination"/>
 				<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
+					<xsl:call-template name="refine_bibitem-non-normative-list-item-style"/>
+
 					<fo:list-item-label end-indent="label-end()">
 						<fo:block role="SKIP">
 							<fo:inline role="SKIP">
@@ -13829,16 +14309,18 @@
 						</fo:block>
 					</fo:list-item-label>
 					<fo:list-item-body start-indent="body-start()">
-						<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
+						<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style"> <!-- role="SKIP" -->
+							<xsl:call-template name="refine_bibitem-non-normative-list-body-style"/>
 							<xsl:call-template name="processBibitem">
 								<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
 							</xsl:call-template>
 						</fo:block>
+						<xsl:call-template name="processBibitemFollowingNotes"/>
 					</fo:list-item-body>
 				</fo:list-item>
 			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
+		<xsl:apply-templates select="following-sibling::*[self::mn:bibitem][1]">
 			<xsl:with-param name="skip">false</xsl:with-param>
 		</xsl:apply-templates>
 	</xsl:template>
@@ -13854,25 +14336,16 @@
 			<xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
 		</xsl:apply-templates>
 		<xsl:apply-templates select="mn:formattedref"/>
+				<xsl:call-template name="processBibitemFollowingNotes"/>
 		<!-- end bibitem processing -->
-
-		<xsl:call-template name="processBibliographyNote"/>
 	</xsl:template> <!-- processBibitem (bibitem) -->
 
-	<xsl:template name="processBibliographyNote">
-		<xsl:if test="self::mn:note">
-			<xsl:variable name="note_node">
-				<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
-					<xsl:copy> <!-- skip @id -->
-						<xsl:copy-of select="node()"/>
-					</xsl:copy>
-				</xsl:element>
-			</xsl:variable>
-			<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
-				<xsl:call-template name="note"/>
-			</xsl:for-each> -->
+	<xsl:template name="processBibitemFollowingNotes">
+		<!-- current context is bibitem element -->
+		<xsl:variable name="bibitem_id" select="@id"/>
+		<xsl:for-each select="following-sibling::mn:note[preceding-sibling::mn:bibitem[1][@id = $bibitem_id] and     preceding-sibling::*[1][self::mn:note or self::mn:bibitem]]">
 			<xsl:call-template name="note"/>
-		</xsl:if>
+		</xsl:for-each>
 	</xsl:template>
 
 	<xsl:template match="mn:title" mode="title">
@@ -14072,11 +14545,17 @@
 	<!-- Index section styles -->
 	<xsl:attribute-set name="indexsect-title-style">
 		<xsl:attribute name="role">H1</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- indexsect-title-style -->
+
+	<xsl:template name="refine_indexsect-title-style">
+	</xsl:template>
 
 	<xsl:attribute-set name="indexsect-clause-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- indexsect-clause-title-style -->
+
+	<xsl:template name="refine_indexsect-clause-title-style">
+	</xsl:template>
 	<!-- End Index section styles -->
 
 	<!-- =================== -->
@@ -14270,6 +14749,7 @@
 
 	<xsl:template match="mn:indexsect/mn:fmt-title | mn:indexsect/mn:title" priority="4">
 		<fo:block xsl:use-attribute-sets="indexsect-title-style">
+			<xsl:call-template name="refine_indexsect-title-style"/>
 			<!-- Index -->
 			<xsl:apply-templates/>
 		</fo:block>
@@ -14278,6 +14758,7 @@
 	<xsl:template match="mn:indexsect/mn:clause/mn:fmt-title | mn:indexsect/mn:clause/mn:title" priority="4">
 		<!-- Letter A, B, C, ... -->
 		<fo:block xsl:use-attribute-sets="indexsect-clause-title-style">
+			<xsl:call-template name="refine_indexsect-clause-title-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -14481,9 +14962,15 @@
 			<xsl:attribute name="leader-pattern">dots</xsl:attribute>
 	</xsl:attribute-set> <!-- END: toc-leader-style -->
 
+	<xsl:template name="refine_toc-leader-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-pagenumber-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-pagenumber-style">
+	</xsl:template>
+
 	<!-- List of Figures, Tables -->
 	<xsl:attribute-set name="toc-listof-title-style">
 			<xsl:attribute name="role">TOCI</xsl:attribute>
@@ -14503,6 +14990,9 @@
 	<xsl:attribute-set name="toc-listof-item-block-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-listof-item-block-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-listof-item-style">
 		<xsl:attribute name="role">TOCI</xsl:attribute>
 		<xsl:attribute name="provisional-distance-between-starts">22.5mm</xsl:attribute>
@@ -14511,6 +15001,9 @@
 		<xsl:attribute name="margin-left">2mm</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-listof-item-style">
+	</xsl:template>
+
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
 			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
@@ -15622,23 +16115,55 @@
 	<!-- Ruby text (CJK languages) rendering -->
 	<!-- ===================================== -->
 	<!-- ===================================== -->
+
+	<xsl:attribute-set name="ruby-style">
+		<xsl:attribute name="text-indent">0mm</xsl:attribute>
+		<xsl:attribute name="last-line-end-indent">0mm</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_ruby-style">
+		<xsl:if test="not(ancestor::mn:ruby)">
+			<xsl:attribute name="alignment-baseline">central</xsl:attribute>
+		</xsl:if>
+		<xsl:variable name="rt_text" select="mn:rt"/>
+		<xsl:variable name="rb_text" select=".//mn:rb[not(mn:ruby)]"/>
+		<!-- Example: width="2em"  -->
+		<xsl:variable name="text_rt_width" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($rt_text, $font_main, 6)"/>
+		<xsl:variable name="text_rb_width" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($rb_text, $font_main, 10)"/>
+		<xsl:variable name="text_width">
+			<xsl:choose>
+				<xsl:when test="$text_rt_width &gt;= $text_rb_width"><xsl:value-of select="$text_rt_width"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$text_rb_width"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:attribute name="width"><xsl:value-of select="$text_width div 10"/>em</xsl:attribute>
+	</xsl:template> <!-- refine_ruby-style -->
+
+	<xsl:attribute-set name="rb-style">
+		<xsl:attribute name="line-height">1em</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_rb-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="rt-style">
+		<xsl:attribute name="font-size">0.5em</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="line-height">1.2em</xsl:attribute>
+		<xsl:attribute name="space-before">-1.4em</xsl:attribute>
+		<xsl:attribute name="space-before.conditionality">retain</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_rt-style">
+		<xsl:if test="ancestor::mn:ruby[last()]//mn:ruby or     ancestor::mn:rb">
+			<xsl:attribute name="space-before">0em</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template match="mn:ruby">
-		<fo:inline-container text-indent="0mm" last-line-end-indent="0mm">
-			<xsl:if test="not(ancestor::mn:ruby)">
-				<xsl:attribute name="alignment-baseline">central</xsl:attribute>
-			</xsl:if>
-			<xsl:variable name="rt_text" select="mn:rt"/>
-			<xsl:variable name="rb_text" select=".//mn:rb[not(mn:ruby)]"/>
-			<!-- Example: width="2em"  -->
-			<xsl:variable name="text_rt_width" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($rt_text, $font_main, 6)"/>
-			<xsl:variable name="text_rb_width" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($rb_text, $font_main, 10)"/>
-			<xsl:variable name="text_width">
-				<xsl:choose>
-					<xsl:when test="$text_rt_width &gt;= $text_rb_width"><xsl:value-of select="$text_rt_width"/></xsl:when>
-					<xsl:otherwise><xsl:value-of select="$text_rb_width"/></xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			<xsl:attribute name="width"><xsl:value-of select="$text_width div 10"/>em</xsl:attribute>
+		<fo:inline-container xsl:use-attribute-sets="ruby-style">
+			<xsl:call-template name="refine_ruby-style"/>
 
 			<xsl:choose>
 				<xsl:when test="ancestor::mn:ruby">
@@ -15656,17 +16181,14 @@
 	</xsl:template>
 
 	<xsl:template match="mn:rb">
-		<fo:block line-height="1em" text-align="center"><xsl:apply-templates/></fo:block>
+		<fo:block xsl:use-attribute-sets="rb-style"><xsl:call-template name="refine_rb-style"/><xsl:apply-templates/></fo:block>
 	</xsl:template>
 
 	<xsl:template match="mn:rt">
-		<fo:block font-size="0.5em" text-align="center" line-height="1.2em" space-before="-1.4em" space-before.conditionality="retain"> <!--  -->
-			<xsl:if test="ancestor::mn:ruby[last()]//mn:ruby or      ancestor::mn:rb">
-				<xsl:attribute name="space-before">0em</xsl:attribute>
-			</xsl:if>
+		<fo:block xsl:use-attribute-sets="rt-style"> <!--  -->
+			<xsl:call-template name="refine_rt-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
-
 	</xsl:template>
 
 	<!-- ===================================== -->
@@ -15675,6 +16197,27 @@
 	<!-- ===================================== -->
 	<!-- ===================================== -->
 
+	<xsl:attribute-set name="annex-title-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_annex-title-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="p-zzSTDTitle1-style">
+		<xsl:attribute name="font-family">Arial</xsl:attribute>
+		<xsl:attribute name="font-size">23pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-top">84pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">52pt</xsl:attribute>
+		<xsl:attribute name="line-height">1.1</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_p-zzSTDTitle1-style">
+		<xsl:if test="(contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != '') or       $current_template = 'standard'">
+			<xsl:attribute name="font-size">24pt</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<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"/>
@@ -16013,10 +16556,17 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="clause-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_clause-style">
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="sections_element_style"/>
@@ -16049,6 +16599,14 @@
 	</xsl:template>
 
 	<xsl:template name="sections_element_style">
+		<xsl:variable name="pos"><xsl:number count="*"/></xsl:variable>
+		<xsl:if test="$pos &gt;= 2">
+			<xsl:attribute name="space-before">
+				<xsl:for-each select="mn:fmt-title[1]">
+					<xsl:call-template name="getTitleMarginTop"/>
+				</xsl:for-each>
+			</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- sections_element_style -->
 
 	<xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
@@ -16140,6 +16698,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
 
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>