From 8c0ce63f6cb3dfc73aae012a23c3e88be41a2d29 Mon Sep 17 00:00:00 2001
From: Intelligent2013 <Intelligent2013@users.noreply.github.com>
Date: Mon, 1 Jul 2024 20:26:11 +0000
Subject: [PATCH] xslt update based on
 metanorma/mn-native-pdf@99fb4dc758cac54c31e15fc28e160d081f30bbf5

---
 lib/isodoc/m3aawg/m3aawg.policy.xsl | 30 +++++++++++++++++++----------
 lib/isodoc/m3aawg/m3aawg.report.xsl | 30 +++++++++++++++++++----------
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/lib/isodoc/m3aawg/m3aawg.policy.xsl b/lib/isodoc/m3aawg/m3aawg.policy.xsl
index 170fb50..b99aaf6 100644
--- a/lib/isodoc/m3aawg/m3aawg.policy.xsl
+++ b/lib/isodoc/m3aawg/m3aawg.policy.xsl
@@ -2513,18 +2513,18 @@
 				<xsl:element name="page_sequence" namespace="{$namespace_full}">
 					<xsl:attribute name="main_page_sequence"/>
 					<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
-
-						<xsl:if test="local-name()='clause' and @type='scope'">
-							<xsl:if test="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
-								<fo:block break-after="page"/>
-								<xsl:element name="pagebreak" namespace="{$namespace_full}"/>
-							</xsl:if>
-						</xsl:if>
-
 				</xsl:element>
 			</xsl:for-each>
 		</xsl:element>
 
+		<xsl:call-template name="insertAnnexInSeparatePageSequences"/>
+
+		<xsl:call-template name="insertBibliographyInSeparatePageSequences"/>
+
+		<!-- <xsl:call-template name="insertIndexInSeparatePageSequences"/> -->
+	</xsl:template> <!-- END: insertMainSectionsInSeparatePageSequences -->
+
+	<xsl:template name="insertAnnexInSeparatePageSequences">
 		<xsl:for-each select="/*/*[local-name()='annex']">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:element name="page_sequence" namespace="{$namespace_full}">
@@ -2532,7 +2532,8 @@
 				<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
 			</xsl:element>
 		</xsl:for-each>
-
+	</xsl:template>
+	<xsl:template name="insertBibliographyInSeparatePageSequences">
 		<xsl:element name="bibliography" namespace="{$namespace_full}"> <!-- save context element -->
 			<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |           /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
 				<xsl:sort select="@displayorder" data-type="number"/>
@@ -2542,7 +2543,16 @@
 				</xsl:element>
 			</xsl:for-each>
 		</xsl:element>
-	</xsl:template> <!-- END: insertMainSectionsInSeparatePageSequences -->
+	</xsl:template>
+	<xsl:template name="insertIndexInSeparatePageSequences">
+		<xsl:for-each select="/*/*[local-name()='indexsect']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:element name="page_sequence" namespace="{$namespace_full}">
+				<xsl:attribute name="main_page_sequence"/>
+				<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+			</xsl:element>
+		</xsl:for-each>
+	</xsl:template>
 
 	<xsl:template name="processAllSectionsDefault_items">
 		<xsl:variable name="updated_xml_step_move_pagebreak">
diff --git a/lib/isodoc/m3aawg/m3aawg.report.xsl b/lib/isodoc/m3aawg/m3aawg.report.xsl
index 170fb50..b99aaf6 100644
--- a/lib/isodoc/m3aawg/m3aawg.report.xsl
+++ b/lib/isodoc/m3aawg/m3aawg.report.xsl
@@ -2513,18 +2513,18 @@
 				<xsl:element name="page_sequence" namespace="{$namespace_full}">
 					<xsl:attribute name="main_page_sequence"/>
 					<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
-
-						<xsl:if test="local-name()='clause' and @type='scope'">
-							<xsl:if test="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
-								<fo:block break-after="page"/>
-								<xsl:element name="pagebreak" namespace="{$namespace_full}"/>
-							</xsl:if>
-						</xsl:if>
-
 				</xsl:element>
 			</xsl:for-each>
 		</xsl:element>
 
+		<xsl:call-template name="insertAnnexInSeparatePageSequences"/>
+
+		<xsl:call-template name="insertBibliographyInSeparatePageSequences"/>
+
+		<!-- <xsl:call-template name="insertIndexInSeparatePageSequences"/> -->
+	</xsl:template> <!-- END: insertMainSectionsInSeparatePageSequences -->
+
+	<xsl:template name="insertAnnexInSeparatePageSequences">
 		<xsl:for-each select="/*/*[local-name()='annex']">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:element name="page_sequence" namespace="{$namespace_full}">
@@ -2532,7 +2532,8 @@
 				<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
 			</xsl:element>
 		</xsl:for-each>
-
+	</xsl:template>
+	<xsl:template name="insertBibliographyInSeparatePageSequences">
 		<xsl:element name="bibliography" namespace="{$namespace_full}"> <!-- save context element -->
 			<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |           /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
 				<xsl:sort select="@displayorder" data-type="number"/>
@@ -2542,7 +2543,16 @@
 				</xsl:element>
 			</xsl:for-each>
 		</xsl:element>
-	</xsl:template> <!-- END: insertMainSectionsInSeparatePageSequences -->
+	</xsl:template>
+	<xsl:template name="insertIndexInSeparatePageSequences">
+		<xsl:for-each select="/*/*[local-name()='indexsect']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:element name="page_sequence" namespace="{$namespace_full}">
+				<xsl:attribute name="main_page_sequence"/>
+				<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+			</xsl:element>
+		</xsl:for-each>
+	</xsl:template>
 
 	<xsl:template name="processAllSectionsDefault_items">
 		<xsl:variable name="updated_xml_step_move_pagebreak">