From 224b1f7b24810eba40882179c243b07620126f0d Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Fri, 16 Aug 2024 18:32:43 +0300
Subject: [PATCH 1/2] common xslt optimized for attachments, #730

---
 xslt_src/common.xsl | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index f511ebe5a..c0f258131 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -6854,8 +6854,8 @@
 		<!-- <xsl:call-template name="insertIndexInSeparatePageSequences"/> -->
 	</xsl:template> <!-- END: insertMainSectionsInSeparatePageSequences -->
 	
-  
-  <xsl:template name="insertAnnexAndBibliographyInSeparatePageSequences">
+	
+	<xsl:template name="insertAnnexAndBibliographyInSeparatePageSequences">
 		<xsl:for-each select="/*/*[local-name()='annex'] | 
 									/*/*[local-name()='bibliography']/*[not(@normative='true')] | 
 									/*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]] |
@@ -18593,10 +18593,12 @@
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
-			<xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
-			<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
-			<xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
-				<xsl:value-of select="."/>
+			<xsl:if test="1 = 2"> <!-- remove attachment/text(), because attachments added in the template 'addPDFUAmeta' before applying 'update_xml_step1' -->
+				<xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
+				<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
+				<xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
+					<xsl:value-of select="normalize-space(.)"/>
+				</xsl:if>
 			</xsl:if>
 		</xsl:copy>
 	</xsl:template>
@@ -19697,7 +19699,8 @@
 		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
 			<xsl:choose>
 				<xsl:when test="normalize-space() != ''">
-					<pdf:embedded-file src="{.}" filename="{@name}" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf"/>
+					<xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#x0d;&#x0a;|&#x0d;|&#x0a;)', '')"/> <!-- remove line breaks -->
+					<pdf:embedded-file src="{$src_attachment}" filename="{@name}" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf"/>
 				</xsl:when>
 				<xsl:otherwise>
 					<!-- _{filename}_attachments -->

From 037d24efc61437add455fd40f31c746cb1c9f981 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Fri, 16 Aug 2024 20:38:59 +0300
Subject: [PATCH 2/2] OGC xslt optimized, #730

---
 xslt_src/ogc.standard.core.xsl    | 18 +++++++++---------
 xslt_src/ogc.white-paper.core.xsl |  7 -------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/xslt_src/ogc.standard.core.xsl b/xslt_src/ogc.standard.core.xsl
index d9d3fefce..68e6fc213 100644
--- a/xslt_src/ogc.standard.core.xsl
+++ b/xslt_src/ogc.standard.core.xsl
@@ -250,12 +250,6 @@
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
 		
-		<xsl:variable name="updated_xml_step1">
-			<xsl:apply-templates mode="update_xml_step1"/>
-		</xsl:variable>
-		
-		<xsl:for-each select="xalan:nodeset($updated_xml_step1)">
-		
 			<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xml:lang="{$lang}">
 				<xsl:variable name="root-style">
 					<root-style xsl:use-attribute-sets="root-style"/>
@@ -608,6 +602,12 @@
 				
 				<xsl:for-each select="xalan:nodeset($updated_xml)/*"> -->
 			
+			<xsl:variable name="updated_xml_step1">
+				<xsl:apply-templates mode="update_xml_step1"/>
+			</xsl:variable>
+			
+			<xsl:for-each select="xalan:nodeset($updated_xml_step1)">
+			
 					<xsl:variable name="updated_xml_with_pages">
 						<xsl:call-template name="processPrefaceAndMainSectionsOGC_items"/>
 					</xsl:variable>
@@ -721,13 +721,13 @@
 						</xsl:for-each>
 					</xsl:for-each>
 				<!-- </xsl:for-each> -->
-				
+			
 				<xsl:apply-templates select="//ogc:indexsect" mode="sections"/>
 				
+			</xsl:for-each>
 				
-			</fo:root>
+		</fo:root>
 		
-		</xsl:for-each>
 	</xsl:template> 
 
 
diff --git a/xslt_src/ogc.white-paper.core.xsl b/xslt_src/ogc.white-paper.core.xsl
index 625162a34..12d939e6b 100644
--- a/xslt_src/ogc.white-paper.core.xsl
+++ b/xslt_src/ogc.white-paper.core.xsl
@@ -96,12 +96,6 @@
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
 		
-		<xsl:variable name="updated_xml_step1">
-			<xsl:apply-templates mode="update_xml_step1"/>
-		</xsl:variable>
-		
-		<xsl:for-each select="xalan:nodeset($updated_xml_step1)">
-		
 			<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xml:lang="{$lang}">
 				<xsl:variable name="root-style">
 					<root-style xsl:use-attribute-sets="root-style"/>
@@ -296,7 +290,6 @@
 				
 			</fo:root>
 		
-		</xsl:for-each>
 	</xsl:template>