From d4823ee01b34a0606192a14077f099a1c1d53b28 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Sun, 22 Dec 2024 16:34:45 +0300
Subject: [PATCH] xslt updated for fixing page-sequence issue,
 metanorma/mn2pdf#314

---
 xslt_src/cc.standard.core.xsl                    | 4 ++--
 xslt_src/csa.standard.core.xsl                   | 2 +-
 xslt_src/iec.international-standard.core.xsl     | 4 ++--
 xslt_src/iho.standard.core.xsl                   | 4 ++--
 xslt_src/iso.international-standard.core.xsl     | 4 ++--
 xslt_src/itu.recommendation.core.xsl             | 4 ++--
 xslt_src/jcgm.standard.core.xsl                  | 4 ++--
 xslt_src/ogc.standard.core.xsl                   | 4 ++--
 xslt_src/ogc.white-paper.core.xsl                | 4 ++--
 xslt_src/plateau.international-standard.core.xsl | 4 ++--
 xslt_src/ribose.standard.core.xsl                | 2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/xslt_src/cc.standard.core.xsl b/xslt_src/cc.standard.core.xsl
index 1731a8733..bb6bcf5fb 100644
--- a/xslt_src/cc.standard.core.xsl
+++ b/xslt_src/cc.standard.core.xsl
@@ -257,7 +257,7 @@
 				</xsl:variable>
 			
 				<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 			
 						<!-- Copyright, Content, Foreword, etc. pages -->
 						<fo:page-sequence master-reference="preface" format="i">
@@ -321,7 +321,7 @@
 					</xsl:for-each>
 				
 				
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 				
 						<!-- Document Pages -->
 						<fo:page-sequence master-reference="document" format="1" force-page-count="no-force">
diff --git a/xslt_src/csa.standard.core.xsl b/xslt_src/csa.standard.core.xsl
index f461ac43f..746b07eee 100644
--- a/xslt_src/csa.standard.core.xsl
+++ b/xslt_src/csa.standard.core.xsl
@@ -236,7 +236,7 @@
 				</xsl:variable>
 			
 				<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface -->
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 						<fo:page-sequence master-reference="document" format="1" force-page-count="no-force">
 							
 							<xsl:attribute name="master-reference">
diff --git a/xslt_src/iec.international-standard.core.xsl b/xslt_src/iec.international-standard.core.xsl
index 788ea164d..db77c8244 100644
--- a/xslt_src/iec.international-standard.core.xsl
+++ b/xslt_src/iec.international-standard.core.xsl
@@ -1444,7 +1444,7 @@
 	<xsl:template name="insertPrefacepages">
 		<xsl:param name="num"/>
 		
-		<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//image or .//svg]">
+		<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 	
 			<fo:page-sequence master-reference="document" format="1" force-page-count="no-force">
 				
@@ -1477,7 +1477,7 @@
 		<xsl:param name="lang" select="'en'"/>
 		<!-- BODY -->
 		
-		<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//image or .//svg]">
+		<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 	
 			<fo:page-sequence master-reference="document" force-page-count="no-force">						
 			
diff --git a/xslt_src/iho.standard.core.xsl b/xslt_src/iho.standard.core.xsl
index e91d44159..92516c2e3 100644
--- a/xslt_src/iho.standard.core.xsl
+++ b/xslt_src/iho.standard.core.xsl
@@ -244,7 +244,7 @@
 			
 				<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
 					
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 		
 						<!-- Preface Pages -->
 						<fo:page-sequence master-reference="preface" format="i">
@@ -292,7 +292,7 @@
 					</xsl:for-each>
 				
 				
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 				
 						<fo:page-sequence master-reference="document" format="1" force-page-count="no-force">
 						
diff --git a/xslt_src/iso.international-standard.core.xsl b/xslt_src/iso.international-standard.core.xsl
index cf1526ba8..2f4865945 100644
--- a/xslt_src/iso.international-standard.core.xsl
+++ b/xslt_src/iso.international-standard.core.xsl
@@ -1072,7 +1072,7 @@
 						
 						<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
 						
-							<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//image or .//svg]">
+							<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 							
 								<fo:page-sequence format="i" force-page-count="no-force">
 								
@@ -1224,7 +1224,7 @@
 				
 				<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to sections, if top element in 'sections' -->
 				
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 				
 						<!-- BODY -->
 						<fo:page-sequence force-page-count="no-force">
diff --git a/xslt_src/itu.recommendation.core.xsl b/xslt_src/itu.recommendation.core.xsl
index bbc7daa31..96a6cf34e 100644
--- a/xslt_src/itu.recommendation.core.xsl
+++ b/xslt_src/itu.recommendation.core.xsl
@@ -1402,7 +1402,7 @@
 			
 				<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
 					
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 			
 						<fo:page-sequence master-reference="document-preface" format="i" force-page-count="no-force">
 						
@@ -1517,7 +1517,7 @@
 					</xsl:for-each> <!-- END: preface pages -->
 			
 					
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 					
 						<!-- BODY -->
 						<fo:page-sequence master-reference="document" force-page-count="no-force">
diff --git a/xslt_src/jcgm.standard.core.xsl b/xslt_src/jcgm.standard.core.xsl
index a25759fef..1329c58a8 100644
--- a/xslt_src/jcgm.standard.core.xsl
+++ b/xslt_src/jcgm.standard.core.xsl
@@ -380,7 +380,7 @@
 			
 				<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface -->
 				
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'boilerplate'] or parent::*[local-name() = 'preface']][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'boilerplate'] or parent::*[local-name() = 'preface']][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 					
 						<fo:page-sequence master-reference="document-jcgm" format="i">
 				
@@ -413,7 +413,7 @@
 					
 						<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface -->
 							
-							<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'boilerplate'] or parent::*[local-name() = 'preface'])][normalize-space() != '' or .//image or .//svg]">
+							<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'boilerplate'] or parent::*[local-name() = 'preface'])][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 					
 								<!-- JCGM BODY -->
 								<fo:page-sequence master-reference="document-jcgm" force-page-count="no-force">
diff --git a/xslt_src/ogc.standard.core.xsl b/xslt_src/ogc.standard.core.xsl
index 0d288c2f6..328bcfb07 100644
--- a/xslt_src/ogc.standard.core.xsl
+++ b/xslt_src/ogc.standard.core.xsl
@@ -682,7 +682,7 @@
 				
 					<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
 					
-						<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//image or .//svg]">
+						<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 							<!-- Copyright, Content, Foreword, etc. pages -->
 							<fo:page-sequence master-reference="document" format="i" force-page-count="no-force">
 							
@@ -745,7 +745,7 @@
 						</xsl:for-each>
 					
 				
-						<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'] or parent::*[local-name() = 'boilerplate'])][normalize-space() != '' or .//image or .//svg]">
+						<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'] or parent::*[local-name() = 'boilerplate'])][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 				
 				
 							<!-- Document Pages -->
diff --git a/xslt_src/ogc.white-paper.core.xsl b/xslt_src/ogc.white-paper.core.xsl
index eee0fe279..c34d17843 100644
--- a/xslt_src/ogc.white-paper.core.xsl
+++ b/xslt_src/ogc.white-paper.core.xsl
@@ -258,7 +258,7 @@
 				
 					<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
 					
-						<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface' or local-name() = 'boilerplate']][normalize-space() != '' or .//image or .//svg]">
+						<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface' or local-name() = 'boilerplate']][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 					
 							<!-- Copyright, Content, Foreword, etc. pages -->
 							<fo:page-sequence master-reference="document" force-page-count="no-force">
@@ -291,7 +291,7 @@
 							</fo:page-sequence>
 						</xsl:for-each>
 					
-						<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface' or local-name() = 'boilerplate'])][normalize-space() != '' or .//image or .//svg]">
+						<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface' or local-name() = 'boilerplate'])][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 					
 							<!-- Document Pages -->
 							<fo:page-sequence master-reference="document" format="1" force-page-count="no-force">
diff --git a/xslt_src/plateau.international-standard.core.xsl b/xslt_src/plateau.international-standard.core.xsl
index 7088d102c..da52b2003 100644
--- a/xslt_src/plateau.international-standard.core.xsl
+++ b/xslt_src/plateau.international-standard.core.xsl
@@ -258,7 +258,7 @@
 					<!-- ========================== -->
 					
 					<!-- Preface pages -->
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 					
 						<xsl:choose>
 							<xsl:when test="*[local-name() = 'clause'][@type = 'toc']">
@@ -327,7 +327,7 @@
 					<!-- END Preface and contents pages -->
 					<!-- ========================== -->
 					
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 						<fo:page-sequence master-reference="document" force-page-count="no-force">
 							
 							<xsl:attribute name="master-reference">
diff --git a/xslt_src/ribose.standard.core.xsl b/xslt_src/ribose.standard.core.xsl
index b400afa56..000b32987 100644
--- a/xslt_src/ribose.standard.core.xsl
+++ b/xslt_src/ribose.standard.core.xsl
@@ -478,7 +478,7 @@
 			
 				<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface -->
 				
-					<xsl:for-each select=".//*[local-name() = 'page_sequence'][normalize-space() != '' or .//image or .//svg]">
+					<xsl:for-each select=".//*[local-name() = 'page_sequence'][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 			
 						<fo:page-sequence master-reference="document" force-page-count="no-force">