xslt update based on metanorma/mn-native-pdf@1f15ed4

metanorma · Aug 16, 2024 · 5213522 · 5213522
1 parent 4ee70b9
commit 5213522
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/lib/isodoc/m3aawg/m3aawg.policy.xsl b/lib/isodoc/m3aawg/m3aawg.policy.xsl
@@ -2524,7 +2524,7 @@
  <!-- <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')]] | /*/*[local-name()='indexsect']">
  <xsl:sort select="@displayorder" data-type="number"/>
  <xsl:choose>
@@ -11373,10 +11373,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>
@@ -12251,7 +12253,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 xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{.}" filename="{@name}"/>
+ <xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
+ <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$src_attachment}" filename="{@name}"/>
  </xsl:when>
  <xsl:otherwise>
  <!-- _{filename}_attachments -->

diff --git a/lib/isodoc/m3aawg/m3aawg.report.xsl b/lib/isodoc/m3aawg/m3aawg.report.xsl
@@ -2524,7 +2524,7 @@
  <!-- <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')]] | /*/*[local-name()='indexsect']">
  <xsl:sort select="@displayorder" data-type="number"/>
  <xsl:choose>
@@ -11373,10 +11373,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>
@@ -12251,7 +12253,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 xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{.}" filename="{@name}"/>
+ <xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
+ <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$src_attachment}" filename="{@name}"/>
  </xsl:when>
  <xsl:otherwise>
  <!-- _{filename}_attachments -->