Merge pull request #231 from metanorma/feature/xslt-update

metanorma · Jul 1, 2024 · 9378a46 · 9378a46
2 parents 4b71d3e + 8c0ce63
commit 9378a46
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 20 deletions.
diff --git a/lib/isodoc/m3aawg/m3aawg.policy.xsl b/lib/isodoc/m3aawg/m3aawg.policy.xsl
@@ -2513,26 +2513,27 @@
  <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}">
  <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="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
@@ -2513,26 +2513,27 @@
  <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}">
  <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="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">