lib/isodoc/iho/iho.specification.xsl in metanorma-iho-0.9.9 vs lib/isodoc/iho/iho.specification.xsl in metanorma-iho-0.9.11

- old
+ new

@@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iho="https://www.metanorma.org/ns/iho" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java" version="1.0"> +<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iho="https://www.metanorma.org/ns/iho" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" xmlns:redirect="http://xml.apache.org/xalan/redirect" exclude-result-prefixes="java xalan" extension-element-prefixes="redirect" version="1.0"> <xsl:output method="xml" encoding="UTF-8" indent="no"/> <xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure' or local-name() = 'localized-strings')] and not(ancestor::*[local-name() = 'name']))]" use="@reference"/> @@ -32,297 +32,336 @@ </xsl:variable> <xsl:variable name="contents" select="xalan:nodeset($contents_)"/> <xsl:template match="/"> - <xsl:variable name="xslfo"> - <fo:root xml:lang="{$lang}"> - <xsl:variable name="root-style"> - <root-style xsl:use-attribute-sets="root-style"/> - </xsl:variable> - <xsl:call-template name="insertRootStyle"> - <xsl:with-param name="root-style" select="$root-style"/> - </xsl:call-template> - <fo:layout-master-set> - <!-- cover page --> - <fo:simple-page-master master-name="cover" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> - <fo:region-body margin-top="0mm" margin-bottom="5mm" margin-left="0mm" margin-right="5mm"/> - </fo:simple-page-master> + <fo:root xml:lang="{$lang}"> + <xsl:variable name="root-style"> + <root-style xsl:use-attribute-sets="root-style"/> + </xsl:variable> + <xsl:call-template name="insertRootStyle"> + <xsl:with-param name="root-style" select="$root-style"/> + </xsl:call-template> + <fo:layout-master-set> + <!-- cover page --> + <fo:simple-page-master master-name="cover" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> + <fo:region-body margin-top="0mm" margin-bottom="5mm" margin-left="0mm" margin-right="5mm"/> + </fo:simple-page-master> - <fo:simple-page-master master-name="first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> - <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/> - <fo:region-before region-name="header" extent="{$marginTop}mm"/> - <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> - <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/> - <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> - </fo:simple-page-master> - <fo:simple-page-master master-name="odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> - <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/> - <fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> - <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> - <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/> - <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> - </fo:simple-page-master> - <fo:simple-page-master master-name="odd-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm"> - <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/> - <fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> - <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> - <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/> - <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> - </fo:simple-page-master> - <fo:simple-page-master master-name="even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> - <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/> - <fo:region-before region-name="header-even" extent="{$marginTop}mm"/> - <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> - <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/> - <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/> - </fo:simple-page-master> - <fo:simple-page-master master-name="even-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm"> - <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/> - <fo:region-before region-name="header-even" extent="{$marginTop}mm"/> - <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> - <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/> - <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/> - </fo:simple-page-master> - <fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> - <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/> - <fo:region-before region-name="header-blank" extent="{$marginTop}mm"/> - <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> - <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/> - <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/> - </fo:simple-page-master> - <!-- Preface pages --> - <fo:page-sequence-master master-name="preface"> - <fo:repeatable-page-master-alternatives> - <!-- <fo:conditional-page-master-reference master-reference="first" page-position="first"/> --> - <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/> - <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/> - </fo:repeatable-page-master-alternatives> - </fo:page-sequence-master> - <!-- Document pages --> - <fo:page-sequence-master master-name="document"> - <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/> - <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/> - </fo:repeatable-page-master-alternatives> - </fo:page-sequence-master> - <fo:page-sequence-master master-name="document-portrait"> - <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/> - <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/> - </fo:repeatable-page-master-alternatives> - </fo:page-sequence-master> - <fo:page-sequence-master master-name="document-landscape"> - <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/> - <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/> - </fo:repeatable-page-master-alternatives> - </fo:page-sequence-master> - </fo:layout-master-set> + <fo:simple-page-master master-name="first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> + <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/> + <fo:region-before region-name="header" extent="{$marginTop}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> + <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/> + <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> + </fo:simple-page-master> + <fo:simple-page-master master-name="odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> + <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/> + <fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> + <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/> + <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> + </fo:simple-page-master> + <fo:simple-page-master master-name="odd-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm"> + <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/> + <fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> + <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/> + <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> + </fo:simple-page-master> + <fo:simple-page-master master-name="even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> + <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/> + <fo:region-before region-name="header-even" extent="{$marginTop}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> + <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/> + <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/> + </fo:simple-page-master> + <fo:simple-page-master master-name="even-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm"> + <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/> + <fo:region-before region-name="header-even" extent="{$marginTop}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> + <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/> + <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/> + </fo:simple-page-master> + <fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> + <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/> + <fo:region-before region-name="header-blank" extent="{$marginTop}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> + <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/> + <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/> + </fo:simple-page-master> + <!-- Preface pages --> + <fo:page-sequence-master master-name="preface"> + <fo:repeatable-page-master-alternatives> + <!-- <fo:conditional-page-master-reference master-reference="first" page-position="first"/> --> + <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> + <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/> + <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/> + </fo:repeatable-page-master-alternatives> + </fo:page-sequence-master> + <fo:page-sequence-master master-name="preface-landscape"> + <fo:repeatable-page-master-alternatives> + <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> + <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/> + <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/> + </fo:repeatable-page-master-alternatives> + </fo:page-sequence-master> + <!-- Document pages --> + <fo:page-sequence-master master-name="document"> + <fo:repeatable-page-master-alternatives> + <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> + <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/> + <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/> + </fo:repeatable-page-master-alternatives> + </fo:page-sequence-master> + <fo:page-sequence-master master-name="document-portrait"> + <fo:repeatable-page-master-alternatives> + <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> + <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/> + <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/> + </fo:repeatable-page-master-alternatives> + </fo:page-sequence-master> + <fo:page-sequence-master master-name="document-landscape"> + <fo:repeatable-page-master-alternatives> + <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> + <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/> + <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/> + </fo:repeatable-page-master-alternatives> + </fo:page-sequence-master> + </fo:layout-master-set> - <fo:declarations> - <xsl:call-template name="addPDFUAmeta"/> - </fo:declarations> + <fo:declarations> + <xsl:call-template name="addPDFUAmeta"/> + </fo:declarations> - <xsl:call-template name="addBookmarks"> - <xsl:with-param name="contents" select="$contents"/> - </xsl:call-template> + <xsl:call-template name="addBookmarks"> + <xsl:with-param name="contents" select="$contents"/> + </xsl:call-template> - <!-- =========================== --> - <!-- Cover Page --> - <fo:page-sequence master-reference="cover"> - <fo:flow flow-name="xsl-region-body"> - <fo:block-container position="absolute" left="14.25mm" top="12mm" id="__internal_layout__coverpage_{generate-id()}"> - <fo:table table-layout="fixed" width="181.1mm"> - <fo:table-column column-width="26mm"/> - <fo:table-column column-width="19.4mm"/> - <fo:table-column column-width="135.7mm"/> - <fo:table-body> - <fo:table-row> - <fo:table-cell><fo:block> </fo:block></fo:table-cell> - <fo:table-cell> - <fo:block-container width="19.4mm" height="21mm" background-color="rgb(241, 234, 202)" border-bottom="0.05pt solid rgb(0, 21, 50)" text-align="center" display-align="center" font-size="10pt" font-weight="bold"> - <fo:block> - <xsl:value-of select="$docidentifier"/> - </fo:block> - </fo:block-container> - </fo:table-cell> - <fo:table-cell><fo:block> </fo:block></fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell display-align="after" text-align="right"> - <fo:block font-size="1"> - <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IHO))}" width="25.9mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IHO"/> + <!-- =========================== --> + <!-- Cover Page --> + <fo:page-sequence master-reference="cover"> + <fo:flow flow-name="xsl-region-body"> + <fo:block-container position="absolute" left="14.25mm" top="12mm" id="__internal_layout__coverpage_{generate-id()}"> + <fo:table table-layout="fixed" width="181.1mm"> + <fo:table-column column-width="26mm"/> + <fo:table-column column-width="19.4mm"/> + <fo:table-column column-width="135.7mm"/> + <fo:table-body> + <fo:table-row> + <fo:table-cell><fo:block> </fo:block></fo:table-cell> + <fo:table-cell> + <fo:block-container width="19.4mm" height="21mm" background-color="rgb(241, 234, 202)" border-bottom="0.05pt solid rgb(0, 21, 50)" text-align="center" display-align="center" font-size="10pt" font-weight="bold"> + <fo:block> + <xsl:value-of select="$docidentifier"/> </fo:block> - </fo:table-cell> - <fo:table-cell number-columns-spanned="2" border="0.5pt solid rgb(0, 21, 50)" font-weight="bold" color="rgb(0, 0, 76)" padding-top="3mm"> - <fo:block-container height="165mm" width="115mm"> - <fo:block-container margin-left="10mm"> - <fo:block-container margin-left="0mm"> - <fo:block-container display-align="center" height="90mm"> - <fo:block font-size="28pt" role="H1" line-height="115%"> - <xsl:copy-of select="$title-en"/> - </fo:block> - </fo:block-container> - <fo:block font-size="14pt"> - <xsl:value-of select="$edition"/> - <xsl:if test="normalize-space($month_year) != ''"> - <xsl:text> – </xsl:text> - <xsl:value-of select="$month_year"/> - </xsl:if> + </fo:block-container> + </fo:table-cell> + <fo:table-cell><fo:block> </fo:block></fo:table-cell> + </fo:table-row> + <fo:table-row> + <fo:table-cell display-align="after" text-align="right"> + <fo:block font-size="1"> + <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IHO))}" width="25.9mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IHO"/> + </fo:block> + </fo:table-cell> + <fo:table-cell number-columns-spanned="2" border="0.5pt solid rgb(0, 21, 50)" font-weight="bold" color="rgb(0, 0, 76)" padding-top="3mm"> + <fo:block-container height="165mm" width="115mm"> + <fo:block-container margin-left="10mm"> + <fo:block-container margin-left="0mm"> + <fo:block-container display-align="center" height="90mm"> + <fo:block font-size="28pt" role="H1" line-height="115%"> + <xsl:copy-of select="$title-en"/> </fo:block> </fo:block-container> - </fo:block-container> - </fo:block-container> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell> - <fo:block font-size="1"> - <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo-IHO))}" width="25.9mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo IHO"/> - </fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block font-size="1"> - <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Text-IHO))}" width="25.8mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Text IHO"/> - </fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block-container width="79mm" height="72mm" margin-left="56.8mm" background-color="rgb(0, 172, 158)" text-align="right" display-align="after"> - <fo:block-container margin-left="0mm"> - <fo:block font-size="8pt" color="white" margin-right="5mm" margin-bottom="5mm" line-height-shift-adjustment="disregard-shifts"> - <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/iho:feedback-statement"/> + <fo:block font-size="14pt"> + <xsl:value-of select="$edition"/> + <xsl:if test="normalize-space($month_year) != ''"> + <xsl:text> – </xsl:text> + <xsl:value-of select="$month_year"/> + </xsl:if> </fo:block> </fo:block-container> </fo:block-container> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - </fo:block-container> - </fo:flow> - </fo:page-sequence> - <!-- End Cover Page --> - <!-- =========================== --> - <!-- =========================== --> + </fo:block-container> + </fo:table-cell> + </fo:table-row> + <fo:table-row> + <fo:table-cell> + <fo:block font-size="1"> + <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo-IHO))}" width="25.9mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo IHO"/> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block font-size="1"> + <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Text-IHO))}" width="25.8mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Text IHO"/> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block-container width="79mm" height="72mm" margin-left="56.8mm" background-color="rgb(0, 172, 158)" text-align="right" display-align="after"> + <fo:block-container margin-left="0mm"> + <fo:block font-size="8pt" color="white" margin-right="5mm" margin-bottom="5mm" line-height-shift-adjustment="disregard-shifts"> + <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/iho:feedback-statement"/> + </fo:block> + </fo:block-container> + </fo:block-container> + </fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> + </fo:block-container> + </fo:flow> + </fo:page-sequence> + <!-- End Cover Page --> + <!-- =========================== --> + <!-- =========================== --> - <!-- Preface Pages --> - <fo:page-sequence master-reference="preface" format="i"> - <fo:static-content flow-name="xsl-footnote-separator"> - <fo:block> - <fo:leader leader-pattern="rule" leader-length="30%"/> - </fo:block> - </fo:static-content> - <xsl:call-template name="insertHeaderFooter"> - <xsl:with-param name="font-weight">normal</xsl:with-param> - </xsl:call-template> - <fo:flow flow-name="xsl-region-body"> + <xsl:variable name="updated_xml"> + <xsl:call-template name="updateXML"/> + </xsl:variable> - <fo:block-container margin-left="-1.5mm" margin-right="-1mm"> - <fo:block-container margin-left="0mm" margin-right="0mm" border="0.5pt solid black"> - <fo:block-container margin-top="6.5mm" margin-left="7.5mm" margin-right="8.5mm" margin-bottom="7.5mm"> - <fo:block-container margin="0"> - <fo:block text-align="justify"> - <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/*[local-name() != 'feedback-statement']"/> - </fo:block> - </fo:block-container> - </fo:block-container> - </fo:block-container> - </fo:block-container> + <xsl:for-each select="xalan:nodeset($updated_xml)/*"> - <fo:block break-after="page"/> + <xsl:variable name="updated_xml_with_pages"> + <xsl:call-template name="processPrefaceAndMainSectionsDefault_items"/> + </xsl:variable> - <!-- Contents, Foreword, Introduction --> - <xsl:call-template name="processPrefaceSectionsDefault"/> + <xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections --> - </fo:flow> - </fo:page-sequence> - <!-- End Preface Pages --> - <!-- =========================== --> - <!-- =========================== --> + <xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface']][normalize-space() != '' or .//image or .//svg]"> - <!-- Document Pages --> + <!-- Preface Pages --> + <fo:page-sequence master-reference="preface" format="i"> - <xsl:if test="/iho:iho-standard/iho:sections/*"> + <xsl:attribute name="master-reference"> + <xsl:text>preface</xsl:text> + <xsl:call-template name="getPageSequenceOrientation"/> + </xsl:attribute> - <fo:page-sequence master-reference="document" initial-page-number="1" format="1" force-page-count="no-force"> - <fo:static-content flow-name="xsl-footnote-separator"> - <fo:block> - <fo:leader leader-pattern="rule" leader-length="30%"/> - </fo:block> - </fo:static-content> - <xsl:call-template name="insertHeaderFooter"/> - <fo:flow flow-name="xsl-region-body"> - <fo:block-container> + <fo:static-content flow-name="xsl-footnote-separator"> + <fo:block> + <fo:leader leader-pattern="rule" leader-length="30%"/> + </fo:block> + </fo:static-content> + <xsl:call-template name="insertHeaderFooter"> + <xsl:with-param name="font-weight">normal</xsl:with-param> + </xsl:call-template> + <fo:flow flow-name="xsl-region-body"> - <!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1"><xsl:value-of select="$title-en"/></fo:block> --> + <xsl:if test="position() = 1"> + <fo:block-container margin-left="-1.5mm" margin-right="-1mm"> + <fo:block-container margin-left="0mm" margin-right="0mm" border="0.5pt solid black"> + <fo:block-container margin-top="6.5mm" margin-left="7.5mm" margin-right="8.5mm" margin-bottom="7.5mm"> + <fo:block-container margin="0"> + <fo:block text-align="justify"> + <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/*[local-name() != 'feedback-statement']"/> + </fo:block> + </fo:block-container> + </fo:block-container> + </fo:block-container> + </fo:block-container> + <fo:block break-after="page"/> + </xsl:if> - <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/> - <!-- Normative references --> - <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/> - <!-- Terms and definitions --> - <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms']"/> - <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='definitions']"/> - <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope')]"/> + <!-- Contents, Foreword, Introduction --> + <!-- <xsl:call-template name="processPrefaceSectionsDefault"/> --> + <xsl:apply-templates/> - <xsl:if test="$table_if = 'true'"><fo:block/></xsl:if> - </fo:block-container> - </fo:flow> - </fo:page-sequence> - </xsl:if> + </fo:flow> + </fo:page-sequence> + <!-- End Preface Pages --> + <!-- =========================== --> + <!-- =========================== --> + </xsl:for-each> - <xsl:if test="/iho:iho-standard/iho:annex"> - <fo:page-sequence master-reference="document"> - <fo:static-content flow-name="xsl-footnote-separator"> - <fo:block> - <fo:leader leader-pattern="rule" leader-length="30%"/> - </fo:block> - </fo:static-content> - <xsl:call-template name="insertHeaderFooter"/> - <fo:flow flow-name="xsl-region-body"> - <fo:block-container> - <xsl:apply-templates select="/*/*[local-name()='annex']"/> + <xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface'])][normalize-space() != '' or .//image or .//svg]"> - <xsl:if test="$table_if = 'true'"><fo:block/></xsl:if> - </fo:block-container> - </fo:flow> - </fo:page-sequence> - </xsl:if> + <fo:page-sequence master-reference="document" format="1" force-page-count="no-force"> - <xsl:if test="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"> - <fo:page-sequence master-reference="document"> - <fo:static-content flow-name="xsl-footnote-separator"> - <fo:block> - <fo:leader leader-pattern="rule" leader-length="30%"/> - </fo:block> - </fo:static-content> - <xsl:call-template name="insertHeaderFooter"/> - <fo:flow flow-name="xsl-region-body"> - <fo:block-container> - <!-- Bibliography --> - <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/> + <xsl:attribute name="master-reference"> + <xsl:text>document</xsl:text> + <xsl:call-template name="getPageSequenceOrientation"/> + </xsl:attribute> - <xsl:if test="$table_if = 'true'"><fo:block/></xsl:if> - </fo:block-container> - </fo:flow> - </fo:page-sequence> - </xsl:if> + <xsl:if test="position() = 1"> + <xsl:attribute name="initial-page-number">1</xsl:attribute> + </xsl:if> - <!-- =========================== --> - <!-- End Document Pages --> - <!-- =========================== --> - <!-- =========================== --> + <fo:static-content flow-name="xsl-footnote-separator"> + <fo:block> + <fo:leader leader-pattern="rule" leader-length="30%"/> + </fo:block> + </fo:static-content> + <xsl:call-template name="insertHeaderFooter"/> + <fo:flow flow-name="xsl-region-body"> + <fo:block-container> - </fo:root> - </xsl:variable> + <!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1"><xsl:value-of select="$title-en"/></fo:block> --> - <xsl:apply-templates select="xalan:nodeset($xslfo)" mode="landscape_portrait"/> + <!-- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" /> --> + <!-- Normative references --> + <!-- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" /> --> + <!-- Terms and definitions --> + <!-- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms']" /> + <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='definitions']" /> + <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope')]" /> --> + <!-- <xsl:call-template name="processMainSectionsDefault"/> --> + + <xsl:apply-templates/> + + <xsl:if test="$table_if = 'true'"><fo:block/></xsl:if> + </fo:block-container> + </fo:flow> + </fo:page-sequence> + <!-- </xsl:if> --> + </xsl:for-each> + </xsl:for-each> + + <!-- <xsl:if test="/iho:iho-standard/iho:annex"> + <fo:page-sequence master-reference="document"> + <fo:static-content flow-name="xsl-footnote-separator"> + <fo:block> + <fo:leader leader-pattern="rule" leader-length="30%"/> + </fo:block> + </fo:static-content> + <xsl:call-template name="insertHeaderFooter"/> + <fo:flow flow-name="xsl-region-body"> + <fo:block-container> + <xsl:apply-templates select="/*/*[local-name()='annex']" /> + + <xsl:if test="$table_if = 'true'"><fo:block/></xsl:if> + </fo:block-container> + </fo:flow> + </fo:page-sequence> + </xsl:if> --> + + <!-- <xsl:if test="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"> + <fo:page-sequence master-reference="document"> + <fo:static-content flow-name="xsl-footnote-separator"> + <fo:block> + <fo:leader leader-pattern="rule" leader-length="30%"/> + </fo:block> + </fo:static-content> + <xsl:call-template name="insertHeaderFooter"/> + <fo:flow flow-name="xsl-region-body"> + <fo:block-container> --> + <!-- Bibliography --> + <!-- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]" /> + + <xsl:if test="$table_if = 'true'"><fo:block/></xsl:if> + </fo:block-container> + </fo:flow> + </fo:page-sequence> + </xsl:if> --> + + <!-- =========================== --> + <!-- End Document Pages --> + <!-- =========================== --> + <!-- =========================== --> + </xsl:for-each> + </fo:root> </xsl:template> <xsl:template name="insertListOf_Title"> <xsl:param name="title"/> <fo:block role="TOCI" font-weight="bold" margin-top="6pt" keep-with-next="always"> @@ -343,22 +382,21 @@ </fo:inline> </fo:basic-link> </fo:block> </xsl:template> - <xsl:template match="iho:preface/iho:clause[@type = 'toc']" priority="4"> + <xsl:template match="iho:preface//iho:clause[@type = 'toc']" priority="4"> <!-- Table of Contents --> <fo:block role="TOC"> <xsl:apply-templates/> - <xsl:if test="$debug = 'true'"> - <xsl:text disable-output-escaping="yes">&lt;!--</xsl:text> - DEBUG - contents=<xsl:copy-of select="$contents"/> - <xsl:text disable-output-escaping="yes">--&gt;</xsl:text> - </xsl:if> + <!-- <xsl:if test="$debug = 'true'"> + <redirect:write file="contents_{java:getTime(java:java.util.Date.new())}.xml"> + <xsl:copy-of select="$contents"/> + </redirect:write> + </xsl:if> --> <xsl:if test="count(*) = 1 and *[local-name() = 'title']"> <!-- if there isn't user ToC --> <fo:block line-height="115%"> @@ -425,11 +463,11 @@ </fo:block> </xsl:if> </fo:block> </xsl:template> - <xsl:template match="iho:preface/iho:clause[@type = 'toc']/iho:title" priority="3"> + <xsl:template match="iho:preface//iho:clause[@type = 'toc']/iho:title" priority="3"> <fo:block font-weight="bold" margin-bottom="7.5pt" role="H1" font-size="12pt" margin-top="4pt"> <fo:block-container width="18.3mm" border-bottom="1.25pt solid black"> <fo:block line-height="75%"> <!-- <xsl:call-template name="getLocalizedString"> <xsl:with-param name="key">table_of_contents</xsl:with-param> @@ -557,11 +595,11 @@ <xsl:apply-templates/> </fo:block> </xsl:template> <xsl:template match="*[local-name() = 'clause']" priority="3"> - <xsl:if test="parent::iho:preface"> + <xsl:if test="parent::iho:preface or (parent::*[local-name() = 'page_sequence'] and local-name(../..) = 'preface')"> <fo:block break-after="page"/> </xsl:if> <xsl:choose> <xsl:when test="iho:title"> <xsl:apply-templates/> @@ -840,29 +878,31 @@ <xsl:variable name="Image-Text-IHO"> <xsl:text>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</xsl:text> </xsl:variable> - <xsl:strip-space xmlns:redirect="http://xml.apache.org/xalan/redirect" elements="iho:xref"/> + <xsl:strip-space elements="iho:xref"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="namespace_full" select="namespace-uri(/*)"/> <!-- example: https://www.metanorma.org/ns/iso --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="root_element" select="local-name(/*)"/> <!-- example: iso-standard --> + <xsl:variable name="namespace_full" select="namespace-uri(/*)"/> <!-- example: https://www.metanorma.org/ns/iso --> + <xsl:variable name="root_element" select="local-name(/*)"/> <!-- example: iso-standard --> + <xsl:variable name="document_scheme" select="normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'document-scheme']/*[local-name() = 'value'])"/> + <!-- external parameters --> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="svg_images"/> <!-- svg images array --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="images" select="document($svg_images)"/> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="basepath"/> <!-- base path for images --> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="inputxml_basepath"/> <!-- input xml file path --> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="inputxml_filename"/> <!-- input xml file name --> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="output_path"/> <!-- output PDF file name --> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format --> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off --> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="add_math_as_text">true</xsl:param> <!-- add math in text behind svg formula, to copy-paste formula from PDF as text --> + <xsl:param name="svg_images"/> <!-- svg images array --> + <xsl:variable name="images" select="document($svg_images)"/> + <xsl:param name="basepath"/> <!-- base path for images --> + <xsl:param name="inputxml_basepath"/> <!-- input xml file path --> + <xsl:param name="inputxml_filename"/> <!-- input xml file name --> + <xsl:param name="output_path"/> <!-- output PDF file name --> + <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format --> + <xsl:param name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off --> + <xsl:param name="add_math_as_text">true</xsl:param> <!-- add math in text behind svg formula, to copy-paste formula from PDF as text --> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table_if">false</xsl:param> <!-- generate extended table in IF for autolayout-algorithm --> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table_widths"/> <!-- (debug: path to) xml with table's widths, generated on 1st pass, based on FOP Intermediate Format --> + <xsl:param name="table_if">false</xsl:param> <!-- generate extended table in IF for autolayout-algorithm --> + <xsl:param name="table_widths"/> <!-- (debug: path to) xml with table's widths, generated on 1st pass, based on FOP Intermediate Format --> <!-- Example: <tables> <table page-width="509103" id="table1" width_max="223561" width_min="223560"> <column width_max="39354" width_min="39354"/> <column width_max="75394" width_min="75394"/> <column width_max="108813" width_min="108813"/> @@ -885,44 +925,44 @@ <word_len>20</word_len> ... --> <!-- for command line debug: <xsl:variable name="table_widths_from_if" select="document($table_widths)"/> --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table_widths_from_if" select="xalan:nodeset($table_widths)"/> + <xsl:variable name="table_widths_from_if" select="xalan:nodeset($table_widths)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table_widths_from_if_calculated_"> + <xsl:variable name="table_widths_from_if_calculated_"> <xsl:for-each select="$table_widths_from_if//table"> <xsl:copy> <xsl:copy-of select="@*"/> <xsl:call-template name="calculate-column-widths-autolayout-algorithm"/> </xsl:copy> </xsl:for-each> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table_widths_from_if_calculated" select="xalan:nodeset($table_widths_from_if_calculated_)"/> + <xsl:variable name="table_widths_from_if_calculated" select="xalan:nodeset($table_widths_from_if_calculated_)"/> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl --> + <xsl:param name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="isApplyAutolayoutAlgorithm_"> + <xsl:variable name="isApplyAutolayoutAlgorithm_"> true </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/> + <xsl:variable name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="isGenerateTableIF_"> + <xsl:variable name="isGenerateTableIF_"> <xsl:choose> <xsl:when test="$isApplyAutolayoutAlgorithm = 'true'"> <xsl:value-of select="normalize-space($table_if) = 'true'"/> </xsl:when> <xsl:otherwise>false</xsl:otherwise> </xsl:choose> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/> + <xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="lang"> + <xsl:variable name="lang"> <xsl:call-template name="getLang"/> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="inputxml_filename_prefix"> + <xsl:variable name="inputxml_filename_prefix"> <xsl:choose> <xsl:when test="contains($inputxml_filename, '.presentation.xml')"> <xsl:value-of select="substring-before($inputxml_filename, '.presentation.xml')"/> </xsl:when> <xsl:when test="contains($inputxml_filename, '.xml')"> @@ -944,74 +984,74 @@ <papersize>letter</papersize> </presentation-metadata> </metanorma-extension> --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="papersize_width_"> + <xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/> + <xsl:variable name="papersize_width_"> <xsl:choose> <xsl:when test="$papersize = 'letter'">215.9</xsl:when> <xsl:when test="$papersize = 'a4'">210</xsl:when> </xsl:choose> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="papersize_width" select="normalize-space($papersize_width_)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="papersize_height_"> + <xsl:variable name="papersize_width" select="normalize-space($papersize_width_)"/> + <xsl:variable name="papersize_height_"> <xsl:choose> <xsl:when test="$papersize = 'letter'">279.4</xsl:when> <xsl:when test="$papersize = 'a4'">297</xsl:when> </xsl:choose> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="papersize_height" select="normalize-space($papersize_height_)"/> + <xsl:variable name="papersize_height" select="normalize-space($papersize_height_)"/> <!-- page width in mm --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="pageWidth_"> + <xsl:variable name="pageWidth_"> <xsl:choose> <xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when> <xsl:otherwise> 210 </xsl:otherwise> </xsl:choose> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="pageWidth" select="normalize-space($pageWidth_)"/> + <xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/> <!-- page height in mm --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="pageHeight_"> + <xsl:variable name="pageHeight_"> <xsl:choose> <xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when> <xsl:otherwise> 297 </xsl:otherwise> </xsl:choose> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="pageHeight" select="normalize-space($pageHeight_)"/> + <xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/> <!-- Page margins in mm (just digits, without 'mm')--> <!-- marginLeftRight1 and marginLeftRight2 - is left or right margin depends on odd/even page, for example, left margin on odd page and right margin on even page --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="marginLeftRight1_"> + <xsl:variable name="marginLeftRight1_"> 24.5 </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/> + <xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="marginLeftRight2_"> + <xsl:variable name="marginLeftRight2_"> 25 </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/> + <xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="marginTop_"> + <xsl:variable name="marginTop_"> 25.4 </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="marginTop" select="normalize-space($marginTop_)"/> + <xsl:variable name="marginTop" select="normalize-space($marginTop_)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="marginBottom_"> + <xsl:variable name="marginBottom_"> 25.4 </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="marginBottom" select="normalize-space($marginBottom_)"/> + <xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="layout_columns_default">1</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="layout_columns_" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata']/*[local-name() = 'layout-columns'])"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="layout_columns"> + <xsl:variable name="layout_columns_default">1</xsl:variable> + <xsl:variable name="layout_columns_" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata']/*[local-name() = 'layout-columns'])"/> + <xsl:variable name="layout_columns"> <xsl:choose> <xsl:when test="$layout_columns_ != ''"><xsl:value-of select="$layout_columns_"/></xsl:when> <xsl:otherwise><xsl:value-of select="$layout_columns_default"/></xsl:otherwise> </xsl:choose> </xsl:variable> @@ -1019,11 +1059,11 @@ <!-- Note 2: almost all localized string determined in the element //localized-strings in metanorma xml, but there are a few cases when: - string didn't determined yet - we need to put the string on two-languages (for instance, on English and French both), but xml contains only localized strings for one language - there is a difference between localized string value and text that should be displayed in PDF --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="titles_"> + <xsl:variable name="titles_"> <!-- These titles of Table of contents renders different than determined in localized-strings --> <!-- <title-toc lang="en"> <xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'"> <xsl:text>Contents</xsl:text> @@ -1064,61 +1104,61 @@ <title-subpart lang="en">Sub-part #</title-subpart> <title-subpart lang="fr">Partie de sub #</title-subpart> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="titles" select="xalan:nodeset($titles_)"/> + <xsl:variable name="titles" select="xalan:nodeset($titles_)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="title-list-tables"> + <xsl:variable name="title-list-tables"> <xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/> <xsl:value-of select="$toc_table_title"/> <xsl:if test="normalize-space($toc_table_title) = ''"> <xsl:call-template name="getLocalizedString"> <xsl:with-param name="key">toc_tables</xsl:with-param> </xsl:call-template> </xsl:if> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="title-list-figures"> + <xsl:variable name="title-list-figures"> <xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/> <xsl:value-of select="$toc_figure_title"/> <xsl:if test="normalize-space($toc_figure_title) = ''"> <xsl:call-template name="getLocalizedString"> <xsl:with-param name="key">toc_figures</xsl:with-param> </xsl:call-template> </xsl:if> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="title-list-recommendations"> + <xsl:variable name="title-list-recommendations"> <xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/> <xsl:value-of select="$toc_requirement_title"/> <xsl:if test="normalize-space($toc_requirement_title) = ''"> <xsl:call-template name="getLocalizedString"> <xsl:with-param name="key">toc_recommendations</xsl:with-param> </xsl:call-template> </xsl:if> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibdata"> + <xsl:variable name="bibdata"> <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']"/> <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'localized-strings']"/> </xsl:variable> <!-- Characters --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="linebreak">&#8232;</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="tab_zh">　</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="non_breaking_hyphen">‑</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="thin_space"> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="zero_width_space">​</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hair_space"> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="en_dash">–</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="em_dash">—</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="cr">&#13;</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="lf"> + <xsl:variable name="linebreak">&#8232;</xsl:variable> + <xsl:variable name="tab_zh">　</xsl:variable> + <xsl:variable name="non_breaking_hyphen">‑</xsl:variable> + <xsl:variable name="thin_space"> </xsl:variable> + <xsl:variable name="zero_width_space">​</xsl:variable> + <xsl:variable name="hair_space"> </xsl:variable> + <xsl:variable name="en_dash">–</xsl:variable> + <xsl:variable name="em_dash">—</xsl:variable> + <xsl:variable name="cr">&#13;</xsl:variable> + <xsl:variable name="lf"> </xsl:variable> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getTitle"> + <xsl:template name="getTitle"> <xsl:param name="name"/> <xsl:param name="lang"/> <xsl:variable name="lang_"> <xsl:choose> <xsl:when test="$lang != ''"> @@ -1139,30 +1179,30 @@ <xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable> + <xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable> + <xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/> + <xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/> <!-- ====================================== --> <!-- STYLES --> <!-- ====================================== --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="root-style"> + <xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable> + <xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable> + <xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable> + <xsl:attribute-set name="root-style"> <xsl:attribute name="font-family">Arial, Cambria Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute> <xsl:attribute name="font-family-generic">Sans</xsl:attribute> <xsl:attribute name="font-size">10pt</xsl:attribute> </xsl:attribute-set> <!-- root-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertRootStyle"> + <xsl:template name="insertRootStyle"> <xsl:param name="root-style"/> <xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/> <xsl:variable name="additional_fonts_"> <xsl:for-each select="//*[contains(local-name(), '-standard')][1]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value'] | //*[contains(local-name(), '-standard')][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']"> @@ -1242,79 +1282,79 @@ </xsl:choose> --> </xsl:for-each> </xsl:template> <!-- insertRootStyle --> <!-- Preface sections styles --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="copyright-statement-style"> + <xsl:attribute-set name="copyright-statement-style"> </xsl:attribute-set> <!-- copyright-statement-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="copyright-statement-title-style"> + <xsl:attribute-set name="copyright-statement-title-style"> </xsl:attribute-set> <!-- copyright-statement-title-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="copyright-statement-p-style"> + <xsl:attribute-set name="copyright-statement-p-style"> </xsl:attribute-set> <!-- copyright-statement-p-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="license-statement-style"> + <xsl:attribute-set name="license-statement-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="license-statement-title-style"> + <xsl:attribute-set name="license-statement-title-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> </xsl:attribute-set> <!-- license-statement-title-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="license-statement-p-style"> + <xsl:attribute-set name="license-statement-p-style"> </xsl:attribute-set> <!-- license-statement-p-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="legal-statement-style"> + <xsl:attribute-set name="legal-statement-style"> </xsl:attribute-set> <!-- legal-statement-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="legal-statement-title-style"> + <xsl:attribute-set name="legal-statement-title-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> </xsl:attribute-set> <!-- legal-statement-title-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="legal-statement-p-style"> + <xsl:attribute-set name="legal-statement-p-style"> </xsl:attribute-set> <!-- legal-statement-p-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="feedback-statement-style"> + <xsl:attribute-set name="feedback-statement-style"> </xsl:attribute-set> <!-- feedback-statement-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="feedback-statement-title-style"> + <xsl:attribute-set name="feedback-statement-title-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> </xsl:attribute-set> <!-- feedback-statement-title-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="feedback-statement-p-style"> + <xsl:attribute-set name="feedback-statement-p-style"> </xsl:attribute-set> <!-- feedback-statement-p-style --> <!-- End Preface sections styles --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="link-style"> + <xsl:attribute-set name="link-style"> <xsl:attribute name="color">blue</xsl:attribute> <xsl:attribute name="text-decoration">underline</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_link-style"> + <xsl:template name="refine_link-style"> </xsl:template> <!-- refine_link-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="sourcecode-container-style"> + <xsl:attribute-set name="sourcecode-container-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="sourcecode-style"> + <xsl:attribute-set name="sourcecode-style"> <xsl:attribute name="white-space">pre</xsl:attribute> <xsl:attribute name="wrap-option">wrap</xsl:attribute> <xsl:attribute name="role">Code</xsl:attribute> <xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute> @@ -1322,247 +1362,247 @@ <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="line-height">113%</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_sourcecode-style"> + <xsl:template name="refine_sourcecode-style"> </xsl:template> <!-- refine_sourcecode-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="pre-style"> + <xsl:attribute-set name="pre-style"> <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> <xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute> <xsl:attribute name="line-height">113%</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="permission-style"> + <xsl:attribute-set name="permission-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="permission-name-style"> + <xsl:attribute-set name="permission-name-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="permission-label-style"> + <xsl:attribute-set name="permission-label-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="requirement-style"> + <xsl:attribute-set name="requirement-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="requirement-name-style"> + <xsl:attribute-set name="requirement-name-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="requirement-label-style"> + <xsl:attribute-set name="requirement-label-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="subject-style"> + <xsl:attribute-set name="subject-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="inherit-style"> + <xsl:attribute-set name="inherit-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="description-style"> + <xsl:attribute-set name="description-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="specification-style"> + <xsl:attribute-set name="specification-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="measurement-target-style"> + <xsl:attribute-set name="measurement-target-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="verification-style"> + <xsl:attribute-set name="verification-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="import-style"> + <xsl:attribute-set name="import-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="component-style"> + <xsl:attribute-set name="component-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="recommendation-style"> + <xsl:attribute-set name="recommendation-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="recommendation-name-style"> + <xsl:attribute-set name="recommendation-name-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="recommendation-label-style"> + <xsl:attribute-set name="recommendation-label-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="termexample-style"> + <xsl:attribute-set name="termexample-style"> <xsl:attribute name="font-size">10pt</xsl:attribute> <xsl:attribute name="margin-top">8pt</xsl:attribute> <xsl:attribute name="margin-bottom">8pt</xsl:attribute> <xsl:attribute name="text-align">justify</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_termexample-style"> + <xsl:template name="refine_termexample-style"> </xsl:template> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="example-style"> + <xsl:attribute-set name="example-style"> <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> --> <xsl:attribute name="margin-top">4pt</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> <xsl:attribute name="text-align">justify</xsl:attribute> </xsl:attribute-set> <!-- example-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_example-style"> + <xsl:template name="refine_example-style"> </xsl:template> <!-- refine_example-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="example-body-style"> + <xsl:attribute-set name="example-body-style"> </xsl:attribute-set> <!-- example-body-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="example-name-style"> + <xsl:attribute-set name="example-name-style"> <!-- <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute> --> </xsl:attribute-set> <!-- example-name-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_example-name-style"> + <xsl:template name="refine_example-name-style"> </xsl:template> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="example-p-style"> + <xsl:attribute-set name="example-p-style"> <xsl:attribute name="font-size">11pt</xsl:attribute> <xsl:attribute name="margin-left">12.7mm</xsl:attribute> </xsl:attribute-set> <!-- example-p-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_example-p-style"> + <xsl:template name="refine_example-p-style"> </xsl:template> <!-- refine_example-p-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="termexample-name-style"> + <xsl:attribute-set name="termexample-name-style"> <xsl:attribute name="padding-right">5mm</xsl:attribute> </xsl:attribute-set> <!-- termexample-name-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_termexample-name-style"> + <xsl:template name="refine_termexample-name-style"> </xsl:template> <!-- ========================== --> <!-- Table styles --> <!-- ========================== --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-border_"> + <xsl:variable name="table-border_"> 0.5pt solid black </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-border" select="normalize-space($table-border_)"/> + <xsl:variable name="table-border" select="normalize-space($table-border_)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-cell-border_"> + <xsl:variable name="table-cell-border_"> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-cell-border" select="normalize-space($table-cell-border_)"/> + <xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-container-style"> + <xsl:attribute-set name="table-container-style"> <xsl:attribute name="margin-left">0mm</xsl:attribute> <xsl:attribute name="margin-right">0mm</xsl:attribute> <xsl:attribute name="font-size">9pt</xsl:attribute> <xsl:attribute name="space-after">18pt</xsl:attribute> </xsl:attribute-set> <!-- table-container-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-container-style"> + <xsl:template name="refine_table-container-style"> <xsl:param name="margin-side"/> <!-- end table block-container attributes --> </xsl:template> <!-- refine_table-container-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-style"> + <xsl:attribute-set name="table-style"> <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute> <xsl:attribute name="table-layout">fixed</xsl:attribute> <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute> </xsl:attribute-set><!-- table-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-style"> + <xsl:template name="refine_table-style"> <xsl:param name="margin-side"/> <xsl:call-template name="setBordersTableArray"/> </xsl:template> <!-- refine_table-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-name-style"> + <xsl:attribute-set name="table-name-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="text-align">center</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="font-size">10pt</xsl:attribute> </xsl:attribute-set> <!-- table-name-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-name-style"> + <xsl:template name="refine_table-name-style"> <xsl:param name="continued"/> </xsl:template> <!-- refine_table-name-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-row-style"> + <xsl:attribute-set name="table-row-style"> <xsl:attribute name="min-height">4mm</xsl:attribute> <xsl:attribute name="min-height">3mm</xsl:attribute> <!-- + padding-top + padding-bottom --> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-header-row-style" use-attribute-sets="table-row-style"> + <xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style"> <xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="background-color">rgb(217, 217, 217)</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-header-row-style"> + <xsl:template name="refine_table-header-row-style"> <xsl:call-template name="setBordersTableArray"/> </xsl:template> <!-- refine_table-header-row-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-footer-row-style" use-attribute-sets="table-row-style"> + <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style"> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-footer-row-style"> + <xsl:template name="refine_table-footer-row-style"> </xsl:template> <!-- refine_table-footer-row-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-body-row-style" use-attribute-sets="table-row-style"> + <xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style"> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-body-row-style"> + <xsl:template name="refine_table-body-row-style"> <xsl:call-template name="setBordersTableArray"/> </xsl:template> <!-- refine_table-body-row-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-header-cell-style"> + <xsl:attribute-set name="table-header-cell-style"> <xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="padding-left">1mm</xsl:attribute> <xsl:attribute name="padding-right">1mm</xsl:attribute> <xsl:attribute name="display-align">center</xsl:attribute> @@ -1572,11 +1612,11 @@ <xsl:attribute name="padding-right">1.5mm</xsl:attribute> <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute> </xsl:attribute-set> <!-- table-header-cell-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-header-cell-style"> + <xsl:template name="refine_table-header-cell-style"> <xsl:call-template name="setBordersTableArray"/> <xsl:if test="$lang = 'ar'"> <xsl:attribute name="padding-right">1mm</xsl:attribute> @@ -1584,11 +1624,11 @@ <xsl:call-template name="setTableCellAttributes"/> </xsl:template> <!-- refine_table-header-cell-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-cell-style"> + <xsl:attribute-set name="table-cell-style"> <xsl:attribute name="display-align">center</xsl:attribute> <xsl:attribute name="padding-left">1mm</xsl:attribute> <xsl:attribute name="padding-right">1mm</xsl:attribute> <xsl:attribute name="padding-top">1.5mm</xsl:attribute> @@ -1597,11 +1637,11 @@ <xsl:attribute name="padding-right">1.5mm</xsl:attribute> <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute> </xsl:attribute-set> <!-- table-cell-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-cell-style"> + <xsl:template name="refine_table-cell-style"> <xsl:if test="$lang = 'ar'"> <xsl:attribute name="padding-right">1mm</xsl:attribute> </xsl:if> @@ -1609,77 +1649,77 @@ <xsl:call-template name="setBordersTableArray"/> </xsl:template> <!-- refine_table-cell-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-footer-cell-style"> + <xsl:attribute-set name="table-footer-cell-style"> <xsl:attribute name="border">solid black 1pt</xsl:attribute> <xsl:attribute name="padding-left">1mm</xsl:attribute> <xsl:attribute name="padding-right">1mm</xsl:attribute> <xsl:attribute name="padding-top">1mm</xsl:attribute> <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute> </xsl:attribute-set> <!-- table-footer-cell-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-footer-cell-style"> + <xsl:template name="refine_table-footer-cell-style"> </xsl:template> <!-- refine_table-footer-cell-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-note-style"> + <xsl:attribute-set name="table-note-style"> <xsl:attribute name="font-size">10pt</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> <xsl:attribute name="font-size">inherit</xsl:attribute> <xsl:attribute name="margin-bottom">0pt</xsl:attribute> <xsl:attribute name="space-after">6pt</xsl:attribute> </xsl:attribute-set><!-- table-note-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-note-style"> + <xsl:template name="refine_table-note-style"> </xsl:template> <!-- refine_table-note-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-fn-style"> + <xsl:attribute-set name="table-fn-style"> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> </xsl:attribute-set> <!-- table-fn-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-fn-style"> + <xsl:template name="refine_table-fn-style"> </xsl:template> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-fn-number-style"> + <xsl:attribute-set name="table-fn-number-style"> <xsl:attribute name="font-size">80%</xsl:attribute> <xsl:attribute name="padding-right">5mm</xsl:attribute> <xsl:attribute name="vertical-align">super</xsl:attribute> </xsl:attribute-set> <!-- table-fn-number-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-fn-number-style"> + <xsl:template name="refine_table-fn-number-style"> </xsl:template> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="fn-container-body-style"> + <xsl:attribute-set name="fn-container-body-style"> <xsl:attribute name="text-indent">0</xsl:attribute> <xsl:attribute name="start-indent">0</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-fn-body-style"> + <xsl:attribute-set name="table-fn-body-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="figure-fn-number-style"> + <xsl:attribute-set name="figure-fn-number-style"> <xsl:attribute name="font-size">80%</xsl:attribute> <xsl:attribute name="padding-right">5mm</xsl:attribute> <xsl:attribute name="vertical-align">super</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="figure-fn-body-style"> + <xsl:attribute-set name="figure-fn-body-style"> <xsl:attribute name="text-align">justify</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> </xsl:attribute-set> <!-- ========================== --> @@ -1688,221 +1728,221 @@ <!-- ========================== --> <!-- Definition's list styles --> <!-- ========================== --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="dl-block-style"> + <xsl:attribute-set name="dl-block-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="dt-row-style"> + <xsl:attribute-set name="dt-row-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="dt-cell-style"> + <xsl:attribute-set name="dt-cell-style"> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_dt-cell-style"> + <xsl:template name="refine_dt-cell-style"> </xsl:template> <!-- refine_dt-cell-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="dt-block-style"> + <xsl:attribute-set name="dt-block-style"> <xsl:attribute name="margin-top">0pt</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_dt-block-style"> + <xsl:template name="refine_dt-block-style"> </xsl:template> <!-- refine_dt-block-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="dl-name-style"> + <xsl:attribute-set name="dl-name-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> <xsl:attribute name="font-weight">normal</xsl:attribute> </xsl:attribute-set> <!-- dl-name-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="dd-cell-style"> + <xsl:attribute-set name="dd-cell-style"> <xsl:attribute name="padding-left">2mm</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_dd-cell-style"> + <xsl:template name="refine_dd-cell-style"> </xsl:template> <!-- refine_dd-cell-style --> <!-- ========================== --> <!-- END Definition's list styles --> <!-- ========================== --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="appendix-style"> + <xsl:attribute-set name="appendix-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="appendix-example-style"> + <xsl:attribute-set name="appendix-example-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="xref-style"> + <xsl:attribute-set name="xref-style"> <xsl:attribute name="color">blue</xsl:attribute> <xsl:attribute name="text-decoration">underline</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="eref-style"> + <xsl:attribute-set name="eref-style"> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_eref-style"> + <xsl:template name="refine_eref-style"> <xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets --> <xsl:variable name="text" select="normalize-space()"/> </xsl:template> <!-- refine_eref-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="note-style"> + <xsl:attribute-set name="note-style"> <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> --> <xsl:attribute name="margin-top">4pt</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> <xsl:attribute name="text-align">justify</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_note-style"> + <xsl:template name="refine_note-style"> </xsl:template> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="note-body-indent">10mm</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="note-body-indent-table">5mm</xsl:variable> + <xsl:variable name="note-body-indent">10mm</xsl:variable> + <xsl:variable name="note-body-indent-table">5mm</xsl:variable> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="note-name-style"> + <xsl:attribute-set name="note-name-style"> <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> --> <xsl:attribute name="padding-right">2mm</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_note-name-style"> + <xsl:template name="refine_note-name-style"> </xsl:template> <!-- refine_note-name-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-note-name-style"> + <xsl:attribute-set name="table-note-name-style"> <xsl:attribute name="padding-right">2mm</xsl:attribute> <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> --> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-note-name-style"> + <xsl:template name="refine_table-note-name-style"> </xsl:template> <!-- refine_table-note-name-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="note-p-style"> + <xsl:attribute-set name="note-p-style"> <xsl:attribute name="margin-top">8pt</xsl:attribute> <xsl:attribute name="margin-bottom">8pt</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="termnote-style"> + <xsl:attribute-set name="termnote-style"> <xsl:attribute name="font-size">10pt</xsl:attribute> <xsl:attribute name="margin-top">8pt</xsl:attribute> <xsl:attribute name="margin-bottom">8pt</xsl:attribute> <xsl:attribute name="text-align">justify</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_termnote-style"> + <xsl:template name="refine_termnote-style"> </xsl:template> <!-- refine_termnote-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="termnote-name-style"> + <xsl:attribute-set name="termnote-name-style"> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_termnote-name-style"> + <xsl:template name="refine_termnote-name-style"> </xsl:template> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="termnote-p-style"> + <xsl:attribute-set name="termnote-p-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="quote-style"> + <xsl:attribute-set name="quote-style"> <xsl:attribute name="margin-left">12mm</xsl:attribute> <xsl:attribute name="margin-right">12mm</xsl:attribute> <xsl:attribute name="font-family">Calibri</xsl:attribute> <xsl:attribute name="margin-left">4.5mm</xsl:attribute> <xsl:attribute name="margin-right">9mm</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_quote-style"> + <xsl:template name="refine_quote-style"> </xsl:template> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="quote-source-style"> + <xsl:attribute-set name="quote-source-style"> <xsl:attribute name="text-align">right</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="termsource-style"> + <xsl:attribute-set name="termsource-style"> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_termsource-style"> + <xsl:template name="refine_termsource-style"> </xsl:template> <!-- refine_termsource-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="termsource-text-style"> + <xsl:attribute-set name="termsource-text-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="origin-style"> + <xsl:attribute-set name="origin-style"> <xsl:attribute name="color">blue</xsl:attribute> <xsl:attribute name="text-decoration">underline</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="term-style"> + <xsl:attribute-set name="term-style"> <xsl:attribute name="margin-bottom">10pt</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="term-name-style"> + <xsl:attribute-set name="term-name-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="figure-block-style"> + <xsl:attribute-set name="figure-block-style"> <xsl:attribute name="role">SKIP</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_figure-block-style"> + <xsl:template name="refine_figure-block-style"> </xsl:template> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="figure-style"> + <xsl:attribute-set name="figure-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="figure-name-style"> + <xsl:attribute-set name="figure-name-style"> <xsl:attribute name="role">Caption</xsl:attribute> <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> --> <xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="text-align">center</xsl:attribute> @@ -1910,294 +1950,294 @@ <xsl:attribute name="space-after">6pt</xsl:attribute> <xsl:attribute name="keep-with-previous">always</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_figure-name-style"> + <xsl:template name="refine_figure-name-style"> </xsl:template> <!-- refine_figure-name-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="figure-source-style"> + <xsl:attribute-set name="figure-source-style"> </xsl:attribute-set> <!-- Formula's styles --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="formula-style"> + <xsl:attribute-set name="formula-style"> <xsl:attribute name="margin-top">6pt</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> </xsl:attribute-set> <!-- formula-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="formula-stem-block-style"> + <xsl:attribute-set name="formula-stem-block-style"> <xsl:attribute name="text-align">center</xsl:attribute> </xsl:attribute-set> <!-- formula-stem-block-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_formula-stem-block-style"> + <xsl:template name="refine_formula-stem-block-style"> </xsl:template> <!-- refine_formula-stem-block-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="formula-stem-number-style"> + <xsl:attribute-set name="formula-stem-number-style"> <xsl:attribute name="text-align">right</xsl:attribute> </xsl:attribute-set> <!-- formula-stem-number-style --> <!-- End Formula's styles --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_formula-stem-number-style"> + <xsl:template name="refine_formula-stem-number-style"> </xsl:template> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="image-style"> + <xsl:attribute-set name="image-style"> <xsl:attribute name="role">SKIP</xsl:attribute> <xsl:attribute name="text-align">center</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_image-style"> + <xsl:template name="refine_image-style"> </xsl:template> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="figure-pseudocode-p-style"> + <xsl:attribute-set name="figure-pseudocode-p-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="image-graphic-style"> + <xsl:attribute-set name="image-graphic-style"> <xsl:attribute name="width">100%</xsl:attribute> <xsl:attribute name="content-height">100%</xsl:attribute> <xsl:attribute name="scaling">uniform</xsl:attribute> <xsl:attribute name="content-height">scale-to-fit</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="tt-style"> + <xsl:attribute-set name="tt-style"> <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="sourcecode-name-style"> + <xsl:attribute-set name="sourcecode-name-style"> <xsl:attribute name="font-size">11pt</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="text-align">center</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> <xsl:attribute name="keep-with-previous">always</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="preferred-block-style"> + <xsl:attribute-set name="preferred-block-style"> <xsl:attribute name="line-height">1.1</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="preferred-term-style"> + <xsl:attribute-set name="preferred-term-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="domain-style"> + <xsl:attribute-set name="domain-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="admitted-style"> + <xsl:attribute-set name="admitted-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="deprecates-style"> + <xsl:attribute-set name="deprecates-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="definition-style"> + <xsl:attribute-set name="definition-style"> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> </xsl:attribute-set> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="color-added-text"> + <xsl:variable name="color-added-text"> <xsl:text>rgb(0, 255, 0)</xsl:text> </xsl:variable> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="add-style"> + <xsl:attribute-set name="add-style"> <xsl:attribute name="color">red</xsl:attribute> <xsl:attribute name="text-decoration">underline</xsl:attribute> <!-- <xsl:attribute name="color">black</xsl:attribute> <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute> <xsl:attribute name="padding-top">1mm</xsl:attribute> <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> --> </xsl:attribute-set> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="add-style"> + <xsl:variable name="add-style"> <add-style xsl:use-attribute-sets="add-style"/> </xsl:variable> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="append_add-style"> + <xsl:template name="append_add-style"> <xsl:copy-of select="xalan:nodeset($add-style)/add-style/@*"/> </xsl:template> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="color-deleted-text"> + <xsl:variable name="color-deleted-text"> <xsl:text>red</xsl:text> </xsl:variable> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="del-style"> + <xsl:attribute-set name="del-style"> <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute> <xsl:attribute name="text-decoration">line-through</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="mathml-style"> + <xsl:attribute-set name="mathml-style"> <xsl:attribute name="font-family">STIX Two Math</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_mathml-style"> + <xsl:template name="refine_mathml-style"> </xsl:template> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="list-style"> + <xsl:attribute-set name="list-style"> <xsl:attribute name="provisional-distance-between-starts">6mm</xsl:attribute> </xsl:attribute-set> <!-- list-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_list-style"> + <xsl:template name="refine_list-style"> </xsl:template> <!-- refine_list-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="list-name-style"> + <xsl:attribute-set name="list-name-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="font-weight">normal</xsl:attribute> </xsl:attribute-set> <!-- list-name-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="list-item-style"> + <xsl:attribute-set name="list-item-style"> <xsl:attribute name="margin-bottom">3pt</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_list-item-style"> + <xsl:template name="refine_list-item-style"> </xsl:template> <!-- refine_list-item-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="list-item-label-style"> + <xsl:attribute-set name="list-item-label-style"> <xsl:attribute name="line-height">115%</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_list-item-label-style"> + <xsl:template name="refine_list-item-label-style"> </xsl:template> <!-- refine_list-item-label-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="list-item-body-style"> + <xsl:attribute-set name="list-item-body-style"> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_list-item-body-style"> + <xsl:template name="refine_list-item-body-style"> </xsl:template> <!-- refine_list-item-body-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="toc-style"> + <xsl:attribute-set name="toc-style"> <xsl:attribute name="line-height">135%</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="fn-reference-style"> + <xsl:attribute-set name="fn-reference-style"> <xsl:attribute name="font-size">80%</xsl:attribute> <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_fn-reference-style"> + <xsl:template name="refine_fn-reference-style"> </xsl:template> <!-- refine_fn-reference-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="fn-style"> + <xsl:attribute-set name="fn-style"> <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="fn-num-style"> + <xsl:attribute-set name="fn-num-style"> <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute> <xsl:attribute name="font-size">70%</xsl:attribute> <xsl:attribute name="vertical-align">super</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="fn-body-style"> + <xsl:attribute-set name="fn-body-style"> <xsl:attribute name="font-weight">normal</xsl:attribute> <xsl:attribute name="font-style">normal</xsl:attribute> <xsl:attribute name="text-indent">0</xsl:attribute> <xsl:attribute name="start-indent">0</xsl:attribute> <xsl:attribute name="font-size">10pt</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> </xsl:attribute-set> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_fn-body-style"> + <xsl:template name="refine_fn-body-style"> </xsl:template> <!-- refine_fn-body-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="fn-body-num-style"> + <xsl:attribute-set name="fn-body-num-style"> <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute> <xsl:attribute name="font-size">60%</xsl:attribute> <xsl:attribute name="vertical-align">super</xsl:attribute> <xsl:attribute name="padding-right">1mm</xsl:attribute> </xsl:attribute-set> <!-- fn-body-num-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_fn-body-num-style"> + <xsl:template name="refine_fn-body-num-style"> </xsl:template> <!-- refine_fn-body-num-style --> <!-- admonition --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="admonition-style"> + <xsl:attribute-set name="admonition-style"> <xsl:attribute name="border">0.5pt solid rgb(79, 129, 189)</xsl:attribute> <xsl:attribute name="color">rgb(79, 129, 189)</xsl:attribute> <xsl:attribute name="margin-left">16mm</xsl:attribute> <xsl:attribute name="margin-right">16mm</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> </xsl:attribute-set> <!-- admonition-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="admonition-container-style"> + <xsl:attribute-set name="admonition-container-style"> <xsl:attribute name="margin-left">0mm</xsl:attribute> <xsl:attribute name="margin-right">0mm</xsl:attribute> <xsl:attribute name="padding">2mm</xsl:attribute> <xsl:attribute name="padding-top">3mm</xsl:attribute> </xsl:attribute-set> <!-- admonition-container-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="admonition-name-style"> + <xsl:attribute-set name="admonition-name-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="font-size">11pt</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="font-style">italic</xsl:attribute> <xsl:attribute name="text-align">center</xsl:attribute> </xsl:attribute-set> <!-- admonition-name-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="admonition-p-style"> + <xsl:attribute-set name="admonition-p-style"> <xsl:attribute name="font-style">italic</xsl:attribute> </xsl:attribute-set> <!-- admonition-p-style --> <!-- end admonition --> <!-- bibitem in Normative References (references/@normative="true") --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitem-normative-style"> + <xsl:attribute-set name="bibitem-normative-style"> </xsl:attribute-set> <!-- bibitem-normative-style --> <!-- bibitem in Normative References (references/@normative="true"), renders as list --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitem-normative-list-style"> + <xsl:attribute-set name="bibitem-normative-list-style"> <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> <!-- <xsl:if test="$namespace = 'ieee'"> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> @@ -2207,246 +2247,246 @@ <!-- <xsl:attribute name="line-height">115%</xsl:attribute> --> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> </xsl:attribute-set> <!-- bibitem-normative-list-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitem-non-normative-style"> + <xsl:attribute-set name="bibitem-non-normative-style"> </xsl:attribute-set> <!-- bibitem-non-normative-style --> <!-- bibitem in bibliography section (references/@normative="false"), renders as list --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitem-non-normative-list-style"> + <xsl:attribute-set name="bibitem-non-normative-list-style"> <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> <xsl:attribute name="line-height">115%</xsl:attribute> </xsl:attribute-set> <!-- bibitem-non-normative-list-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitem-non-normative-list-item-style"> + <xsl:attribute-set name="bibitem-non-normative-list-item-style"> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> </xsl:attribute-set> <!-- bibitem in bibliography section (references/@normative="false"), list body --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitem-normative-list-body-style"> + <xsl:attribute-set name="bibitem-normative-list-body-style"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitem-non-normative-list-body-style"> + <xsl:attribute-set name="bibitem-non-normative-list-body-style"> </xsl:attribute-set> <!-- bibitem-non-normative-list-body-style --> <!-- footnote reference number for bibitem, in the text --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitem-note-fn-style"> + <xsl:attribute-set name="bibitem-note-fn-style"> <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute> <xsl:attribute name="font-size">65%</xsl:attribute> <xsl:attribute name="font-size">8pt</xsl:attribute> <xsl:attribute name="baseline-shift">30%</xsl:attribute> </xsl:attribute-set> <!-- bibitem-note-fn-style --> <!-- footnote number on the page bottom --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitem-note-fn-number-style"> + <xsl:attribute-set name="bibitem-note-fn-number-style"> <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute> <xsl:attribute name="alignment-baseline">hanging</xsl:attribute> <xsl:attribute name="padding-right">3mm</xsl:attribute> </xsl:attribute-set> <!-- bibitem-note-fn-number-style --> <!-- footnote body (text) on the page bottom --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitem-note-fn-body-style"> + <xsl:attribute-set name="bibitem-note-fn-body-style"> <xsl:attribute name="font-size">10pt</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> <xsl:attribute name="start-indent">0pt</xsl:attribute> <xsl:attribute name="margin-bottom">4pt</xsl:attribute> </xsl:attribute-set> <!-- bibitem-note-fn-body-style --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="references-non-normative-style"> + <xsl:attribute-set name="references-non-normative-style"> </xsl:attribute-set> <!-- references-non-normative-style --> <!-- Highlight.js syntax GitHub styles --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-doctag"> + <xsl:attribute-set name="hljs-doctag"> <xsl:attribute name="color">#d73a49</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-keyword"> + <xsl:attribute-set name="hljs-keyword"> <xsl:attribute name="color">#d73a49</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-meta_hljs-keyword"> + <xsl:attribute-set name="hljs-meta_hljs-keyword"> <xsl:attribute name="color">#d73a49</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-template-tag"> + <xsl:attribute-set name="hljs-template-tag"> <xsl:attribute name="color">#d73a49</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-template-variable"> + <xsl:attribute-set name="hljs-template-variable"> <xsl:attribute name="color">#d73a49</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-type"> + <xsl:attribute-set name="hljs-type"> <xsl:attribute name="color">#d73a49</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-variable_and_language_"> + <xsl:attribute-set name="hljs-variable_and_language_"> <xsl:attribute name="color">#d73a49</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-title"> + <xsl:attribute-set name="hljs-title"> <xsl:attribute name="color">#6f42c1</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-title_and_class_"> + <xsl:attribute-set name="hljs-title_and_class_"> <xsl:attribute name="color">#6f42c1</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-title_and_class__and_inherited__"> + <xsl:attribute-set name="hljs-title_and_class__and_inherited__"> <xsl:attribute name="color">#6f42c1</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-title_and_function_"> + <xsl:attribute-set name="hljs-title_and_function_"> <xsl:attribute name="color">#6f42c1</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-attr"> + <xsl:attribute-set name="hljs-attr"> <xsl:attribute name="color">#005cc5</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-attribute"> + <xsl:attribute-set name="hljs-attribute"> <xsl:attribute name="color">#005cc5</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-literal"> + <xsl:attribute-set name="hljs-literal"> <xsl:attribute name="color">#005cc5</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-meta"> + <xsl:attribute-set name="hljs-meta"> <xsl:attribute name="color">#005cc5</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-number"> + <xsl:attribute-set name="hljs-number"> <xsl:attribute name="color">#005cc5</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-operator"> + <xsl:attribute-set name="hljs-operator"> <xsl:attribute name="color">#005cc5</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-variable"> + <xsl:attribute-set name="hljs-variable"> <xsl:attribute name="color">#005cc5</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-selector-attr"> + <xsl:attribute-set name="hljs-selector-attr"> <xsl:attribute name="color">#005cc5</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-selector-class"> + <xsl:attribute-set name="hljs-selector-class"> <xsl:attribute name="color">#005cc5</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-selector-id"> + <xsl:attribute-set name="hljs-selector-id"> <xsl:attribute name="color">#005cc5</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-regexp"> + <xsl:attribute-set name="hljs-regexp"> <xsl:attribute name="color">#032f62</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-string"> + <xsl:attribute-set name="hljs-string"> <xsl:attribute name="color">#032f62</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-meta_hljs-string"> + <xsl:attribute-set name="hljs-meta_hljs-string"> <xsl:attribute name="color">#032f62</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-built_in"> + <xsl:attribute-set name="hljs-built_in"> <xsl:attribute name="color">#e36209</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-symbol"> + <xsl:attribute-set name="hljs-symbol"> <xsl:attribute name="color">#e36209</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-comment"> + <xsl:attribute-set name="hljs-comment"> <xsl:attribute name="color">#6a737d</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-code"> + <xsl:attribute-set name="hljs-code"> <xsl:attribute name="color">#6a737d</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-formula"> + <xsl:attribute-set name="hljs-formula"> <xsl:attribute name="color">#6a737d</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-name"> + <xsl:attribute-set name="hljs-name"> <xsl:attribute name="color">#22863a</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-quote"> + <xsl:attribute-set name="hljs-quote"> <xsl:attribute name="color">#22863a</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-selector-tag"> + <xsl:attribute-set name="hljs-selector-tag"> <xsl:attribute name="color">#22863a</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-selector-pseudo"> + <xsl:attribute-set name="hljs-selector-pseudo"> <xsl:attribute name="color">#22863a</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-subst"> + <xsl:attribute-set name="hljs-subst"> <xsl:attribute name="color">#24292e</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-section"> + <xsl:attribute-set name="hljs-section"> <xsl:attribute name="color">#005cc5</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-bullet"> + <xsl:attribute-set name="hljs-bullet"> <xsl:attribute name="color">#735c0f</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-emphasis"> + <xsl:attribute-set name="hljs-emphasis"> <xsl:attribute name="color">#24292e</xsl:attribute> <xsl:attribute name="font-style">italic</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-strong"> + <xsl:attribute-set name="hljs-strong"> <xsl:attribute name="color">#24292e</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-addition"> + <xsl:attribute-set name="hljs-addition"> <xsl:attribute name="color">#22863a</xsl:attribute> <xsl:attribute name="background-color">#f0fff4</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-deletion"> + <xsl:attribute-set name="hljs-deletion"> <xsl:attribute name="color">#b31d28</xsl:attribute> <xsl:attribute name="background-color">#ffeef0</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-char_and_escape_"> + <xsl:attribute-set name="hljs-char_and_escape_"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-link"> + <xsl:attribute-set name="hljs-link"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-params"> + <xsl:attribute-set name="hljs-params"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-property"> + <xsl:attribute-set name="hljs-property"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-punctuation"> + <xsl:attribute-set name="hljs-punctuation"> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="hljs-tag"> + <xsl:attribute-set name="hljs-tag"> </xsl:attribute-set> <!-- End Highlight syntax styles --> <!-- Index section styles --> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="indexsect-title-style"> + <xsl:attribute-set name="indexsect-title-style"> <xsl:attribute name="role">H1</xsl:attribute> </xsl:attribute-set> - <xsl:attribute-set xmlns:redirect="http://xml.apache.org/xalan/redirect" name="indexsect-clause-title-style"> + <xsl:attribute-set name="indexsect-clause-title-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> </xsl:attribute-set> <!-- End Index section styles --> <!-- ====================================== --> <!-- END STYLES --> <!-- ====================================== --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable> + <xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable> + <xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="ace_tag">ace-tag_</xsl:variable> + <xsl:variable name="ace_tag">ace-tag_</xsl:variable> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="processPrefaceSectionsDefault_Contents"> + <xsl:template name="processPrefaceSectionsDefault_Contents"> <xsl:variable name="nodes_preface_"> <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]"> <node id="{@id}"/> </xsl:for-each> </xsl:variable> @@ -2463,11 +2503,11 @@ <xsl:apply-templates select="." mode="contents"/> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="processMainSectionsDefault_Contents"> + <xsl:template name="processMainSectionsDefault_Contents"> <xsl:variable name="nodes_sections_"> <xsl:for-each select="/*/*[local-name()='sections']/*"> <node id="{@id}"/> </xsl:for-each> @@ -2495,100 +2535,53 @@ <xsl:sort select="@displayorder" data-type="number"/> <xsl:apply-templates select="." mode="contents"/> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="processTablesFigures_Contents"> + <xsl:template name="processTablesFigures_Contents"> <xsl:param name="always"/> <xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'"> <xsl:call-template name="processTables_Contents"/> </xsl:if> <xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'"> <xsl:call-template name="processFigures_Contents"/> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="processTables_Contents"> + <xsl:template name="processTables_Contents"> <tables> <xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']"> <table id="{@id}" alt-text="{*[local-name() = 'name']}"> <xsl:copy-of select="*[local-name() = 'name']"/> </table> </xsl:for-each> </tables> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="processFigures_Contents"> + <xsl:template name="processFigures_Contents"> <figures> <xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(*[local-name() = 'name'], 'Figure ') and normalize-space(@id) != '']"> <figure id="{@id}" alt-text="{*[local-name() = 'name']}"> <xsl:copy-of select="*[local-name() = 'name']"/> </figure> </xsl:for-each> </figures> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="processPrefaceSectionsDefault"> + <xsl:template name="processPrefaceSectionsDefault"> <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]"> <xsl:sort select="@displayorder" data-type="number"/> <xsl:apply-templates select="."/> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="processPrefaceSectionsDefault_items"> - - <xsl:variable name="updated_xml_step_move_pagebreak"> - - <xsl:element name="{$root_element}" namespace="{$namespace_full}"> - - <xsl:call-template name="copyCommonElements"/> - - <xsl:element name="preface" namespace="{$namespace_full}"> <!-- save context element --> - <xsl:element name="page_sequence" namespace="{$namespace_full}"> - <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]"> - <xsl:sort select="@displayorder" data-type="number"/> - <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/> - </xsl:for-each> - </xsl:element> - </xsl:element> - </xsl:element> - </xsl:variable> - - <xsl:variable name="updated_xml_step_move_pagebreak_filename" select="concat($output_path,'_preface_', java:getTime(java:java.util.Date.new()), '.xml')"/> - <!-- <xsl:message>updated_xml_step_move_pagebreak_filename=<xsl:value-of select="$updated_xml_step_move_pagebreak_filename"/></xsl:message> - <xsl:message>start write updated_xml_step_move_pagebreak_filename</xsl:message> --> - <redirect:write file="{$updated_xml_step_move_pagebreak_filename}"> - <xsl:copy-of select="$updated_xml_step_move_pagebreak"/> - </redirect:write> - <!-- <xsl:message>end write updated_xml_step_move_pagebreak_filename</xsl:message> --> - - <xsl:copy-of select="document($updated_xml_step_move_pagebreak_filename)"/> - - <!-- TODO: instead of - <xsl:for-each select=".//*[local-name() = 'page_sequence'][normalize-space() != '' or .//image or .//svg]"> - in each template, add removing empty page_sequence here - --> - - <xsl:if test="$debug = 'true'"> - <redirect:write file="page_sequence_preface.xml"> - <xsl:copy-of select="document($updated_xml_step_move_pagebreak_filename)"/> - </redirect:write> - </xsl:if> - - <!-- <xsl:message>start delete updated_xml_step_move_pagebreak_filename</xsl:message> --> - <xsl:call-template name="deleteFile"> - <xsl:with-param name="filepath" select="$updated_xml_step_move_pagebreak_filename"/> - </xsl:call-template> - <!-- <xsl:message>end delete updated_xml_step_move_pagebreak_filename</xsl:message> --> - </xsl:template> <!-- END: processPrefaceSectionsDefault_items --> - - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="copyCommonElements"> + <xsl:template name="copyCommonElements"> <!-- copy bibdata, localized-strings, metanorma-extension and boilerplate --> - <xsl:copy-of select="/*/*[local-name() != 'preface' and local-name() != 'sections' and local-name() != 'annex' and local-name() != 'bibliography']"/> + <xsl:copy-of select="/*/*[local-name() != 'preface' and local-name() != 'sections' and local-name() != 'annex' and local-name() != 'bibliography' and local-name() != 'indexsect']"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="processMainSectionsDefault"> + <xsl:template name="processMainSectionsDefault"> <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"> <xsl:sort select="@displayorder" data-type="number"/> <xsl:apply-templates select="."/> </xsl:for-each> @@ -2602,12 +2595,20 @@ <xsl:sort select="@displayorder" data-type="number"/> <xsl:apply-templates select="."/> </xsl:for-each> </xsl:template><!-- END: processMainSectionsDefault --> - <!-- Example: + <!-- Example: <iso-standard> + <preface> + <page_sequence> + <clause... + </page_sequence> + <page_sequence> + <clause... + </page_sequence> + </preface> <sections> <page_sequence> <clause... </page_sequence> <page_sequence> @@ -2620,84 +2621,224 @@ <page_sequence> <annex .. </page_sequence> </iso-standard> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="processMainSectionsDefault_items"> + <xsl:template name="processPrefaceAndMainSectionsDefault_items"> <xsl:variable name="updated_xml_step_move_pagebreak"> - <xsl:element name="{$root_element}" namespace="{$namespace_full}"> - <xsl:call-template name="copyCommonElements"/> + <xsl:call-template name="insertPrefaceSectionsPageSequences"/> + <xsl:call-template name="insertMainSectionsPageSequences"/> + </xsl:element> + </xsl:variable> - <xsl:element name="sections" namespace="{$namespace_full}"> <!-- save context element --> - <xsl:element name="page_sequence" namespace="{$namespace_full}"> - <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"> - <xsl:sort select="@displayorder" data-type="number"/> - <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/> + <xsl:variable name="updated_xml_step_move_pagebreak_filename" select="concat($output_path,'_main_', java:getTime(java:java.util.Date.new()), '.xml')"/> - </xsl:for-each> - </xsl:element> + <redirect:write file="{$updated_xml_step_move_pagebreak_filename}"> + <xsl:copy-of select="$updated_xml_step_move_pagebreak"/> + </redirect:write> + + <xsl:copy-of select="document($updated_xml_step_move_pagebreak_filename)"/> + + <xsl:if test="$debug = 'true'"> + <redirect:write file="page_sequence_preface_and_main.xml"> + <xsl:copy-of select="$updated_xml_step_move_pagebreak"/> + </redirect:write> + </xsl:if> + + <xsl:call-template name="deleteFile"> + <xsl:with-param name="filepath" select="$updated_xml_step_move_pagebreak_filename"/> + </xsl:call-template> + </xsl:template> <!-- END: processPrefaceAndMainSectionsDefault_items --> + + <xsl:template name="insertPrefaceSectionsPageSequences"> + <xsl:element name="preface" namespace="{$namespace_full}"> <!-- save context element --> + <xsl:element name="page_sequence" namespace="{$namespace_full}"> + <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]"> + <xsl:sort select="@displayorder" data-type="number"/> + <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/> + </xsl:for-each> + </xsl:element> + </xsl:element> + </xsl:template> <!-- END: insertPrefaceSectionsPageSequences --> + + <xsl:template name="insertMainSectionsPageSequences"> + <xsl:element name="sections" namespace="{$namespace_full}"> <!-- save context element --> + <xsl:element name="page_sequence" namespace="{$namespace_full}"> + <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"> + <xsl:sort select="@displayorder" data-type="number"/> + <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/> + + </xsl:for-each> + </xsl:element> + </xsl:element> + + <xsl:element name="page_sequence" namespace="{$namespace_full}"> + <xsl:for-each select="/*/*[local-name()='annex']"> + <xsl:sort select="@displayorder" data-type="number"/> + <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/> + </xsl:for-each> + </xsl:element> + + <xsl:element name="page_sequence" namespace="{$namespace_full}"> + <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"/> + <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/> + </xsl:for-each> + </xsl:element> + </xsl:element> + </xsl:template> <!-- END: insertMainSectionsPageSequences --> + + <xsl:template name="insertMainSectionsInSeparatePageSequences"> + <xsl:element name="sections" namespace="{$namespace_full}"> <!-- save context element --> + <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"> + <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: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"/> <xsl:element name="page_sequence" namespace="{$namespace_full}"> - <xsl:for-each select="/*/*[local-name()='annex']"> - <xsl:sort select="@displayorder" data-type="number"/> - <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/> - </xsl:for-each> + <xsl:attribute name="main_page_sequence"/> + <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/> </xsl:element> + </xsl:for-each> + </xsl:element> + </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"> + <xsl:element name="{$root_element}" namespace="{$namespace_full}"> + <xsl:call-template name="copyCommonElements"/> <xsl:element name="page_sequence" namespace="{$namespace_full}"> - <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"/> - <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/> - </xsl:for-each> - </xsl:element> + <xsl:call-template name="insertPrefaceSections"/> + <xsl:call-template name="insertMainSections"/> </xsl:element> </xsl:element> </xsl:variable> - <xsl:variable name="updated_xml_step_move_pagebreak_filename" select="concat($output_path,'_main_', java:getTime(java:java.util.Date.new()), '.xml')"/> - + <xsl:variable name="updated_xml_step_move_pagebreak_filename" select="concat($output_path,'_preface_and_main_', java:getTime(java:java.util.Date.new()), '.xml')"/> + <!-- <xsl:message>updated_xml_step_move_pagebreak_filename=<xsl:value-of select="$updated_xml_step_move_pagebreak_filename"/></xsl:message> + <xsl:message>start write updated_xml_step_move_pagebreak_filename</xsl:message> --> <redirect:write file="{$updated_xml_step_move_pagebreak_filename}"> <xsl:copy-of select="$updated_xml_step_move_pagebreak"/> </redirect:write> + <!-- <xsl:message>end write updated_xml_step_move_pagebreak_filename</xsl:message> --> <xsl:copy-of select="document($updated_xml_step_move_pagebreak_filename)"/> + <!-- TODO: instead of + <xsl:for-each select=".//*[local-name() = 'page_sequence'][normalize-space() != '' or .//image or .//svg]"> + in each template, add removing empty page_sequence here + --> + <xsl:if test="$debug = 'true'"> - <redirect:write file="page_sequence_main.xml"> - <xsl:copy-of select="document($updated_xml_step_move_pagebreak_filename)"/> + <redirect:write file="page_sequence_preface_and_main.xml"> + <xsl:copy-of select="$updated_xml_step_move_pagebreak"/> </redirect:write> </xsl:if> + <!-- <xsl:message>start delete updated_xml_step_move_pagebreak_filename</xsl:message> --> <xsl:call-template name="deleteFile"> <xsl:with-param name="filepath" select="$updated_xml_step_move_pagebreak_filename"/> </xsl:call-template> - </xsl:template> <!-- END: processMainSectionsDefault_items --> + <!-- <xsl:message>end delete updated_xml_step_move_pagebreak_filename</xsl:message> --> + </xsl:template> <!-- END: processAllSectionsDefault_items --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="deleteFile"> + <xsl:template name="insertPrefaceSections"> + <xsl:element name="preface" namespace="{$namespace_full}"> <!-- save context element --> + <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]"> + <xsl:sort select="@displayorder" data-type="number"/> + <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"> + <xsl:with-param name="page_sequence_at_top">true</xsl:with-param> + </xsl:apply-templates> + </xsl:for-each> + </xsl:element> + </xsl:template> + + <xsl:template name="insertMainSections"> + <xsl:element name="sections" namespace="{$namespace_full}"> <!-- save context element --> + + <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"> + <xsl:sort select="@displayorder" data-type="number"/> + <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"> + <xsl:with-param name="page_sequence_at_top">true</xsl:with-param> + </xsl:apply-templates> + + </xsl:for-each> + </xsl:element> + + <xsl:for-each select="/*/*[local-name()='annex']"> + <xsl:sort select="@displayorder" data-type="number"/> + <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"> + <xsl:with-param name="page_sequence_at_top">true</xsl:with-param> + </xsl:apply-templates> + </xsl:for-each> + + <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"/> + <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"> + <xsl:with-param name="page_sequence_at_top">true</xsl:with-param> + </xsl:apply-templates> + </xsl:for-each> + </xsl:element> + </xsl:template> + + <xsl:template name="deleteFile"> <xsl:param name="filepath"/> <xsl:variable name="xml_file" select="java:java.io.File.new($filepath)"/> <xsl:variable name="xml_file_path" select="java:toPath($xml_file)"/> <xsl:variable name="deletefile" select="java:java.nio.file.Files.deleteIfExists($xml_file_path)"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getPageSequenceOrientation"> + <xsl:template name="getPageSequenceOrientation"> <xsl:variable name="previous_orientation" select="preceding-sibling::*[local-name() = 'page_sequence'][@orientation][1]/@orientation"/> <xsl:choose> <xsl:when test="@orientation = 'landscape'">-<xsl:value-of select="@orientation"/></xsl:when> <xsl:when test="$previous_orientation = 'landscape' and not(@orientation = 'portrait')">-<xsl:value-of select="$previous_orientation"/></xsl:when> </xsl:choose> </xsl:template> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="text()" name="text"> + <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable> + <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable> + <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable> + <xsl:template match="text()" name="text"> <xsl:choose> <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when> <xsl:otherwise> <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/> @@ -2709,22 +2850,29 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="replace_fo_inline_tags"> + <xsl:template name="replace_fo_inline_tags"> <xsl:param name="tag_open"/> <xsl:param name="tag_close"/> <xsl:param name="text"/> <xsl:choose> <xsl:when test="contains($text, $tag_open)"> <xsl:value-of select="substring-before($text, $tag_open)"/> <!-- <xsl:text disable-output-escaping="yes">&lt;fo:inline keep-together.within-line="always"&gt;</xsl:text> --> <xsl:variable name="text_after" select="substring-after($text, $tag_open)"/> - <fo:inline keep-together.within-line="always"> - <xsl:value-of select="substring-before($text_after, $tag_close)"/> - </fo:inline> + <xsl:choose> + <xsl:when test="local-name(..) = 'keep-together_within-line'"> <!-- prevent two nested <fo:inline keep-together.within-line="always"><fo:inline keep-together.within-line="always" --> + <xsl:value-of select="substring-before($text_after, $tag_close)"/> + </xsl:when> + <xsl:otherwise> + <fo:inline keep-together.within-line="always" role="SKIP"> + <xsl:value-of select="substring-before($text_after, $tag_close)"/> + </fo:inline> + </xsl:otherwise> + </xsl:choose> <!-- <xsl:text disable-output-escaping="yes">&lt;/fo:inline&gt;</xsl:text> --> <xsl:call-template name="replace_fo_inline_tags"> <xsl:with-param name="tag_open" select="$tag_open"/> <xsl:with-param name="tag_close" select="$tag_close"/> <xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/> @@ -2732,16 +2880,16 @@ </xsl:when> <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='br']"> + <xsl:template match="*[local-name()='br']"> <xsl:value-of select="$linebreak"/> </xsl:template> <!-- keep-together for standard's name (ISO 12345:2020) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'keep-together_within-line']"> + <xsl:template match="*[local-name() = 'keep-together_within-line']"> <xsl:param name="split_keep-within-line"/> <!-- <fo:inline>split_keep-within-line='<xsl:value-of select="$split_keep-within-line"/>'</fo:inline> --> <xsl:choose> @@ -2775,89 +2923,89 @@ </xsl:template> <!-- ================================= --> <!-- Preface boilerplate sections processing --> <!-- ================================= --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='copyright-statement']"> + <xsl:template match="*[local-name()='copyright-statement']"> <fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP"> <xsl:apply-templates/> </fo:block> </xsl:template> <!-- copyright-statement --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='copyright-statement']//*[local-name()='title']"> + <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']"> <!-- process in the template 'title' --> <xsl:call-template name="title"/> </xsl:template> <!-- copyright-statement//title --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='copyright-statement']//*[local-name()='p']"> + <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']"> <!-- process in the template 'paragraph' --> <xsl:call-template name="paragraph"/> </xsl:template> <!-- copyright-statement//p --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='license-statement']"> + <xsl:template match="*[local-name()='license-statement']"> <fo:block xsl:use-attribute-sets="license-statement-style"> <xsl:apply-templates/> </fo:block> </xsl:template> <!-- license-statement --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='license-statement']//*[local-name()='title']"> + <xsl:template match="*[local-name()='license-statement']//*[local-name()='title']"> <!-- process in the template 'title' --> <xsl:call-template name="title"/> </xsl:template> <!-- license-statement/title --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='license-statement']//*[local-name()='p']"> + <xsl:template match="*[local-name()='license-statement']//*[local-name()='p']"> <!-- process in the template 'paragraph' --> <xsl:call-template name="paragraph"/> </xsl:template> <!-- license-statement/p --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='legal-statement']"> + <xsl:template match="*[local-name()='legal-statement']"> <xsl:param name="isLegacy">false</xsl:param> <fo:block xsl:use-attribute-sets="legal-statement-style"> <xsl:apply-templates/> </fo:block> </xsl:template> <!-- legal-statement --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='legal-statement']//*[local-name()='title']"> + <xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']"> <!-- process in the template 'title' --> <xsl:call-template name="title"/> </xsl:template> <!-- legal-statement/title --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='legal-statement']//*[local-name()='p']"> + <xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']"> <xsl:param name="margin"/> <!-- process in the template 'paragraph' --> <xsl:call-template name="paragraph"> <xsl:with-param name="margin" select="$margin"/> </xsl:call-template> </xsl:template> <!-- legal-statement/p --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='feedback-statement']"> + <xsl:template match="*[local-name()='feedback-statement']"> <fo:block xsl:use-attribute-sets="feedback-statement-style"> <xsl:apply-templates/> </fo:block> </xsl:template> <!-- feedback-statement --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='feedback-statement']//*[local-name()='title']"> + <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']"> <!-- process in the template 'title' --> <xsl:call-template name="title"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='feedback-statement']//*[local-name()='p']"> + <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']"> <xsl:param name="margin"/> <!-- process in the template 'paragraph' --> <xsl:call-template name="paragraph"> <xsl:with-param name="margin" select="$margin"/> @@ -2868,22 +3016,22 @@ <!-- ================================= --> <!-- END Preface boilerplate sections processing --> <!-- ================================= --> <!-- add zero spaces into table cells text --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1"> + <xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1"> <xsl:choose> <xsl:when test="parent::*[local-name() = 'keep-together_within-line']"> <xsl:value-of select="."/> </xsl:when> <xsl:otherwise> <xsl:call-template name="addZeroWidthSpacesToTextNodes"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="addZeroWidthSpacesToTextNodes"> + <xsl:template name="addZeroWidthSpacesToTextNodes"> <xsl:variable name="text"><text><xsl:call-template name="text"/></text></xsl:variable> <!-- <xsl:copy-of select="$text"/> --> <xsl:for-each select="xalan:nodeset($text)/text/node()"> <xsl:choose> <xsl:when test="self::text()"><xsl:call-template name="add-zero-spaces-java"/></xsl:when> @@ -2891,14 +3039,14 @@ </xsl:choose> </xsl:for-each> </xsl:template> <!-- for table auto-layout algorithm --> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table_only_with_id"/> <!-- Example: 'table1' --> - <xsl:param xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table_only_with_ids"/> <!-- Example: 'table1 table2 table3 ' --> + <xsl:param name="table_only_with_id"/> <!-- Example: 'table1' --> + <xsl:param name="table_only_with_ids"/> <!-- Example: 'table1 table2 table3 ' --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='table']" priority="2"> + <xsl:template match="*[local-name()='table']" priority="2"> <xsl:choose> <xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id"> <xsl:call-template name="table"/> </xsl:when> <xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when> @@ -2910,11 +3058,11 @@ <xsl:call-template name="table"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='table']" name="table"> + <xsl:template match="*[local-name()='table']" name="table"> <xsl:variable name="table-preamble"> </xsl:variable> @@ -3153,15 +3301,15 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setBordersTableArray"> + <xsl:template name="setBordersTableArray"> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='table']/*[local-name() = 'name']"> + <xsl:template match="*[local-name()='table']/*[local-name() = 'name']"> <xsl:param name="continued"/> <xsl:if test="normalize-space() != ''"> <fo:block xsl:use-attribute-sets="table-name-style" role="SKIP"> @@ -3190,34 +3338,34 @@ </xsl:if> </xsl:template> <!-- table/name --> <!-- workaround solution for https://github.com/metanorma/metanorma-iso/issues/1151#issuecomment-2033087938 --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='table']/*[local-name() = 'note'][@type = 'units']/*[local-name() = 'p']/text()" priority="4"> + <xsl:template match="*[local-name()='table']/*[local-name() = 'note'][@type = 'units']/*[local-name() = 'p']/text()" priority="4"> <xsl:choose> <xsl:when test="preceding-sibling::*[local-name() = 'br']"> <!-- remove CR or LF at start --> <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'^(&#13;&#10;|&#13;|&#10;)', '')"/> </xsl:when> <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise> </xsl:choose> </xsl:template> <!-- SOURCE: ... --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='table']/*[local-name() = 'source']" priority="2"> + <xsl:template match="*[local-name()='table']/*[local-name() = 'source']" priority="2"> <xsl:call-template name="termsource"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="calculate-columns-numbers"> + <xsl:template name="calculate-columns-numbers"> <xsl:param name="table-row"/> <xsl:variable name="columns-count" select="count($table-row/*)"/> <xsl:variable name="sum-colspans" select="sum($table-row/*/@colspan)"/> <xsl:variable name="columns-with-colspan" select="count($table-row/*[@colspan])"/> <xsl:value-of select="$columns-count + $sum-colspans - $columns-with-colspan"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="calculate-column-widths"> + <xsl:template name="calculate-column-widths"> <xsl:param name="table"/> <xsl:param name="cols-count"/> <xsl:choose> <xsl:when test="$isApplyAutolayoutAlgorithm = 'true'"> <xsl:call-template name="get-calculated-column-widths-autolayout-algorithm"/> @@ -3233,11 +3381,11 @@ </xsl:template> <!-- ================================================== --> <!-- Calculate column's width based on text string max widths --> <!-- ================================================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="calculate-column-widths-proportional"> + <xsl:template name="calculate-column-widths-proportional"> <xsl:param name="table"/> <xsl:param name="cols-count"/> <xsl:param name="curr-col" select="1"/> <xsl:param name="width" select="0"/> @@ -3348,11 +3496,11 @@ <!-- ================================= --> <!-- mode="td_text" --> <!-- ================================= --> <!-- replace each each char to 'X', just to process the tag 'keep-together_within-line' as whole word in longest word calculation --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[@keep-together.within-line or local-name() = 'keep-together_within-line']/text()" priority="2" mode="td_text"> + <xsl:template match="*[@keep-together.within-line or local-name() = 'keep-together_within-line']/text()" priority="2" mode="td_text"> <!-- <xsl:message>DEBUG t1=<xsl:value-of select="."/></xsl:message> <xsl:message>DEBUG t2=<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'.','X')"/></xsl:message> --> <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'.','X')"/> <!-- if all capitals english letters or digits --> @@ -3362,23 +3510,23 @@ <xsl:with-param name="count" select="string-length(normalize-space(.)) * 0.5"/> </xsl:call-template> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="text()" mode="td_text"> + <xsl:template match="text()" mode="td_text"> <xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='termsource']" mode="td_text"> + <xsl:template match="*[local-name()='termsource']" mode="td_text"> <xsl:value-of select="*[local-name()='origin']/@citeas"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='link']" mode="td_text"> + <xsl:template match="*[local-name()='link']" mode="td_text"> <xsl:value-of select="@target"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='math']" mode="td_text" name="math_length"> + <xsl:template match="*[local-name()='math']" mode="td_text" name="math_length"> <xsl:if test="$isGenerateTableIF = 'false'"> <xsl:variable name="mathml_"> <xsl:for-each select="*"> <xsl:if test="local-name() != 'unit' and local-name() != 'prefix' and local-name() != 'dimension' and local-name() != 'quantity'"> <xsl:copy-of select="."/> @@ -3406,11 +3554,11 @@ <!-- Calculate column's width based on HTML4 algorithm --> <!-- (https://www.w3.org/TR/REC-html40/appendix/notes.html#h-B.5.2) --> <!-- ================================================== --> <!-- INPUT: table with columns widths, generated by table_if.xsl --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="calculate-column-widths-autolayout-algorithm"> + <xsl:template name="calculate-column-widths-autolayout-algorithm"> <xsl:param name="parent_table_page-width"/> <!-- for nested tables, in re-calculate step --> <!-- via intermediate format --> <!-- The algorithm uses two passes through the table data and scales linearly with the size of the table --> @@ -3491,11 +3639,11 @@ <xsl:otherwise><unknown_case/></xsl:otherwise> </xsl:choose> </xsl:template> <!-- calculate-column-widths-autolayout-algorithm --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="get-calculated-column-widths-autolayout-algorithm"> + <xsl:template name="get-calculated-column-widths-autolayout-algorithm"> <!-- if nested 'dl' or 'table' --> <xsl:variable name="parent_table_id" select="normalize-space(ancestor::*[local-name() = 'table' or local-name() = 'dl'][1]/@id)"/> <parent_table_id><xsl:value-of select="$parent_table_id"/></parent_table_id> @@ -3556,20 +3704,20 @@ <!-- ================================================== --> <!-- Calculate column's width based on HTML4 algorithm --> <!-- ================================================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='thead']"> + <xsl:template match="*[local-name()='thead']"> <xsl:param name="cols-count"/> <fo:table-header> <xsl:apply-templates/> </fo:table-header> </xsl:template> <!-- thead --> <!-- template is using for iec, iso, jcgm, bsi only --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table-header-title"> + <xsl:template name="table-header-title"> <xsl:param name="cols-count"/> <!-- row for title --> <fo:table-row role="SKIP"> <fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black" role="SKIP"> @@ -3585,34 +3733,34 @@ </fo:table-cell> </fo:table-row> </xsl:template> <!-- table-header-title --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_table-header-title-style"> + <xsl:template name="refine_table-header-title-style"> </xsl:template> <!-- refine_table-header-title-style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='thead']" mode="process_tbody"> + <xsl:template match="*[local-name()='thead']" mode="process_tbody"> <fo:table-body> <xsl:apply-templates/> </fo:table-body> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='tfoot']"> + <xsl:template match="*[local-name()='tfoot']"> <xsl:apply-templates/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertTableFooter"> + <xsl:template name="insertTableFooter"> <xsl:param name="cols-count"/> <xsl:if test="../*[local-name()='tfoot']"> <fo:table-footer> <xsl:apply-templates select="../*[local-name()='tfoot']"/> </fo:table-footer> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertTableFooterInSeparateTable"> + <xsl:template name="insertTableFooterInSeparateTable"> <xsl:param name="table_attributes"/> <xsl:param name="colwidths"/> <xsl:param name="colgroup"/> <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/> @@ -3725,11 +3873,11 @@ </xsl:if> </xsl:if> </xsl:template> <!-- insertTableFooterInSeparateTable --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='tbody']"> + <xsl:template match="*[local-name()='tbody']"> <xsl:variable name="cols-count"> <xsl:choose> <xsl:when test="../*[local-name()='thead']"> <xsl:call-template name="calculate-columns-numbers"> @@ -3758,18 +3906,18 @@ </fo:table-body> </xsl:template> <!-- tbody --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="/" mode="process_table-if"> + <xsl:template match="/" mode="process_table-if"> <xsl:param name="table_or_dl">table</xsl:param> <xsl:apply-templates mode="process_table-if"> <xsl:with-param name="table_or_dl" select="$table_or_dl"/> </xsl:apply-templates> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='tbody']" mode="process_table-if"> + <xsl:template match="*[local-name()='tbody']" mode="process_table-if"> <xsl:param name="table_or_dl">table</xsl:param> <fo:table-body> <xsl:for-each select="*[local-name() = 'tr']"> <xsl:variable name="col_count" select="count(*)"/> @@ -3813,22 +3961,22 @@ <!-- ===================== --> <!-- Table's row processing --> <!-- ===================== --> <!-- row in table header (thead) thead/tr --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='thead']/*[local-name()='tr']" priority="2"> + <xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2"> <fo:table-row xsl:use-attribute-sets="table-header-row-style"> <xsl:call-template name="refine_table-header-row-style"/> <xsl:call-template name="setTableRowAttributes"/> <xsl:apply-templates/> </fo:table-row> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setBorderUnderRow"> + <xsl:template name="setBorderUnderRow"> <xsl:variable name="border_under_row_" select="normalize-space(ancestor::*[local-name() = 'table'][1]/@border-under-row)"/> <xsl:choose> <xsl:when test="$border_under_row_ != ''"> <xsl:variable name="table_id" select="ancestor::*[local-name() = 'table'][1]/@id"/> <xsl:variable name="row_num_"><xsl:number level="any" count="*[local-name() = 'table'][@id = $table_id]//*[local-name() = 'tr']"/></xsl:variable> @@ -3847,22 +3995,22 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- row in table footer (tfoot), tfoot/tr --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='tfoot']/*[local-name()='tr']" priority="2"> + <xsl:template match="*[local-name()='tfoot']/*[local-name()='tr']" priority="2"> <fo:table-row xsl:use-attribute-sets="table-footer-row-style"> <xsl:call-template name="refine_table-footer-row-style"/> <xsl:call-template name="setTableRowAttributes"/> <xsl:apply-templates/> </fo:table-row> </xsl:template> <!-- row in table's body (tbody) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='tr']"> + <xsl:template match="*[local-name()='tr']"> <fo:table-row xsl:use-attribute-sets="table-body-row-style"> <xsl:if test="count(*) = count(*[local-name() = 'th'])"> <!-- row contains 'th' only --> <xsl:attribute name="keep-with-next">always</xsl:attribute> </xsl:if> @@ -3873,24 +4021,26 @@ <xsl:apply-templates/> </fo:table-row> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setTableRowAttributes"> + <xsl:template name="setTableRowAttributes"> </xsl:template> <!-- setTableRowAttributes --> <!-- ===================== --> <!-- END Table's row processing --> <!-- ===================== --> <!-- cell in table header row --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th']"> + <xsl:template match="*[local-name()='th']"> <fo:table-cell xsl:use-attribute-sets="table-header-cell-style"> <!-- text-align="{@align}" --> <xsl:call-template name="setTextAlignment"> <xsl:with-param name="default">center</xsl:with-param> </xsl:call-template> + <xsl:copy-of select="@keep-together.within-line"/> + <xsl:call-template name="refine_table-header-cell-style"/> <!-- experimental feature, see https://github.com/metanorma/metanorma-plateau/issues/30#issuecomment-2145461828 --> <!-- <xsl:choose> <xsl:when test="count(node()) = 1 and *[local-name() = 'span'][contains(@style, 'text-orientation')]"> @@ -3911,11 +4061,11 @@ <xsl:apply-templates/> </fo:block> </fo:table-cell> </xsl:template> <!-- cell in table header row - 'th' --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setTableCellAttributes"> + <xsl:template name="setTableCellAttributes"> <xsl:if test="@colspan"> <xsl:attribute name="number-columns-spanned"> <xsl:value-of select="@colspan"/> </xsl:attribute> </xsl:if> @@ -3925,11 +4075,11 @@ </xsl:attribute> </xsl:if> <xsl:call-template name="display-align"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="display-align"> + <xsl:template name="display-align"> <xsl:if test="@valign"> <xsl:attribute name="display-align"> <xsl:choose> <xsl:when test="@valign = 'top'">before</xsl:when> <xsl:when test="@valign = 'middle'">center</xsl:when> @@ -3939,16 +4089,18 @@ </xsl:attribute> </xsl:if> </xsl:template> <!-- cell in table body, footer --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='td']" name="td"> + <xsl:template match="*[local-name()='td']" name="td"> <fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" --> <xsl:call-template name="setTextAlignment"> <xsl:with-param name="default">left</xsl:with-param> </xsl:call-template> + <xsl:copy-of select="@keep-together.within-line"/> + <xsl:call-template name="refine_table-cell-style"/> <xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table --> <xsl:attribute name="padding-right">1mm</xsl:attribute> </xsl:if> @@ -3972,13 +4124,14 @@ </fo:block> </fo:table-cell> </xsl:template> <!-- td --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2"> + <xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2"> <fo:block xsl:use-attribute-sets="table-note-style"> + <xsl:copy-of select="@id"/> <xsl:call-template name="refine_table-note-style"/> <!-- Table's note/example name (NOTE, for example) --> <fo:inline xsl:use-attribute-sets="table-note-name-style"> @@ -3992,11 +4145,11 @@ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> </xsl:template> <!-- table/note --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2"> + <xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2"> <xsl:apply-templates/> </xsl:template> <!-- ===================== --> <!-- Footnotes processing --> @@ -4005,11 +4158,11 @@ <fn reference="1"> <p id="_8e5cf917-f75a-4a49-b0aa-1714cb6cf954">Formerly denoted as 15 % (m/m).</p> </fn> --> <!-- footnotes in text (title, bibliography, main body, table's, figure's names), not for tables, figures --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))]" priority="2" name="fn"> + <xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))]" priority="2" name="fn"> <!-- list of footnotes to calculate actual footnotes number --> <xsl:variable name="p_fn_"> <xsl:call-template name="get_fn_list"/> <!-- <xsl:choose> @@ -4068,11 +4221,11 @@ <xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*"> <xsl:copy-of select="."/> </xsl:for-each> - <xsl:if test="following-sibling::*[1][local-name() = 'fn']"> + <xsl:if test="following-sibling::node()[normalize-space() != ''][1][local-name() = 'fn']"> <xsl:attribute name="padding-right">0.5mm</xsl:attribute> </xsl:if> <xsl:call-template name="insert_basic_link"> <xsl:with-param name="element"> @@ -4115,11 +4268,11 @@ <xsl:copy-of select="$footnote_inline"/> </xsl:otherwise> </xsl:choose> </xsl:template> <!-- fn in text --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="get_fn_list"> + <xsl:template name="get_fn_list"> <xsl:choose> <xsl:when test="@current_fn_number"> <!-- for BSI, footnote reference number calculated already --> <fn gen_id="{generate-id(.)}"> <xsl:copy-of select="@*"/> <xsl:copy-of select="node()"/> @@ -4135,11 +4288,11 @@ <fn gen_id="{generate-id(.)}"> <xsl:copy-of select="@*"/> <xsl:copy-of select="node()"/> </fn> </xsl:for-each> - <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='boilerplate']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]//*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]//*[local-name()='bibliography']/*"> + <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='boilerplate']/* | ancestor::*[contains(local-name(), '-standard')]//*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]//*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]//*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]//*[local-name()='bibliography']/*"> <xsl:sort select="@displayorder" data-type="number"/> <!-- commented: .//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] | because 'fn' there is in biblio-tag --> <xsl:for-each select=".//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))][generate-id(.)=generate-id(key('kfn',@reference)[1])]"> @@ -4152,11 +4305,11 @@ </xsl:for-each> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="get_fn_list_for_element"> + <xsl:template name="get_fn_list_for_element"> <xsl:choose> <xsl:when test="@current_fn_number"> <!-- footnote reference number calculated already --> <fn gen_id="{generate-id(.)}"> <xsl:copy-of select="@*"/> <xsl:copy-of select="node()"/> @@ -4177,11 +4330,11 @@ </xsl:choose> </xsl:template> <!-- ============================ --> <!-- table's footnotes rendering --> <!-- ============================ --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table_fn_display"> + <xsl:template name="table_fn_display"> <xsl:variable name="references"> <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']"> <xsl:call-template name="create_fn"/> </xsl:for-each> @@ -4207,19 +4360,24 @@ </xsl:if> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="create_fn"> + <xsl:template name="create_fn"> <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}"> + <xsl:if test="ancestor::*[local-name()='table'][1]/@id"> <!-- for footnotes in tables --> + <xsl:attribute name="id"> + <xsl:value-of select="concat(@reference, '_', ancestor::*[local-name()='table'][1]/@id)"/> + </xsl:attribute> + </xsl:if> <xsl:apply-templates/> </fn> </xsl:template> <!-- footnotes for table's name rendering --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="table_name_fn_display"> + <xsl:template name="table_name_fn_display"> <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']"> <xsl:variable name="reference" select="@reference"/> <fo:block id="{@reference}_{ancestor::*[@id][1]/@id}"><xsl:value-of select="@reference"/></fo:block> <fo:block margin-bottom="12pt"> <xsl:apply-templates/> @@ -4229,11 +4387,11 @@ <!-- ============================ --> <!-- EMD table's footnotes rendering --> <!-- ============================ --> <!-- figure's footnotes rendering --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="fn_display_figure"> + <xsl:template name="fn_display_figure"> <!-- current figure id --> <xsl:variable name="figure_id_"> <xsl:value-of select="@id"/> <xsl:if test="not(@id)"><xsl:value-of select="generate-id()"/></xsl:if> @@ -4346,28 +4504,33 @@ </xsl:if> </xsl:template> <!-- fn_display_figure --> <!-- fn reference in the text rendering (for instance, 'some text 1) some text' ) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='fn']"> + <xsl:template match="*[local-name()='fn']"> <fo:inline xsl:use-attribute-sets="fn-reference-style"> <xsl:call-template name="refine_fn-reference-style"/> <fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id--> + <xsl:if test="ancestor::*[local-name()='table'][1]/@id"> <!-- for footnotes in tables --> + <xsl:attribute name="internal-destination"> + <xsl:value-of select="concat(@reference, '_', ancestor::*[local-name()='table'][1]/@id)"/> + </xsl:attribute> + </xsl:if> <xsl:value-of select="@reference"/> </fo:basic-link> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='fn']/text()[normalize-space() != '']"> + <xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']"> <fo:inline role="SKIP"><xsl:value-of select="."/></fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='fn']//*[local-name()='p']"> + <xsl:template match="*[local-name()='fn']//*[local-name()='p']"> <fo:inline role="P"> <xsl:apply-templates/> </fo:inline> </xsl:template> <!-- ===================== --> @@ -4377,11 +4540,11 @@ <!-- ===================== --> <!-- Definition List --> <!-- ===================== --> <!-- for table auto-layout algorithm --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dl']" priority="2"> + <xsl:template match="*[local-name()='dl']" priority="2"> <xsl:choose> <xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id"> <xsl:call-template name="dl"/> </xsl:when> <xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when> @@ -4393,11 +4556,11 @@ <xsl:call-template name="dl"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dl']" name="dl"> + <xsl:template match="*[local-name()='dl']" name="dl"> <xsl:variable name="isAdded" select="@added"/> <xsl:variable name="isDeleted" select="@deleted"/> <!-- <dl><xsl:copy-of select="."/></dl> --> <fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP"> @@ -4679,45 +4842,45 @@ <xsl:apply-templates select="*[local-name() = 'dd']/*[local-name() = 'dl']"/> </xsl:if> </xsl:template> <!-- END: dl --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_dl_formula_where_style"> + <xsl:template name="refine_dl_formula_where_style"> </xsl:template> <!-- refine_dl_formula_where_style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_figure_key_style"> + <xsl:template name="refine_figure_key_style"> </xsl:template> <!-- refine_figure_key_style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_multicomponent_style"> + <xsl:template name="refine_multicomponent_style"> <xsl:variable name="parent" select="local-name(..)"/> <!-- <xsl:attribute name="margin-left">7mm</xsl:attribute> --> </xsl:template> <!-- refine_multicomponent_style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_multicomponent_block_style"> + <xsl:template name="refine_multicomponent_block_style"> <xsl:variable name="parent" select="local-name(..)"/> <!-- <xsl:attribute name="margin-left">-3.5mm</xsl:attribute> --> </xsl:template> <!-- refine_multicomponent_block_style --> <!-- ignore 'p' with 'where' in formula, before 'dl' --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'formula']/*[local-name() = 'p' and @keep-with-next = 'true' and following-sibling::*[1][local-name() = 'dl']]"/> + <xsl:template match="*[local-name() = 'formula']/*[local-name() = 'p' and @keep-with-next = 'true' and following-sibling::*[1][local-name() = 'dl']]"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'dl']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'dl']/*[local-name() = 'name']"> <xsl:param name="process">false</xsl:param> <xsl:if test="$process = 'true'"> <fo:block xsl:use-attribute-sets="dl-name-style"> <xsl:apply-templates/> </fo:block> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setColumnWidth_dl"> + <xsl:template name="setColumnWidth_dl"> <xsl:param name="colwidths"/> <xsl:param name="maxlength_dt"/> <xsl:param name="isContainsKeepTogetherTag"/> <!-- <colwidths><xsl:copy-of select="$colwidths"/></colwidths> --> @@ -4781,11 +4944,11 @@ </xsl:choose> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertTableColumnWidth"> + <xsl:template name="insertTableColumnWidth"> <xsl:param name="colwidths"/> <xsl:for-each select="xalan:nodeset($colwidths)//column"> <xsl:choose> <xsl:when test=". = 1 or . = 0"> @@ -4801,11 +4964,11 @@ </xsl:otherwise> </xsl:choose> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getMaxLength_dt"> + <xsl:template name="getMaxLength_dt"> <xsl:variable name="lengths"> <xsl:for-each select="*[local-name()='dt']"> <xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/> <xsl:variable name="attributes"> <xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each> @@ -4826,11 +4989,11 @@ <xsl:value-of select="$maxLength"/> </xsl:template> <!-- note in definition list: dl/note --> <!-- renders in the 2-column spanned table row --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dl']/*[local-name()='note']" priority="2"> + <xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2"> <xsl:param name="key_iso"/> <!-- <tr> <td>NOTE</td> <td> <xsl:apply-templates /> @@ -4865,11 +5028,11 @@ </fo:table-cell> </fo:table-row> </xsl:template> <!-- END: dl/note --> <!-- virtual html table for dl/[dt and dd] --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dt']" mode="dl"> + <xsl:template match="*[local-name()='dt']" mode="dl"> <xsl:param name="id"/> <xsl:variable name="row_number" select="count(preceding-sibling::*[local-name()='dt']) + 1"/> <tr> <td> <xsl:attribute name="id"> @@ -4890,11 +5053,11 @@ </tr> </xsl:template> <!-- Definition's term --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dt']"> + <xsl:template match="*[local-name()='dt']"> <xsl:param name="key_iso"/> <xsl:param name="split_keep-within-line"/> <fo:table-row xsl:use-attribute-sets="dt-row-style"> @@ -4908,11 +5071,11 @@ </xsl:call-template> </xsl:for-each> </fo:table-row> </xsl:template> <!-- END: dt --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insert_dt_cell"> + <xsl:template name="insert_dt_cell"> <xsl:param name="key_iso"/> <xsl:param name="split_keep-within-line"/> <fo:table-cell xsl:use-attribute-sets="dt-cell-style"> <xsl:if test="$isGenerateTableIF = 'true'"> @@ -4941,11 +5104,11 @@ </fo:block> </fo:table-cell> </xsl:template> <!-- insert_dt_cell --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insert_dd_cell"> + <xsl:template name="insert_dd_cell"> <xsl:param name="split_keep-within-line"/> <fo:table-cell xsl:use-attribute-sets="dd-cell-style"> <xsl:if test="$isGenerateTableIF = 'true'"> <!-- border is mandatory, to calculate real width --> @@ -4981,27 +5144,27 @@ </fo:table-cell> </xsl:template> <!-- insert_dd_cell --> <!-- END Definition's term --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dd']" mode="dl"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dd']" mode="dl_process"> + <xsl:template match="*[local-name()='dd']" mode="dl"/> + <xsl:template match="*[local-name()='dd']" mode="dl_process"> <xsl:apply-templates/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dd']"> + <xsl:template match="*[local-name()='dd']"> <xsl:param name="process">false</xsl:param> <xsl:param name="split_keep-within-line"/> <xsl:if test="$process = 'true'"> <xsl:apply-templates select="@language"/> <xsl:apply-templates> <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/> </xsl:apply-templates> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dd']/*" mode="inline"> + <xsl:template match="*[local-name()='dd']/*" mode="inline"> <xsl:variable name="is_inline_element_after_where"> <xsl:if test="(local-name() = 'p') and not(preceding-sibling::node()[normalize-space() != ''])">true</xsl:if> </xsl:variable> <xsl:choose> <xsl:when test="$is_inline_element_after_where = 'true'"> @@ -5012,11 +5175,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- virtual html table for dl/[dt and dd] for IF (Intermediate Format) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dt']" mode="dl_if"> + <xsl:template match="*[local-name()='dt']" mode="dl_if"> <xsl:param name="id"/> <tr> <td> <xsl:copy-of select="node()"/> </td> @@ -5026,27 +5189,27 @@ <!-- get paragraphs from nested 'dl' --> <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/> </td> </tr> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dd']" mode="dl_if"/> + <xsl:template match="*[local-name()='dd']" mode="dl_if"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*" mode="dl_if"> + <xsl:template match="*" mode="dl_if"> <xsl:copy-of select="."/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'p']" mode="dl_if"> + <xsl:template match="*[local-name() = 'p']" mode="dl_if"> <xsl:param name="indent"/> <p> <xsl:copy-of select="@*"/> <xsl:value-of select="$indent"/> <xsl:copy-of select="node()"/> </p> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'ul' or local-name() = 'ol']" mode="dl_if"> + <xsl:template match="*[local-name() = 'ul' or local-name() = 'ol']" mode="dl_if"> <xsl:variable name="list_rendered_"> <xsl:apply-templates select="."/> </xsl:variable> <xsl:variable name="list_rendered" select="xalan:nodeset($list_rendered_)"/> @@ -5059,58 +5222,58 @@ <xsl:apply-templates mode="dl_if"> <xsl:with-param name="indent" select="$indent"/> </xsl:apply-templates> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'li']" mode="dl_if"> + <xsl:template match="*[local-name() = 'li']" mode="dl_if"> <xsl:param name="indent"/> <xsl:apply-templates mode="dl_if"> <xsl:with-param name="indent" select="$indent"/> </xsl:apply-templates> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@provisional-distance-between-starts" mode="dl_if"> + <xsl:template match="@provisional-distance-between-starts" mode="dl_if"> <xsl:variable name="value" select="round(substring-before(.,'mm'))"/> <!-- emulate left indent for list item --> <xsl:call-template name="repeat"> <xsl:with-param name="char" select="'x'"/> <xsl:with-param name="count" select="$value"/> </xsl:call-template> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dl']" mode="dl_if_nested"> + <xsl:template match="*[local-name()='dl']" mode="dl_if_nested"> <xsl:for-each select="*[local-name() = 'dt']"> <p> <xsl:copy-of select="node()"/> <xsl:text> </xsl:text> <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'p']/node()"/> </p> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='dd']" mode="dl_if_nested"/> + <xsl:template match="*[local-name()='dd']" mode="dl_if_nested"/> <!-- ===================== --> <!-- END Definition List --> <!-- ===================== --> <!-- default: ignore title in sections/p --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/> + <xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/> <!-- ========================= --> <!-- Rich text formatting --> <!-- ========================= --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='em']"> + <xsl:template match="*[local-name()='em']"> <fo:inline font-style="italic"> <xsl:call-template name="refine_italic_style"/> <xsl:apply-templates/> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_italic_style"> + <xsl:template name="refine_italic_style"> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='strong'] | *[local-name()='b']"> + <xsl:template match="*[local-name()='strong'] | *[local-name()='b']"> <xsl:param name="split_keep-within-line"/> <fo:inline font-weight="bold"> <xsl:call-template name="refine_strong_style"/> @@ -5118,34 +5281,34 @@ <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/> </xsl:apply-templates> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_strong_style"> + <xsl:template name="refine_strong_style"> <xsl:if test="ancestor::*['preferred']"> <xsl:attribute name="role">SKIP</xsl:attribute> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='padding']"> + <xsl:template match="*[local-name()='padding']"> <fo:inline padding-right="{@value}"> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='sup']"> + <xsl:template match="*[local-name()='sup']"> <fo:inline font-size="80%" vertical-align="super"> <xsl:apply-templates/> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='sub']"> + <xsl:template match="*[local-name()='sub']"> <fo:inline font-size="80%" vertical-align="sub"> <xsl:apply-templates/> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='tt']"> + <xsl:template match="*[local-name()='tt']"> <fo:inline xsl:use-attribute-sets="tt-style"> <xsl:variable name="_font-size"> 9.5 @@ -5165,12 +5328,12 @@ </xsl:if> <xsl:apply-templates/> </fo:inline> </xsl:template> <!-- tt --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='tt']/text()" priority="2"> + <xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable> + <xsl:template match="*[local-name()='tt']/text()" priority="2"> <xsl:choose> <xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''"> <!-- url --> <xsl:call-template name="add-zero-spaces-link-java"/> </xsl:when> @@ -5178,20 +5341,20 @@ <xsl:call-template name="add_spaces_to_sourcecode"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='underline']"> + <xsl:template match="*[local-name()='underline']"> <fo:inline text-decoration="underline"> <xsl:apply-templates/> </fo:inline> </xsl:template> <!-- ================= --> <!-- Added,deleted text --> <!-- ================= --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='add'] | *[local-name() = 'change-open-tag'] | *[local-name() = 'change-close-tag']" name="tag_add"> + <xsl:template match="*[local-name()='add'] | *[local-name() = 'change-open-tag'] | *[local-name() = 'change-close-tag']" name="tag_add"> <xsl:param name="skip">true</xsl:param> <xsl:param name="block">false</xsl:param> <xsl:param name="type"/> <xsl:param name="text-align"/> <xsl:choose> @@ -5285,11 +5448,11 @@ </fo:inline> </xsl:otherwise> </xsl:choose> </xsl:template> <!-- add --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertTag"> + <xsl:template name="insertTag"> <xsl:param name="type"/> <xsl:param name="kind"/> <xsl:param name="value"/> <xsl:variable name="add_width" select="string-length($value) * 20"/> <xsl:variable name="maxwidth" select="60 + $add_width"/> @@ -5335,27 +5498,27 @@ </text> </svg> </fo:instream-foreign-object> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='del']"> + <xsl:template match="*[local-name()='del']"> <fo:inline xsl:use-attribute-sets="del-style"> <xsl:apply-templates/> </fo:inline> </xsl:template> <!-- ================= --> <!-- END Added,deleted text --> <!-- ================= --> <!-- highlight text --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='hi']"> + <xsl:template match="*[local-name()='hi']"> <fo:inline background-color="yellow"> <xsl:apply-templates/> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="text()[ancestor::*[local-name()='smallcap']]"> + <xsl:template match="text()[ancestor::*[local-name()='smallcap']]"> <!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 --> <xsl:variable name="text" select="."/> <xsl:variable name="ratio_"> 0.75 </xsl:variable> @@ -5398,13 +5561,13 @@ </xsl:for-each> </xsl:if> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="recursiveSmallCaps"> + <xsl:template name="recursiveSmallCaps"> <xsl:param name="text"/> - <xsl:param name="ratio"/> + <xsl:param name="ratio">0.75</xsl:param> <xsl:variable name="char" select="substring($text,1,1)"/> <!-- <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/> --> <xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/> <xsl:choose> <xsl:when test="$char=$upperCase"> @@ -5422,26 +5585,26 @@ <xsl:with-param name="ratio" select="$ratio"/> </xsl:call-template> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'pagebreak']"> + <xsl:template match="*[local-name() = 'pagebreak']"> <fo:block break-after="page"/> <fo:block> </fo:block> <fo:block break-after="page"/> </xsl:template> <!-- ================================================================ --> <!-- landscape/portrait orientation processing (post-processing step) --> <!-- ================================================================ --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="landscape_portrait"> + <xsl:template match="@*|node()" mode="landscape_portrait"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="landscape_portrait"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'pagebreak'][not(following-sibling::*[1][local-name() = 'pagebreak'])]" mode="landscape_portrait"> + <xsl:template match="*[local-name() = 'pagebreak'][not(following-sibling::*[1][local-name() = 'pagebreak'])]" mode="landscape_portrait"> <!-- determine pagebreak is last element before </fo:flow> or not --> <xsl:variable name="isLast"> <xsl:for-each select="ancestor-or-self::*[ancestor::fo:flow]"> <xsl:if test="following-sibling::*">false</xsl:if> @@ -5500,11 +5663,11 @@ <!-- ================================================================ --> <!-- END: landscape/portrait orientation processing (post-processing step) --> <!-- ================================================================ --> <!-- Example: <span style="font-family:&quot;Noto Sans JP&quot;">styled text</span> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'span'][@style]" priority="2"> + <xsl:template match="*[local-name() = 'span'][@style]" priority="2"> <xsl:variable name="styles__"> <xsl:call-template name="split"> <xsl:with-param name="pText" select="concat(@style,';')"/> <xsl:with-param name="sep" select="';'"/> </xsl:call-template> @@ -5548,41 +5711,41 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- END: span[@style] --> <!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'span']"> + <xsl:template match="*[local-name() = 'span']"> <xsl:apply-templates/> </xsl:template> <!-- Don't break standard's numbers --> <!-- Example : <span class="stdpublisher">ISO</span> <span class="stddocNumber">10303</span>-<span class="stddocPartNumber">1</span>:<span class="stdyear">1994</span> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']" priority="2"> + <xsl:template match="*[local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']" priority="2"> <xsl:choose> <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:apply-templates/></xsl:when> <xsl:when test="following-sibling::*[2][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']"> <fo:inline keep-with-next.within-line="always"><xsl:apply-templates/></fo:inline> </xsl:when> <xsl:otherwise> <xsl:apply-templates/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="text()[not(ancestor::*[local-name() = 'table']) and preceding-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear'] and following-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']]" priority="2"> + <xsl:template match="text()[not(ancestor::*[local-name() = 'table']) and preceding-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear'] and following-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']]" priority="2"> <fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5"> + <xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5"> <xsl:value-of select="."/> </xsl:template> <!-- ========================= --> <!-- END Rich text formatting --> <!-- ========================= --> <!-- split string 'text' by 'separator' --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="tokenize"> + <xsl:template name="tokenize"> <xsl:param name="text"/> <xsl:param name="separator" select="' '"/> <xsl:choose> <xsl:when test="$isGenerateTableIF = 'true' and not(contains($text, $separator))"> @@ -5648,11 +5811,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- split string 'text' by 'separator', enclosing in formatting tags --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="tokenize_with_tags"> + <xsl:template name="tokenize_with_tags"> <xsl:param name="tags"/> <xsl:param name="text"/> <xsl:param name="separator" select="' '"/> <xsl:choose> @@ -5685,11 +5848,11 @@ </xsl:call-template> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="enclose_text_in_tags"> + <xsl:template name="enclose_text_in_tags"> <xsl:param name="text"/> <xsl:param name="tags"/> <xsl:param name="num">1</xsl:param> <!-- default (start) value --> <xsl:variable name="tag_name" select="normalize-space(xalan:nodeset($tags)//tag[$num])"/> @@ -5707,21 +5870,21 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- get max value in array --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="max_length"> + <xsl:template name="max_length"> <xsl:param name="words"/> <xsl:for-each select="$words//word"> <xsl:sort select="." data-type="number" order="descending"/> <xsl:if test="position()=1"> <xsl:value-of select="."/> </xsl:if> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="add-zero-spaces-java"> + <xsl:template name="add-zero-spaces-java"> <xsl:param name="text" select="."/> <!-- add zero-width space (#x200B) after dot with next non-digit --> <xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(\.)([^\d\s])','$1​$2')"/> <!-- add zero-width space (#x200B) after characters: dash, equal, underscore, em dash, thin space, arrow right, ; --> @@ -5755,11 +5918,11 @@ <xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/> <xsl:value-of select="$text11"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="add-zero-spaces-link-java"> + <xsl:template name="add-zero-spaces-link-java"> <xsl:param name="text" select="."/> <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. --> <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/> <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @ --> @@ -5771,11 +5934,11 @@ <!-- remove zero-width space at the end --> <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '​$', '')"/> </xsl:template> <!-- add zero space after dash character (for table's entries) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="add-zero-spaces"> + <xsl:template name="add-zero-spaces"> <xsl:param name="text" select="."/> <xsl:variable name="zero-space-after-chars">-</xsl:variable> <xsl:variable name="zero-space-after-dot">.</xsl:variable> <xsl:variable name="zero-space-after-colon">:</xsl:variable> <xsl:variable name="zero-space-after-equal">=</xsl:variable> @@ -5826,11 +5989,11 @@ <xsl:value-of select="$text"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="add-zero-spaces-equal"> + <xsl:template name="add-zero-spaces-equal"> <xsl:param name="text" select="."/> <xsl:variable name="zero-space-after-equals">==========</xsl:variable> <xsl:variable name="regex_zero-space-after-equals">(==========)</xsl:variable> <xsl:variable name="zero-space-after-equal">=</xsl:variable> <xsl:variable name="regex_zero-space-after-equal">(=)</xsl:variable> @@ -5859,11 +6022,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- Table normalization (colspan,rowspan processing for adding TDs) for column width calculation --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getSimpleTable"> + <xsl:template name="getSimpleTable"> <xsl:param name="id"/> <!-- <test0> <xsl:copy-of select="."/> </test0> --> @@ -5902,26 +6065,26 @@ </xsl:template> <!-- ================================== --> <!-- Step 0. replace <br/> to <p>...</p> --> <!-- ================================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="table-without-br"> + <xsl:template match="@*|node()" mode="table-without-br"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="table-without-br"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode']) and not(*[local-name()='ul']) and not(*[local-name()='ol'])]" mode="table-without-br"> + <xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode']) and not(*[local-name()='ul']) and not(*[local-name()='ol'])]" mode="table-without-br"> <xsl:copy> <xsl:copy-of select="@*"/> <p> <xsl:copy-of select="node()"/> </p> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th' or local-name()='td'][*[local-name()='br']]" mode="table-without-br"> + <xsl:template match="*[local-name()='th' or local-name()='td'][*[local-name()='br']]" mode="table-without-br"> <xsl:copy> <xsl:copy-of select="@*"/> <xsl:for-each select="*[local-name()='br']"> <xsl:variable name="current_id" select="generate-id()"/> <p> @@ -5938,11 +6101,11 @@ </xsl:if> </xsl:for-each> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th' or local-name()='td']/*[local-name() = 'p'][*[local-name()='br']]" mode="table-without-br"> + <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'p'][*[local-name()='br']]" mode="table-without-br"> <xsl:for-each select="*[local-name()='br']"> <xsl:variable name="current_id" select="generate-id()"/> <p> <xsl:for-each select="preceding-sibling::node()[following-sibling::*[local-name() = 'br'][1][generate-id() = $current_id]][not(local-name() = 'br')]"> <xsl:copy-of select="."/> @@ -5956,15 +6119,15 @@ </p> </xsl:if> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']" mode="table-without-br"> + <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']" mode="table-without-br"> <xsl:apply-templates mode="table-without-br"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']/text()[contains(., '&#13;') or contains(., '&#10;')]" mode="table-without-br"> + <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']/text()[contains(., '&#13;') or contains(., '&#10;')]" mode="table-without-br"> <xsl:variable name="sep">###SOURCECODE_NEWLINE###</xsl:variable> <xsl:variable name="sourcecode_text" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', $sep)"/> <xsl:variable name="items"> <xsl:call-template name="split"> @@ -5979,20 +6142,20 @@ </p> </xsl:for-each> </xsl:template> <!-- remove redundant white spaces --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="text()[not(ancestor::*[local-name() = 'sourcecode'])]" mode="table-without-br"> + <xsl:template match="text()[not(ancestor::*[local-name() = 'sourcecode'])]" mode="table-without-br"> <xsl:variable name="text" select="translate(.,'&#9;&#10;&#13;','')"/> <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),' {2,}',' ')"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th' or local-name()='td']//*[local-name() = 'ol' or local-name() = 'ul']" mode="table-without-br"> + <xsl:template match="*[local-name()='th' or local-name()='td']//*[local-name() = 'ol' or local-name() = 'ul']" mode="table-without-br"> <xsl:apply-templates mode="table-without-br"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th' or local-name()='td']//*[local-name() = 'li']" mode="table-without-br"> + <xsl:template match="*[local-name()='th' or local-name()='td']//*[local-name() = 'li']" mode="table-without-br"> <xsl:apply-templates mode="table-without-br"/> </xsl:template> <!-- mode="table-without-br" --> <!-- ================================== --> @@ -6007,16 +6170,16 @@ 1.4. remove namespace 1.5. remove @colspan attribute 1.6. add @divide attribute for divide text width in further processing --> <!-- ===================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan"> + <xsl:template match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan"> <xsl:apply-templates mode="simple-table-colspan"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='fn']" mode="simple-table-colspan"/> + <xsl:template match="*[local-name()='fn']" mode="simple-table-colspan"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th'] | *[local-name()='td']" mode="simple-table-colspan"> + <xsl:template match="*[local-name()='th'] | *[local-name()='td']" mode="simple-table-colspan"> <xsl:choose> <xsl:when test="@colspan"> <xsl:variable name="td"> <xsl:element name="{local-name()}"> <xsl:attribute name="divide"><xsl:value-of select="@colspan"/></xsl:attribute> @@ -6042,27 +6205,27 @@ </xsl:element> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@colspan" mode="simple-table-colspan"/> + <xsl:template match="@colspan" mode="simple-table-colspan"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='tr']" mode="simple-table-colspan"> + <xsl:template match="*[local-name()='tr']" mode="simple-table-colspan"> <xsl:element name="tr"> <xsl:apply-templates select="@*" mode="simple-table-colspan"/> <xsl:apply-templates mode="simple-table-colspan"/> </xsl:element> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="simple-table-colspan"> + <xsl:template match="@*|node()" mode="simple-table-colspan"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="simple-table-colspan"/> </xsl:copy> </xsl:template> <!-- repeat node 'count' times --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="repeatNode"> + <xsl:template name="repeatNode"> <xsl:param name="count"/> <xsl:param name="node"/> <xsl:if test="$count &gt; 0"> <xsl:call-template name="repeatNode"> @@ -6078,26 +6241,26 @@ <!-- ===================== --> <!-- 2. mode "simple-table-rowspan" Row span processing, more information http://andrewjwelch.com/code/xslt/table/table-normalization.html --> <!-- ===================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="simple-table-rowspan"> + <xsl:template match="@*|node()" mode="simple-table-rowspan"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="simple-table-rowspan"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="tbody" mode="simple-table-rowspan"> + <xsl:template match="tbody" mode="simple-table-rowspan"> <xsl:copy> <xsl:copy-of select="tr[1]"/> <xsl:apply-templates select="tr[2]" mode="simple-table-rowspan"> <xsl:with-param name="previousRow" select="tr[1]"/> </xsl:apply-templates> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="tr" mode="simple-table-rowspan"> + <xsl:template match="tr" mode="simple-table-rowspan"> <xsl:param name="previousRow"/> <xsl:variable name="currentRow" select="."/> <xsl:variable name="normalizedTDs"> <xsl:for-each select="xalan:nodeset($previousRow)//*[self::td or self::th]"> @@ -6151,50 +6314,50 @@ </xsl:template> <!-- End mode simple-table-rowspan --> <!-- Step 3: add id for each cell --> <!-- mode: simple-table-id --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="/" mode="simple-table-id"> + <xsl:template match="/" mode="simple-table-id"> <xsl:param name="id"/> <xsl:variable name="id_prefixed" select="concat('table_if_',$id)"/> <!-- table id prefixed by 'table_if_' to simple search in IF --> <xsl:apply-templates select="@*|node()" mode="simple-table-id"> <xsl:with-param name="id" select="$id_prefixed"/> </xsl:apply-templates> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="simple-table-id"> + <xsl:template match="@*|node()" mode="simple-table-id"> <xsl:param name="id"/> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="simple-table-id"> <xsl:with-param name="id" select="$id"/> </xsl:apply-templates> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='tbody']" mode="simple-table-id"> + <xsl:template match="*[local-name()='tbody']" mode="simple-table-id"> <xsl:param name="id"/> <xsl:copy> <xsl:copy-of select="@*"/> <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute> <xsl:apply-templates select="node()" mode="simple-table-id"> <xsl:with-param name="id" select="$id"/> </xsl:apply-templates> </xsl:copy> </xsl:template> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="font_main_root_style"> + <xsl:variable name="font_main_root_style"> <root-style xsl:use-attribute-sets="root-style"> </root-style> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="font_main_root_style_font_family" select="xalan:nodeset($font_main_root_style)/root-style/@font-family"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="font_main"> + <xsl:variable name="font_main_root_style_font_family" select="xalan:nodeset($font_main_root_style)/root-style/@font-family"/> + <xsl:variable name="font_main"> <xsl:choose> <xsl:when test="contains($font_main_root_style_font_family, ',')"><xsl:value-of select="substring-before($font_main_root_style_font_family, ',')"/></xsl:when> <xsl:otherwise><xsl:value-of select="$font_main_root_style_font_family"/></xsl:otherwise> </xsl:choose> </xsl:variable> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th' or local-name()='td']" mode="simple-table-id"> + <xsl:template match="*[local-name()='th' or local-name()='td']" mode="simple-table-id"> <xsl:param name="id"/> <xsl:copy> <xsl:copy-of select="@*"/> <xsl:variable name="row_number" select="count(../preceding-sibling::*) + 1"/> <xsl:variable name="col_number" select="count(preceding-sibling::*) + 1"/> @@ -6285,11 +6448,11 @@ </xsl:if> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th' or local-name()='td']/*[local-name() = 'p']//*" mode="simple-table-noid"> + <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'p']//*" mode="simple-table-noid"> <xsl:copy> <xsl:choose> <xsl:when test="$isGenerateTableIF = 'true'"> <xsl:copy-of select="@*[local-name() != 'id']"/> <!-- to prevent repeat id in colspan/rowspan cells --> <!-- <xsl:if test="local-name() = 'dl' or local-name() = 'table'"> @@ -6309,19 +6472,19 @@ <!-- ===================== --> <!-- =============================== --> <!-- mode="td_text_with_formatting" --> <!-- =============================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="td_text_with_formatting"> + <xsl:template match="@*|node()" mode="td_text_with_formatting"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="td_text_with_formatting"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'stem' or local-name() = 'image']" mode="td_text_with_formatting"/> + <xsl:template match="*[local-name() = 'stem' or local-name() = 'image']" mode="td_text_with_formatting"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'keep-together_within-line']/text()" mode="td_text_with_formatting"> + <xsl:template match="*[local-name() = 'keep-together_within-line']/text()" mode="td_text_with_formatting"> <xsl:variable name="formatting_tags"> <xsl:call-template name="getFormattingTags"/> </xsl:variable> <word> <xsl:call-template name="enclose_text_in_tags"> @@ -6329,11 +6492,11 @@ <xsl:with-param name="tags" select="$formatting_tags"/> </xsl:call-template> </word> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() != 'keep-together_within-line']/text()" mode="td_text_with_formatting"> + <xsl:template match="*[local-name() != 'keep-together_within-line']/text()" mode="td_text_with_formatting"> <xsl:variable name="td_text" select="."/> <xsl:variable name="string_with_added_zerospaces"> <xsl:call-template name="add-zero-spaces-java"> @@ -6350,11 +6513,11 @@ <xsl:with-param name="tags" select="$formatting_tags"/> <xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​­', ' '))"/> <!-- replace zero-width-space and soft-hyphen to space --> </xsl:call-template> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'link'][normalize-space() = '']" mode="td_text_with_formatting"> + <xsl:template match="*[local-name() = 'link'][normalize-space() = '']" mode="td_text_with_formatting"> <xsl:variable name="link"> <link_updated> <xsl:variable name="target_text"> <xsl:choose> <xsl:when test="starts-with(normalize-space(@target), 'mailto:')"> @@ -6371,11 +6534,11 @@ <xsl:for-each select="xalan:nodeset($link)/*"> <xsl:apply-templates mode="td_text_with_formatting"/> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getFormattingTags"> + <xsl:template name="getFormattingTags"> <tags> <xsl:if test="ancestor::*[local-name() = 'strong']"><tag>strong</tag></xsl:if> <xsl:if test="ancestor::*[local-name() = 'em']"><tag>em</tag></xsl:if> <xsl:if test="ancestor::*[local-name() = 'sub']"><tag>sub</tag></xsl:if> <xsl:if test="ancestor::*[local-name() = 'sup']"><tag>sup</tag></xsl:if> @@ -6386,11 +6549,11 @@ </xsl:template> <!-- =============================== --> <!-- END mode="td_text_with_formatting" --> <!-- =============================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getLang"> + <xsl:template name="getLang"> <xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/> <xsl:variable name="language"> <xsl:choose> <xsl:when test="$language_current != ''"> <xsl:value-of select="$language_current"/> @@ -6419,11 +6582,11 @@ <xsl:when test="$language = 'English'">en</xsl:when> <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getLang_fromCurrentNode"> + <xsl:template name="getLang_fromCurrentNode"> <xsl:variable name="language_current" select="normalize-space(.//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/> <xsl:variable name="language"> <xsl:choose> <xsl:when test="$language_current != ''"> <xsl:value-of select="$language_current"/> @@ -6446,11 +6609,11 @@ <xsl:when test="$language = 'English'">en</xsl:when> <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="capitalizeWords"> + <xsl:template name="capitalizeWords"> <xsl:param name="str"/> <xsl:variable name="str2" select="translate($str, '-', ' ')"/> <xsl:choose> <xsl:when test="contains($str2, ' ')"> <xsl:variable name="substr" select="substring-before($str2, ' ')"/> @@ -6468,20 +6631,20 @@ </xsl:call-template> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="capitalize"> + <xsl:template name="capitalize"> <xsl:param name="str"/> <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(substring($str, 1, 1)))"/> <xsl:value-of select="substring($str, 2)"/> </xsl:template> <!-- ======================================= --> <!-- math --> <!-- ======================================= --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:math"> + <xsl:template match="mathml:math"> <xsl:variable name="isAdded" select="@added"/> <xsl:variable name="isDeleted" select="@deleted"/> <fo:inline xsl:use-attribute-sets="mathml-style"> @@ -6515,11 +6678,11 @@ </xsl:call-template> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getMathml_comment_text"> + <xsl:template name="getMathml_comment_text"> <xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/> <xsl:variable name="comment_text_"> <xsl:choose> <xsl:when test="normalize-space($comment_text_following) != ''"> <xsl:value-of select="$comment_text_following"/> @@ -6532,20 +6695,20 @@ <xsl:variable name="comment_text_2" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/> <xsl:variable name="comment_text" select="java:trim(java:java.lang.String.new($comment_text_2))"/> <xsl:value-of select="$comment_text"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'asciimath']"> + <xsl:template match="*[local-name() = 'asciimath']"> <xsl:param name="process" select="'false'"/> <xsl:if test="$process = 'true'"> <xsl:apply-templates/> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'latexmath']"/> + <xsl:template match="*[local-name() = 'latexmath']"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getMathml_asciimath_text"> + <xsl:template name="getMathml_asciimath_text"> <xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/> <xsl:variable name="latexmath"> </xsl:variable> <xsl:variable name="asciimath_text_following"> @@ -6574,11 +6737,11 @@ <xsl:variable name="asciimath_text_2" select="java:org.metanorma.fop.Util.unescape($asciimath_text_)"/> <xsl:variable name="asciimath_text" select="java:trim(java:java.lang.String.new($asciimath_text_2))"/> <xsl:value-of select="$asciimath_text"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="mathml_instream_object"> + <xsl:template name="mathml_instream_object"> <xsl:param name="asciimath_text"/> <xsl:param name="mathml_content"/> <xsl:variable name="asciimath_text_"> <xsl:choose> @@ -6614,15 +6777,15 @@ <xsl:copy-of select="xalan:nodeset($mathml)"/> </fo:instream-foreign-object> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_mathml_insteam_object_style"> + <xsl:template name="refine_mathml_insteam_object_style"> </xsl:template> <!-- refine_mathml_insteam_object_style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:*" mode="mathml_actual_text"> + <xsl:template match="mathml:*" mode="mathml_actual_text"> <!-- <xsl:text>a+b</xsl:text> --> <xsl:text>&lt;</xsl:text> <xsl:value-of select="local-name()"/> <xsl:if test="local-name() = 'math'"> <xsl:text> xmlns="http://www.w3.org/1998/Math/MathML"</xsl:text> @@ -6639,21 +6802,21 @@ <xsl:text>&lt;/</xsl:text> <xsl:value-of select="local-name()"/> <xsl:text>&gt;</xsl:text> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="text()" mode="mathml_actual_text"> + <xsl:template match="text()" mode="mathml_actual_text"> <xsl:value-of select="normalize-space()"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="mathml"> + <xsl:template match="@*|node()" mode="mathml"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="mathml"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:mtext" mode="mathml"> + <xsl:template match="mathml:mtext" mode="mathml"> <xsl:copy> <!-- replace start and end spaces to non-break space --> <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/> </xsl:copy> </xsl:template> @@ -6671,17 +6834,17 @@ <mathml:mspace width="0.5ex"/> </xsl:otherwise> </xsl:choose> </xsl:template> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:math/*[local-name()='unit']" mode="mathml"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:math/*[local-name()='prefix']" mode="mathml"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:math/*[local-name()='dimension']" mode="mathml"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:math/*[local-name()='quantity']" mode="mathml"/> + <xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/> + <xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/> + <xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/> + <xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/> <!-- patch: slash in the mtd wrong rendering --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:mtd/mathml:mo/text()[. = '/']" mode="mathml"> + <xsl:template match="mathml:mtd/mathml:mo/text()[. = '/']" mode="mathml"> <xsl:value-of select="."/><xsl:value-of select="$zero_width_space"/> </xsl:template> <!-- special case for: <math xmlns="http://www.w3.org/1998/Math/MathML"> @@ -6696,11 +6859,11 @@ <mi>k</mi> </msubsup> </mstyle> </math> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:msup/mathml:mi[. = '‌' or . = ''][not(preceding-sibling::*)][following-sibling::mathml:mtext]" mode="mathml"> + <xsl:template match="mathml:msup/mathml:mi[. = '‌' or . = ''][not(preceding-sibling::*)][following-sibling::mathml:mtext]" mode="mathml"> <xsl:copy> <xsl:copy-of select="@*"/> <xsl:variable name="next_mtext" select="ancestor::mathml:msup/following-sibling::*[1][self::mathml:msubsup or self::mathml:msub or self::mathml:msup]/mathml:mtext"/> <xsl:if test="string-length($next_mtext) != ''"> <xsl:attribute name="color">#00000000</xsl:attribute> @@ -6722,19 +6885,19 @@ <mspace height="1.47ex"/> </mrow> <mn>1</mn> </msup> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:msup/mathml:mtext[not(preceding-sibling::*)]" mode="mathml"> + <xsl:template match="mathml:msup/mathml:mtext[not(preceding-sibling::*)]" mode="mathml"> <mathml:mrow> <xsl:copy-of select="."/> <mathml:mspace height="1.47ex"/> </mathml:mrow> </xsl:template> <!-- add space around vertical line --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:mo[normalize-space(text()) = '|']" mode="mathml"> + <xsl:template match="mathml:mo[normalize-space(text()) = '|']" mode="mathml"> <xsl:copy> <xsl:apply-templates select="@*" mode="mathml"/> <xsl:if test="not(@lspace)"> <xsl:attribute name="lspace">0.2em</xsl:attribute> </xsl:if> @@ -6744,22 +6907,22 @@ <xsl:apply-templates mode="mathml"/> </xsl:copy> </xsl:template> <!-- decrease fontsize for 'Circled Times' char --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:mo[normalize-space(text()) = '⊗']" mode="mathml"> + <xsl:template match="mathml:mo[normalize-space(text()) = '⊗']" mode="mathml"> <xsl:copy> <xsl:apply-templates select="@*" mode="mathml"/> <xsl:if test="not(@fontsize)"> <xsl:attribute name="fontsize">55%</xsl:attribute> </xsl:if> <xsl:apply-templates mode="mathml"/> </xsl:copy> </xsl:template> <!-- increase space before '(' --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="mathml:mo[normalize-space(text()) = '(']" mode="mathml"> + <xsl:template match="mathml:mo[normalize-space(text()) = '(']" mode="mathml"> <xsl:copy> <xsl:apply-templates select="@*" mode="mathml"/> <xsl:if test="(preceding-sibling::* and not(preceding-sibling::*[1][self::mathml:mo])) or (../preceding-sibling::* and not(../preceding-sibling::*[1][self::mathml:mo]))"> <xsl:if test="not(@lspace)"> <xsl:attribute name="lspace">0.4em</xsl:attribute> @@ -6780,11 +6943,11 @@ <!-- Examples: <stem type="AsciiMath">x = 1</stem> <stem type="AsciiMath"><asciimath>x = 1</asciimath></stem> <stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'stem'][@type = 'AsciiMath'][count(*) = 0]/text() | *[local-name() = 'stem'][@type = 'AsciiMath'][*[local-name() = 'asciimath']]" priority="3"> + <xsl:template match="*[local-name() = 'stem'][@type = 'AsciiMath'][count(*) = 0]/text() | *[local-name() = 'stem'][@type = 'AsciiMath'][*[local-name() = 'asciimath']]" priority="3"> <fo:inline xsl:use-attribute-sets="mathml-style"> <xsl:call-template name="refine_mathml-style"/> <xsl:choose> @@ -6800,13 +6963,13 @@ </xsl:template> <!-- ======================================= --> <!-- END: math --> <!-- ======================================= --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='localityStack']"/> + <xsl:template match="*[local-name()='localityStack']"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='link']" name="link"> + <xsl:template match="*[local-name()='link']" name="link"> <xsl:variable name="target"> <xsl:choose> <xsl:when test="@updatetype = 'true'"> <xsl:value-of select="concat(normalize-space(@target), '.pdf')"/> </xsl:when> @@ -6867,42 +7030,42 @@ </xsl:template> <!-- link --> <!-- ======================== --> <!-- Appendix processing --> <!-- ======================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='appendix']"> + <xsl:template match="*[local-name()='appendix']"> <fo:block id="{@id}" xsl:use-attribute-sets="appendix-style"> <xsl:apply-templates select="*[local-name()='title']"/> </fo:block> <xsl:apply-templates select="node()[not(local-name()='title')]"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='appendix']/*[local-name()='title']" priority="2"> + <xsl:template match="*[local-name()='appendix']/*[local-name()='title']" priority="2"> <xsl:variable name="level"> <xsl:call-template name="getLevel"/> </xsl:variable> <fo:inline role="H{$level}"><xsl:apply-templates/></fo:inline> </xsl:template> <!-- ======================== --> <!-- END Appendix processing --> <!-- ======================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='appendix']//*[local-name()='example']" priority="2"> + <xsl:template match="*[local-name()='appendix']//*[local-name()='example']" priority="2"> <fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style"> <xsl:apply-templates select="*[local-name()='name']"/> </fo:block> <xsl:apply-templates select="node()[not(local-name()='name')]"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'callout']"> + <xsl:template match="*[local-name() = 'callout']"> <xsl:choose> <xsl:when test="normalize-space(@target) = ''">&lt;<xsl:apply-templates/>&gt;</xsl:when> <xsl:otherwise><fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link></xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'annotation']"> + <xsl:template match="*[local-name() = 'annotation']"> <xsl:variable name="annotation-id" select="@id"/> <xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/> <fo:block id="{$annotation-id}" white-space="nowrap"> <fo:inline> @@ -6911,20 +7074,20 @@ </xsl:apply-templates> </fo:inline> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'annotation']/*[local-name() = 'p']"> + <xsl:template match="*[local-name() = 'annotation']/*[local-name() = 'p']"> <xsl:param name="callout"/> <fo:inline id="{@id}"> <!-- for first p in annotation, put <x> --> <xsl:if test="not(preceding-sibling::*[local-name() = 'p'])"><xsl:value-of select="$callout"/></xsl:if> <xsl:apply-templates/> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'xref']"> + <xsl:template match="*[local-name() = 'xref']"> <xsl:call-template name="insert_basic_link"> <xsl:with-param name="element"> <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style"> <xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])"> <xsl:attribute name="keep-together.within-line">always</xsl:attribute> @@ -6937,18 +7100,18 @@ </xsl:with-param> </xsl:call-template> </xsl:template> <!-- command between two xref points to non-standard bibitem --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]"> + <xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]"> <xsl:value-of select="."/> </xsl:template> <!-- ====== --> <!-- formula --> <!-- ====== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'formula']" name="formula"> + <xsl:template match="*[local-name() = 'formula']" name="formula"> <fo:block-container margin-left="0mm" role="SKIP"> <xsl:if test="parent::*[local-name() = 'note']"> <xsl:attribute name="margin-left"> <xsl:choose> <xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when> @@ -6963,30 +7126,30 @@ </fo:block> </fo:block-container> </fo:block-container> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'formula']/*[local-name() = 'dt']/*[local-name() = 'stem']"> + <xsl:template match="*[local-name() = 'formula']/*[local-name() = 'dt']/*[local-name() = 'stem']"> <fo:inline> <xsl:apply-templates/> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'admitted']/*[local-name() = 'stem']"> + <xsl:template match="*[local-name() = 'admitted']/*[local-name() = 'stem']"> <fo:inline> <xsl:apply-templates/> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'formula']/*[local-name() = 'name']"> <!-- show in 'stem' template --> + <xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"> <!-- show in 'stem' template --> <xsl:if test="normalize-space() != ''"> <xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text> </xsl:if> </xsl:template> <!-- stem inside formula with name (with formula's number) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'formula'][*[local-name() = 'name']]/*[local-name() = 'stem']"> + <xsl:template match="*[local-name() = 'formula'][*[local-name() = 'name']]/*[local-name() = 'stem']"> <fo:block xsl:use-attribute-sets="formula-style"> <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="95%"/> <fo:table-column column-width="5%"/> @@ -7013,31 +7176,31 @@ </fo:table> </fo:block> </xsl:template> <!-- stem inside formula without name (without formula's number) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'formula'][not(*[local-name() = 'name'])]/*[local-name() = 'stem']"> + <xsl:template match="*[local-name() = 'formula'][not(*[local-name() = 'name'])]/*[local-name() = 'stem']"> <fo:block xsl:use-attribute-sets="formula-style"> <fo:block xsl:use-attribute-sets="formula-stem-block-style"> <xsl:apply-templates/> </fo:block> </fo:block> </xsl:template> <!-- ====== --> <!-- ====== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setBlockSpanAll"> + <xsl:template name="setBlockSpanAll"> <xsl:if test="@columns = 1 or (local-name() = 'p' and *[@columns = 1])"><xsl:attribute name="span">all</xsl:attribute></xsl:if> </xsl:template> <!-- ====== --> <!-- note --> <!-- termnote --> <!-- ====== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'note']" name="note"> + <xsl:template match="*[local-name() = 'note']" name="note"> <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP"> <xsl:call-template name="setBlockSpanAll"/> @@ -7076,15 +7239,15 @@ </fo:block-container> </fo:block-container> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_note_block_style"> + <xsl:template name="refine_note_block_style"> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'note']/*[local-name() = 'p']"> + <xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']"> <xsl:variable name="num"><xsl:number/></xsl:variable> <xsl:choose> <xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE --> <fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP"> <xsl:apply-templates/> @@ -7096,11 +7259,11 @@ </fo:block> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'termnote']"> + <xsl:template match="*[local-name() = 'termnote']"> <fo:block id="{@id}" xsl:use-attribute-sets="termnote-style"> <xsl:call-template name="setBlockSpanAll"/> <xsl:call-template name="refine_termnote-style"/> @@ -7125,11 +7288,11 @@ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'note']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']"> <xsl:param name="sfx"/> <xsl:variable name="suffix"> <xsl:choose> <xsl:when test="$sfx != ''"> <xsl:value-of select="$sfx"/> @@ -7145,11 +7308,11 @@ <xsl:apply-templates/> <xsl:value-of select="$suffix"/> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'termnote']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']"> <xsl:param name="sfx"/> <xsl:variable name="suffix"> <xsl:choose> <xsl:when test="$sfx != ''"> <xsl:value-of select="$sfx"/> @@ -7163,11 +7326,11 @@ <xsl:apply-templates/> <xsl:value-of select="$suffix"/> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'termnote']/*[local-name() = 'p']"> + <xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']"> <xsl:variable name="num"><xsl:number/></xsl:variable> <xsl:choose> <xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name --> <fo:inline xsl:use-attribute-sets="termnote-p-style"> <xsl:apply-templates/> @@ -7186,28 +7349,28 @@ <!-- ====== --> <!-- term --> <!-- ====== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'terms']"> + <xsl:template match="*[local-name() = 'terms']"> <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> --> <fo:block id="{@id}"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'term']"> + <xsl:template match="*[local-name() = 'term']"> <fo:block id="{@id}" xsl:use-attribute-sets="term-style"> <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])"> </xsl:if> <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'term']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"> <xsl:if test="normalize-space() != ''"> <!-- <xsl:variable name="level"> <xsl:call-template name="getLevelTermName"/> </xsl:variable> <fo:inline role="H{$level}"> @@ -7222,11 +7385,11 @@ <!-- ====== --> <!-- figure --> <!-- image --> <!-- ====== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure']" name="figure"> + <xsl:template match="*[local-name() = 'figure']" name="figure"> <xsl:variable name="isAdded" select="@added"/> <xsl:variable name="isDeleted" select="@deleted"/> <fo:block-container id="{@id}" xsl:use-attribute-sets="figure-block-style"> <xsl:call-template name="refine_figure-block-style"/> @@ -7249,31 +7412,31 @@ <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image --> </fo:block-container> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure'][@class = 'pseudocode']"> + <xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']"> <fo:block id="{@id}"> <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> <xsl:apply-templates select="*[local-name() = 'name']"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure'][@class = 'pseudocode']//*[local-name() = 'p']"> + <xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']//*[local-name() = 'p']"> <fo:block xsl:use-attribute-sets="figure-pseudocode-p-style"> <xsl:apply-templates/> </fo:block> </xsl:template> <!-- SOURCE: ... --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2"> + <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2"> <xsl:call-template name="termsource"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'image']"> + <xsl:template match="*[local-name() = 'image']"> <xsl:param name="indent">0</xsl:param> <xsl:variable name="isAdded" select="../@added"/> <xsl:variable name="isDeleted" select="../@deleted"/> <xsl:choose> <xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']"> <!-- inline image ( 'image:path' in adoc, with one colon after image) --> @@ -7413,21 +7576,21 @@ </fo:block> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setImageWidth"> + <xsl:template name="setImageWidth"> <xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'"> <xsl:value-of select="@width"/> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setImageHeight"> + <xsl:template name="setImageHeight"> <xsl:if test="@height != '' and @height != 'auto'"> <xsl:value-of select="@height"/> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setImageWidthHeight"> + <xsl:template name="setImageWidthHeight"> <xsl:variable name="width"> <xsl:call-template name="setImageWidth"/> </xsl:variable> <xsl:if test="$width != ''"> <xsl:attribute name="content-width"> @@ -7442,11 +7605,11 @@ <xsl:value-of select="$height"/> </xsl:attribute> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getImageScale"> + <xsl:template name="getImageScale"> <xsl:param name="indent"/> <xsl:variable name="indent_left"> <xsl:choose> <xsl:when test="$indent != ''"><xsl:value-of select="$indent"/></xsl:when> <xsl:otherwise>0</xsl:otherwise> @@ -7469,11 +7632,11 @@ <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> --> <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/> <xsl:value-of select="$scale"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="image_src"> + <xsl:template name="image_src"> <xsl:choose> <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]"> <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/> </xsl:when> <!-- in WebP format, then convert image into PNG --> @@ -7492,11 +7655,11 @@ <xsl:value-of select="@src"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'image']" mode="cross_image"> + <xsl:template match="*[local-name() = 'image']" mode="cross_image"> <xsl:choose> <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]"> <xsl:variable name="src"> <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/> </xsl:variable> @@ -7536,29 +7699,29 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="svg_cross"> + <xsl:template name="svg_cross"> <xsl:param name="width"/> <xsl:param name="height"/> <line xmlns="http://www.w3.org/2000/svg" x1="0" y1="0" x2="{$width}" y2="{$height}" style="stroke: rgb(255, 0, 0); stroke-width:4px; "/> <line xmlns="http://www.w3.org/2000/svg" x1="0" y1="{$height}" x2="{$width}" y2="0" style="stroke: rgb(255, 0, 0); stroke-width:4px; "/> </xsl:template> <!-- =================== --> <!-- SVG images processing --> <!-- =================== --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="figure_name_height">14</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="width_effective" select="$pageWidth - $marginLeftRight1 - $marginLeftRight2"/><!-- paper width minus margins --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="height_effective" select="$pageHeight - $marginTop - $marginBottom - $figure_name_height"/><!-- paper height minus margins and title height --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="image_dpi" select="96"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="width_effective_px" select="$width_effective div 25.4 * $image_dpi"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="height_effective_px" select="$height_effective div 25.4 * $image_dpi"/> + <xsl:variable name="figure_name_height">14</xsl:variable> + <xsl:variable name="width_effective" select="$pageWidth - $marginLeftRight1 - $marginLeftRight2"/><!-- paper width minus margins --> + <xsl:variable name="height_effective" select="$pageHeight - $marginTop - $marginBottom - $figure_name_height"/><!-- paper height minus margins and title height --> + <xsl:variable name="image_dpi" select="96"/> + <xsl:variable name="width_effective_px" select="$width_effective div 25.4 * $image_dpi"/> + <xsl:variable name="height_effective_px" select="$height_effective div 25.4 * $image_dpi"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure'][not(*[local-name() = 'image']) and *[local-name() = 'svg']]/*[local-name() = 'name']/*[local-name() = 'bookmark']" priority="2"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure'][not(*[local-name() = 'image'])]/*[local-name() = 'svg']" priority="2" name="image_svg"> + <xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image']) and *[local-name() = 'svg']]/*[local-name() = 'name']/*[local-name() = 'bookmark']" priority="2"/> + <xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image'])]/*[local-name() = 'svg']" priority="2" name="image_svg"> <xsl:param name="name"/> <xsl:variable name="svg_content"> <xsl:apply-templates select="." mode="svg_update"/> </xsl:variable> @@ -7573,10 +7736,12 @@ </xsl:when> <xsl:otherwise>Figure</xsl:otherwise> </xsl:choose> </xsl:variable> + <xsl:variable name="isPrecedingTitle" select="normalize-space(ancestor::*[local-name() = 'figure']/preceding-sibling::*[1][local-name() = 'title'] and 1 = 1)"/> + <xsl:choose> <xsl:when test=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]"> <fo:block> <xsl:variable name="width" select="@width"/> <xsl:variable name="height" select="@height"/> @@ -7719,11 +7884,18 @@ </xsl:choose> </xsl:variable> <xsl:variable name="scale_y"> <xsl:choose> <xsl:when test="$svg_height * $scale_x &gt; $height_effective_px"> - <xsl:value-of select="$height_effective_px div ($svg_height * $scale_x)"/> + <xsl:variable name="height_effective_px_"> + <xsl:choose> + <!-- title is 'keep-with-next' with following figure --> + <xsl:when test="$isPrecedingTitle = 'true'"><xsl:value-of select="$height_effective_px - 80"/></xsl:when> + <xsl:otherwise><xsl:value-of select="$height_effective_px"/></xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:value-of select="$height_effective_px_ div ($svg_height * $scale_x)"/> </xsl:when> <xsl:otherwise>1</xsl:otherwise> </xsl:choose> </xsl:variable> @@ -7748,25 +7920,25 @@ </xsl:template> <!-- ============== --> <!-- svg_update --> <!-- ============== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="svg_update"> + <xsl:template match="@*|node()" mode="svg_update"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="svg_update"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'image']/@href" mode="svg_update"> + <xsl:template match="*[local-name() = 'image']/@href" mode="svg_update"> <xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink"> <xsl:value-of select="."/> </xsl:attribute> </xsl:template> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="regex_starts_with_digit">^[0-9].*</xsl:variable> + <xsl:variable name="regex_starts_with_digit">^[0-9].*</xsl:variable> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update"> + <xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update"> <xsl:copy> <xsl:apply-templates select="@*" mode="svg_update"/> <xsl:variable name="viewbox_"> <xsl:call-template name="split"> <xsl:with-param name="pText" select="@viewBox"/> @@ -7803,22 +7975,22 @@ <xsl:apply-templates mode="svg_update"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'svg']/@width" mode="svg_update"> + <xsl:template match="*[local-name() = 'svg']/@width" mode="svg_update"> <!-- image[@width]/svg --> <xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[2][local-name() = 'image']/@width)"/> <xsl:attribute name="width"> <xsl:choose> <xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when> <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise> </xsl:choose> </xsl:attribute> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'svg']/@height" mode="svg_update"> + <xsl:template match="*[local-name() = 'svg']/@height" mode="svg_update"> <!-- image[@height]/svg --> <xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[2][local-name() = 'image']/@height)"/> <xsl:attribute name="height"> <xsl:choose> <xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when> @@ -7826,21 +7998,21 @@ </xsl:choose> </xsl:attribute> </xsl:template> <!-- regex for 'display: inline-block;' --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="regex_svg_style_notsupported">display(\s|\h)*:(\s|\h)*inline-block(\s|\h)*;</xsl:variable> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'svg']//*[local-name() = 'style']/text()" mode="svg_update"> + <xsl:variable name="regex_svg_style_notsupported">display(\s|\h)*:(\s|\h)*inline-block(\s|\h)*;</xsl:variable> + <xsl:template match="*[local-name() = 'svg']//*[local-name() = 'style']/text()" mode="svg_update"> <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), $regex_svg_style_notsupported, '')"/> </xsl:template> <!-- replace stroke="rgba(r, g, b, alpha)" to stroke="rgb(r,g,b)" stroke-opacity="alpha", and fill="rgba(r, g, b, alpha)" to fill="rgb(r,g,b)" fill-opacity="alpha" --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*[local-name() = 'stroke' or local-name() = 'fill'][starts-with(normalize-space(.), 'rgba')]" mode="svg_update"> + <xsl:template match="@*[local-name() = 'stroke' or local-name() = 'fill'][starts-with(normalize-space(.), 'rgba')]" mode="svg_update"> <xsl:variable name="components_"> <xsl:call-template name="split"> <xsl:with-param name="pText" select="substring-before(substring-after(., '('), ')')"/> <xsl:with-param name="sep" select="','"/> </xsl:call-template> @@ -7854,47 +8026,47 @@ <!-- ============== --> <!-- END: svg_update --> <!-- ============== --> <!-- image with svg and emf --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3"> + <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3"> <xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/> <xsl:for-each select="*[local-name() = 'svg']"> <xsl:call-template name="image_svg"> <xsl:with-param name="name" select="$name"/> </xsl:call-template> </xsl:for-each> </xsl:template> <!-- For the structures like: <dt><image src="" mimetype="image/svg+xml" height="" width=""><svg xmlns="http://www.w3.org/2000/svg" ... --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() != 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3"> + <xsl:template match="*[local-name() != 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3"> <xsl:for-each select="*[local-name() = 'svg']"> <xsl:call-template name="image_svg"/> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2"> + <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2"> <xsl:variable name="svg_content" select="document(@src)"/> <xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/> <xsl:for-each select="xalan:nodeset($svg_content)/node()"> <xsl:call-template name="image_svg"> <xsl:with-param name="name" select="$name"/> </xsl:call-template> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="svg_remove_a"> + <xsl:template match="@*|node()" mode="svg_remove_a"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="svg_remove_a"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'a']" mode="svg_remove_a"> + <xsl:template match="*[local-name() = 'a']" mode="svg_remove_a"> <xsl:apply-templates mode="svg_remove_a"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'a']" mode="svg_imagemap_links"> + <xsl:template match="*[local-name() = 'a']" mode="svg_imagemap_links"> <xsl:param name="scale"/> <xsl:variable name="dest"> <xsl:choose> <xsl:when test="starts-with(@href, '#')"> <xsl:value-of select="substring-after(@href, '#')"/> @@ -7963,11 +8135,11 @@ <xsl:with-param name="dest" select="$dest"/> </xsl:call-template> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertSVGMapLink"> + <xsl:template name="insertSVGMapLink"> <xsl:param name="left"/> <xsl:param name="top"/> <xsl:param name="width"/> <xsl:param name="height"/> <xsl:param name="dest"/> @@ -7992,50 +8164,50 @@ <!-- =================== --> <!-- End SVG images processing --> <!-- =================== --> <!-- ignore emf processing (Apache FOP doesn't support EMF) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'emf']"/> + <xsl:template match="*[local-name() = 'emf']"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents"> + <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents"> <xsl:apply-templates mode="contents"/> <xsl:text> </xsl:text> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name'] | *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks"> + <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name'] | *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks"> <xsl:apply-templates mode="bookmarks"/> <xsl:text> </xsl:text> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2"> + <xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2"> <xsl:value-of select="."/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2"> + <xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2"> <xsl:value-of select="."/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'add'][starts-with(., $ace_tag)]/text()" mode="bookmarks" priority="3"/> + <xsl:template match="*[local-name() = 'add'][starts-with(., $ace_tag)]/text()" mode="bookmarks" priority="3"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="node()" mode="contents"> + <xsl:template match="node()" mode="contents"> <xsl:apply-templates mode="contents"/> </xsl:template> <!-- special case: ignore preface/section-title and sections/section-title without @displayorder --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'preface' or local-name() = 'sections']/*[local-name() = 'p'][@type = 'section-title' and not(@displayorder)]" priority="3" mode="contents"/> + <xsl:template match="*[local-name() = 'preface' or local-name() = 'sections']/*[local-name() = 'p'][@type = 'section-title' and not(@displayorder)]" priority="3" mode="contents"/> <!-- process them by demand (mode="contents_no_displayorder") --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'p'][@type = 'section-title' and not(@displayorder)]" mode="contents_no_displayorder"> + <xsl:template match="*[local-name() = 'p'][@type = 'section-title' and not(@displayorder)]" mode="contents_no_displayorder"> <xsl:call-template name="contents_section-title"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'p'][@type = 'section-title']" mode="contents_in_clause"> + <xsl:template match="*[local-name() = 'p'][@type = 'section-title']" mode="contents_in_clause"> <xsl:call-template name="contents_section-title"/> </xsl:template> <!-- special case: ignore section-title if @depth different than @depth of parent clause, or @depth of parent clause = 1 --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'clause']/*[local-name() = 'p'][@type = 'section-title' and (@depth != ../*[local-name() = 'title']/@depth or ../*[local-name() = 'title']/@depth = 1)]" priority="3" mode="contents"/> + <xsl:template match="*[local-name() = 'clause']/*[local-name() = 'p'][@type = 'section-title' and (@depth != ../*[local-name() = 'title']/@depth or ../*[local-name() = 'title']/@depth = 1)]" priority="3" mode="contents"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" name="contents_section-title" mode="contents"> + <xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" name="contents_section-title" mode="contents"> <xsl:variable name="level"> <xsl:call-template name="getLevel"> <xsl:with-param name="depth" select="@depth"/> </xsl:call-template> </xsl:variable> @@ -8094,38 +8266,38 @@ </title> </item> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="node()" mode="bookmarks"> + <xsl:template match="node()" mode="bookmarks"> <xsl:apply-templates mode="bookmarks"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'title' or local-name() = 'name']//*[local-name() = 'stem']" mode="contents"> + <xsl:template match="*[local-name() = 'title' or local-name() = 'name']//*[local-name() = 'stem']" mode="contents"> <xsl:apply-templates select="."/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/> + <xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'references']/*[local-name() = 'bibitem']" mode="contents"/> + <xsl:template match="*[local-name() = 'references']/*[local-name() = 'bibitem']" mode="contents"/> <!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'span']" mode="contents"> + <xsl:template match="*[local-name() = 'span']" mode="contents"> <xsl:apply-templates mode="contents"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'stem']" mode="bookmarks"> + <xsl:template match="*[local-name() = 'stem']" mode="bookmarks"> <xsl:apply-templates mode="bookmarks"/> </xsl:template> <!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'span']" mode="bookmarks"> + <xsl:template match="*[local-name() = 'span']" mode="bookmarks"> <xsl:apply-templates mode="bookmarks"/> </xsl:template> <!-- Bookmarks --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="addBookmarks"> + <xsl:template name="addBookmarks"> <xsl:param name="contents"/> <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/> <xsl:if test="$contents_nodes//item"> <fo:bookmark-tree> <xsl:choose> @@ -8138,11 +8310,11 @@ <fo:bookmark-title>collection.pdf</fo:bookmark-title> </fo:bookmark> </xsl:if> <xsl:for-each select="$contents_nodes/doc"> - <fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide"> + <fo:bookmark internal-destination="{contents/item[@display = 'true'][1]/@id}" starting-state="hide"> <xsl:if test="@bundle = 'true'"> <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute> </xsl:if> <fo:bookmark-title> <xsl:choose> @@ -8224,11 +8396,11 @@ </fo:bookmark-tree> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertFigureBookmarks"> + <xsl:template name="insertFigureBookmarks"> <xsl:param name="contents"/> <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/> <xsl:if test="$contents_nodes/figure"> <fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide"> <fo:bookmark-title>Figures</fo:bookmark-title> @@ -8259,11 +8431,11 @@ </fo:bookmark> </xsl:if> </xsl:template> <!-- insertFigureBookmarks --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertTableBookmarks"> + <xsl:template name="insertTableBookmarks"> <xsl:param name="contents"/> <xsl:param name="lang"/> <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/> <xsl:if test="$contents_nodes/table"> <fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide"> @@ -8303,11 +8475,11 @@ </xsl:if> </xsl:template> <!-- insertTableBookmarks --> <!-- End Bookmarks --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getLangVersion"> + <xsl:template name="getLangVersion"> <xsl:param name="lang"/> <xsl:param name="doctype" select="''"/> <xsl:param name="title" select="''"/> <xsl:choose> <xsl:when test="$lang = 'en'"> @@ -8319,11 +8491,11 @@ <xsl:when test="$lang = 'de'">Deutsche</xsl:when> <xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="item" mode="bookmark"> + <xsl:template match="item" mode="bookmark"> <xsl:choose> <xsl:when test="@id != ''"> <fo:bookmark internal-destination="{@id}" starting-state="hide"> <fo:bookmark-title> <xsl:if test="@section != ''"> @@ -8347,59 +8519,59 @@ <xsl:apply-templates mode="bookmark"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="title" mode="bookmark"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="text()" mode="bookmark"/> + <xsl:template match="title" mode="bookmark"/> + <xsl:template match="text()" mode="bookmark"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'image']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'image']/*[local-name() = 'name']"> <xsl:if test="normalize-space() != ''"> <fo:block xsl:use-attribute-sets="figure-name-style"> <xsl:call-template name="refine_figure-name-style"/> <xsl:apply-templates/> </fo:block> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure']/*[local-name() = 'note']"/> + <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/> + <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure']/*[local-name() = 'note'][@type = 'units'] | *[local-name() = 'image']/*[local-name() = 'note'][@type = 'units']" priority="2"> + <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note'][@type = 'units'] | *[local-name() = 'image']/*[local-name() = 'note'][@type = 'units']" priority="2"> <fo:block text-align="right" keep-with-next="always"> <xsl:apply-templates/> </fo:block> </xsl:template> <!-- ====== --> <!-- ====== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'title']" mode="contents_item"> + <xsl:template match="*[local-name() = 'title']" mode="contents_item"> <xsl:param name="mode">bookmarks</xsl:param> <xsl:apply-templates mode="contents_item"> <xsl:with-param name="mode" select="$mode"/> </xsl:apply-templates> <!-- <xsl:text> </xsl:text> --> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getSection"> + <xsl:template name="getSection"> <xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getName"> + <xsl:template name="getName"> <xsl:choose> <xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']"> <xsl:copy-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/following-sibling::node()"/> </xsl:when> <xsl:otherwise> <xsl:copy-of select="*[local-name() = 'title']/node()"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertTitleAsListItem"> + <xsl:template name="insertTitleAsListItem"> <xsl:param name="provisional-distance-between-starts" select="'9.5mm'"/> <xsl:variable name="section"> <xsl:for-each select=".."> <xsl:call-template name="getSection"/> </xsl:for-each> @@ -8426,80 +8598,80 @@ </fo:list-item-body> </fo:list-item> </fo:list-block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="extractSection"> + <xsl:template name="extractSection"> <xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="extractTitle"> + <xsl:template name="extractTitle"> <xsl:choose> <xsl:when test="*[local-name() = 'tab']"> <xsl:apply-templates select="*[local-name() = 'tab'][1]/following-sibling::node()"/> </xsl:when> <xsl:otherwise> <xsl:apply-templates/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'fn']" mode="contents"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'fn']" mode="bookmarks"/> + <xsl:template match="*[local-name() = 'fn']" mode="contents"/> + <xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'fn']" mode="contents_item"/> + <xsl:template match="*[local-name() = 'fn']" mode="contents_item"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents"> + <xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents"> <xsl:value-of select="."/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'review']" mode="contents_item"/> + <xsl:template match="*[local-name() = 'review']" mode="contents_item"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'tab']" mode="contents_item"> + <xsl:template match="*[local-name() = 'tab']" mode="contents_item"> <xsl:text> </xsl:text> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'strong']" mode="contents_item"> + <xsl:template match="*[local-name() = 'strong']" mode="contents_item"> <xsl:copy> <xsl:apply-templates mode="contents_item"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'em']" mode="contents_item"> + <xsl:template match="*[local-name() = 'em']" mode="contents_item"> <xsl:copy> <xsl:apply-templates mode="contents_item"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sub']" mode="contents_item"> + <xsl:template match="*[local-name() = 'sub']" mode="contents_item"> <xsl:copy> <xsl:apply-templates mode="contents_item"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sup']" mode="contents_item"> + <xsl:template match="*[local-name() = 'sup']" mode="contents_item"> <xsl:copy> <xsl:apply-templates mode="contents_item"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'stem']" mode="contents_item"> + <xsl:template match="*[local-name() = 'stem']" mode="contents_item"> <xsl:copy-of select="."/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'br']" mode="contents_item"> + <xsl:template match="*[local-name() = 'br']" mode="contents_item"> <xsl:text> </xsl:text> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'name']" mode="contents_item"> + <xsl:template match="*[local-name() = 'name']" mode="contents_item"> <xsl:param name="mode">bookmarks</xsl:param> <xsl:apply-templates mode="contents_item"> <xsl:with-param name="mode" select="$mode"/> </xsl:apply-templates> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'add']" mode="contents_item"> + <xsl:template match="*[local-name() = 'add']" mode="contents_item"> <xsl:param name="mode">bookmarks</xsl:param> <xsl:choose> <xsl:when test="starts-with(text(), $ace_tag)"> <xsl:if test="$mode = 'contents'"> <xsl:copy> @@ -8509,44 +8681,44 @@ </xsl:when> <xsl:otherwise><xsl:apply-templates mode="contents_item"/></xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="text()" mode="contents_item"> + <xsl:template match="text()" mode="contents_item"> <xsl:variable name="text"> <!-- to split by '_' and other chars --> <text><xsl:call-template name="add-zero-spaces-java"/></text> </xsl:variable> <xsl:for-each select="xalan:nodeset($text)/text/text()"> <xsl:call-template name="keep_together_standard_number"/> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'add'][starts-with(., $ace_tag)]/text()" mode="contents_item" priority="2"> + <xsl:template match="*[local-name() = 'add'][starts-with(., $ace_tag)]/text()" mode="contents_item" priority="2"> <xsl:value-of select="."/> </xsl:template> <!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'span']" mode="contents_item"> + <xsl:template match="*[local-name() = 'span']" mode="contents_item"> <xsl:apply-templates mode="contents_item"/> </xsl:template> <!-- =============== --> <!-- sourcecode --> <!-- =============== --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="source-highlighter-css_" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'source-highlighter-css']"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="sourcecode_css_" select="java:org.metanorma.fop.Util.parseCSS($source-highlighter-css_)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="sourcecode_css" select="xalan:nodeset($sourcecode_css_)"/> + <xsl:variable name="source-highlighter-css_" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'source-highlighter-css']"/> + <xsl:variable name="sourcecode_css_" select="java:org.metanorma.fop.Util.parseCSS($source-highlighter-css_)"/> + <xsl:variable name="sourcecode_css" select="xalan:nodeset($sourcecode_css_)"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'property']" mode="css"> + <xsl:template match="*[local-name() = 'property']" mode="css"> <xsl:attribute name="{@name}"> <xsl:value-of select="@value"/> </xsl:attribute> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="get_sourcecode_attributes"> + <xsl:template name="get_sourcecode_attributes"> <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style"> <xsl:variable name="_font-size"> 9.5 <!-- inherit --> @@ -8570,11 +8742,11 @@ </xsl:if> <xsl:apply-templates select="$sourcecode_css//class[@name = 'sourcecode']" mode="css"/> </xsl:element> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='sourcecode']" name="sourcecode"> + <xsl:template match="*[local-name()='sourcecode']" name="sourcecode"> <xsl:variable name="sourcecode_attributes"> <xsl:call-template name="get_sourcecode_attributes"/> </xsl:variable> @@ -8641,11 +8813,11 @@ </fo:block-container> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='sourcecode']/text() | *[local-name()='sourcecode']//*[local-name()='span']/text()" priority="2"> + <xsl:template match="*[local-name()='sourcecode']/text() | *[local-name()='sourcecode']//*[local-name()='span']/text()" priority="2"> <xsl:choose> <!-- disabled --> <xsl:when test="1 = 2 and normalize-space($syntax-highlight) = 'true' and normalize-space(../@lang) != ''"> <!-- condition for turn on of highlighting --> <xsl:variable name="syntax" select="java:org.metanorma.fop.Util.syntaxHighlight(., ../@lang)"/> <xsl:choose> @@ -8662,11 +8834,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- add sourcecode highlighting --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='sourcecode']//*[local-name()='span'][@class]" priority="2"> + <xsl:template match="*[local-name()='sourcecode']//*[local-name()='span'][@class]" priority="2"> <xsl:variable name="class" select="@class"/> <!-- Example: <1> --> <xsl:variable name="is_callout"> <xsl:if test="parent::*[local-name() = 'dt']"> @@ -8689,11 +8861,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- outer table with line numbers for sourcecode --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] | --> + <xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] | --> <fo:block> <fo:table width="100%" table-layout="fixed"> <xsl:copy-of select="@id"/> <fo:table-column column-width="8%"/> <fo:table-column column-width="92%"/> @@ -8701,20 +8873,20 @@ <xsl:apply-templates/> </fo:table-body> </fo:table> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']/*[local-name() = 'tbody']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody'] | --> + <xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']/*[local-name() = 'tbody']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody'] | --> <xsl:apply-templates/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr'] | --> + <xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr'] | --> <fo:table-row> <xsl:apply-templates/> </fo:table-row> </xsl:template> <!-- first td with line numbers --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][not(preceding-sibling::*)]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] --> + <xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][not(preceding-sibling::*)]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] --> <fo:table-cell> <fo:block> <!-- set attibutes for line numbers - same as sourcecode --> <xsl:variable name="sourcecode_attributes"> @@ -8732,20 +8904,20 @@ </fo:block> </fo:table-cell> </xsl:template> <!-- second td with sourcecode --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] --> + <xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] --> <fo:table-cell> <fo:block role="SKIP"> <xsl:apply-templates/> </fo:block> </fo:table-cell> </xsl:template> <!-- END outer table with line numbers for sourcecode --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="add_spaces_to_sourcecode"> + <xsl:template name="add_spaces_to_sourcecode"> <xsl:variable name="text_step1"> <xsl:call-template name="add-zero-spaces-equal"/> </xsl:variable> <xsl:variable name="text_step2"> <xsl:call-template name="add-zero-spaces-java"> @@ -8779,25 +8951,25 @@ </xsl:choose> </xsl:for-each> </xsl:template> <!-- add_spaces_to_sourcecode --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="interspers_tag_open">###interspers123###</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="interspers_tag_close">###/interspers123###</xsl:variable> + <xsl:variable name="interspers_tag_open">###interspers123###</xsl:variable> + <xsl:variable name="interspers_tag_close">###/interspers123###</xsl:variable> <!-- split string by separator for interspers --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="split_for_interspers"> + <xsl:template name="split_for_interspers"> <xsl:param name="pText" select="."/> <xsl:param name="sep" select="','"/> <!-- word with length more than 30 will be interspersed with zero-width space --> <xsl:variable name="regex" select="concat('([^', $zero_width_space, ']{31,})')"/> <!-- sequence of characters (more 31), that doesn't contains zero-width space --> <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new($pText),$regex,concat($interspers_tag_open,'$1',$interspers_tag_close))"/> <xsl:call-template name="replace_tag_interspers"> <xsl:with-param name="text" select="$text"/> </xsl:call-template> </xsl:template> <!-- end: split string by separator for interspers --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="replace_tag_interspers"> + <xsl:template name="replace_tag_interspers"> <xsl:param name="text"/> <xsl:choose> <xsl:when test="contains($text, $interspers_tag_open)"> <xsl:value-of select="substring-before($text, $interspers_tag_open)"/> <xsl:variable name="text_after" select="substring-after($text, $interspers_tag_open)"/> @@ -8811,11 +8983,11 @@ <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise> </xsl:choose> </xsl:template> <!-- insert 'char' between each character in the string --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="interspers"> + <xsl:template name="interspers"> <xsl:param name="str"/> <xsl:param name="char" select="$zero_width_space"/> <xsl:if test="$str != ''"> <xsl:value-of select="substring($str, 1, 1)"/> @@ -8829,21 +9001,21 @@ <xsl:with-param name="char" select="$char"/> </xsl:call-template> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="interspers-java"> + <xsl:template name="interspers-java"> <xsl:param name="str"/> <xsl:param name="char" select="$zero_width_space"/> <xsl:value-of select="java:replaceAll(java:java.lang.String.new($str),'([^ -.:=_—])',concat('$1', $char))"/> <!-- insert $char after each char excep space, - . : = _ etc. --> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*" mode="syntax_highlight"> + <xsl:template match="*" mode="syntax_highlight"> <xsl:apply-templates mode="syntax_highlight"/> </xsl:template> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="syntax_highlight_styles_"> + <xsl:variable name="syntax_highlight_styles_"> <style class="hljs-addition" xsl:use-attribute-sets="hljs-addition"/> <style class="hljs-attr" xsl:use-attribute-sets="hljs-attr"/> <style class="hljs-attribute" xsl:use-attribute-sets="hljs-attribute"/> <style class="hljs-built_in" xsl:use-attribute-sets="hljs-built_in"/> <style class="hljs-bullet" xsl:use-attribute-sets="hljs-bullet"/> @@ -8889,13 +9061,13 @@ <style class="hljs-title_and_function_" xsl:use-attribute-sets="hljs-title_and_function_"/> <style class="hljs-type" xsl:use-attribute-sets="hljs-type"/> <style class="hljs-variable" xsl:use-attribute-sets="hljs-variable"/> <style class="hljs-variable_and_language_" xsl:use-attribute-sets="hljs-variable_and_language_"/> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="syntax_highlight_styles" select="xalan:nodeset($syntax_highlight_styles_)"/> + <xsl:variable name="syntax_highlight_styles" select="xalan:nodeset($syntax_highlight_styles_)"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="span" mode="syntax_highlight" priority="2"> + <xsl:template match="span" mode="syntax_highlight" priority="2"> <!-- <fo:inline color="green" font-style="italic"><xsl:apply-templates mode="syntax_highlight"/></fo:inline> --> <fo:inline> <xsl:variable name="classes_"> <xsl:call-template name="split"> <xsl:with-param name="pText" select="@class"/> @@ -8947,17 +9119,17 @@ </xsl:for-each> --> <xsl:apply-templates mode="syntax_highlight"/></fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="text()" mode="syntax_highlight" priority="2"> + <xsl:template match="text()" mode="syntax_highlight" priority="2"> <xsl:call-template name="add_spaces_to_sourcecode"/> </xsl:template> <!-- end mode="syntax_highlight" --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sourcecode']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']"> <xsl:if test="normalize-space() != ''"> <fo:block xsl:use-attribute-sets="sourcecode-name-style"> <xsl:apply-templates/> </fo:block> </xsl:if> @@ -8967,11 +9139,11 @@ <!-- =============== --> <!-- =============== --> <!-- pre --> <!-- =============== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='pre']" name="pre"> + <xsl:template match="*[local-name()='pre']" name="pre"> <fo:block xsl:use-attribute-sets="pre-style"> <xsl:copy-of select="@id"/> <xsl:choose> <xsl:when test="ancestor::*[local-name() = 'sourcecode'][@linenums = 'true'] and ancestor::*[local-name()='td'][1][not(preceding-sibling::*)]"> <!-- pre in the first td in the table with @linenums = 'true' --> @@ -8998,70 +9170,70 @@ <!-- =============== --> <!-- ========== --> <!-- permission --> <!-- ========== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'permission']"> + <xsl:template match="*[local-name() = 'permission']"> <fo:block id="{@id}" xsl:use-attribute-sets="permission-style"> <xsl:apply-templates select="*[local-name()='name']"/> <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'permission']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']"> <xsl:if test="normalize-space() != ''"> <fo:block xsl:use-attribute-sets="permission-name-style"> <xsl:apply-templates/> </fo:block> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'permission']/*[local-name() = 'label']"> + <xsl:template match="*[local-name() = 'permission']/*[local-name() = 'label']"> <fo:block xsl:use-attribute-sets="permission-label-style"> <xsl:apply-templates/> </fo:block> </xsl:template> <!-- ========== --> <!-- ========== --> <!-- ========== --> <!-- requirement --> <!-- ========== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'requirement']"> + <xsl:template match="*[local-name() = 'requirement']"> <fo:block id="{@id}" xsl:use-attribute-sets="requirement-style"> <xsl:apply-templates select="*[local-name()='name']"/> <xsl:apply-templates select="*[local-name()='label']"/> <xsl:apply-templates select="@obligation"/> <xsl:apply-templates select="*[local-name()='subject']"/> <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'label') and not(local-name() = 'subject')]"/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'requirement']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']"> <xsl:if test="normalize-space() != ''"> <fo:block xsl:use-attribute-sets="requirement-name-style"> <xsl:apply-templates/> </fo:block> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'requirement']/*[local-name() = 'label']"> + <xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']"> <fo:block xsl:use-attribute-sets="requirement-label-style"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'requirement']/@obligation"> + <xsl:template match="*[local-name() = 'requirement']/@obligation"> <fo:block> <fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"> + <xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"> <fo:block xsl:use-attribute-sets="subject-style"> <xsl:text>Target Type </xsl:text><xsl:apply-templates/> </fo:block> </xsl:template> @@ -9069,27 +9241,27 @@ <!-- ========== --> <!-- ========== --> <!-- recommendation --> <!-- ========== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'recommendation']"> + <xsl:template match="*[local-name() = 'recommendation']"> <fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style"> <xsl:apply-templates select="*[local-name()='name']"/> <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'recommendation']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']"> <xsl:if test="normalize-space() != ''"> <fo:block xsl:use-attribute-sets="recommendation-name-style"> <xsl:apply-templates/> </fo:block> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'recommendation']/*[local-name() = 'label']"> + <xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'label']"> <fo:block xsl:use-attribute-sets="recommendation-label-style"> <xsl:apply-templates/> </fo:block> </xsl:template> <!-- ========== --> @@ -9097,57 +9269,57 @@ <!-- ========== --> <!-- ========== --> <!-- ========== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'subject']"> + <xsl:template match="*[local-name() = 'subject']"> <fo:block xsl:use-attribute-sets="subject-style"> <xsl:text>Target Type </xsl:text><xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'div']"> + <xsl:template match="*[local-name() = 'div']"> <fo:block><xsl:apply-templates/></fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']"> + <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']"> <fo:block xsl:use-attribute-sets="inherit-style"> <xsl:text>Dependency </xsl:text><xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']"> + <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']"> <fo:block xsl:use-attribute-sets="description-style"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']"> + <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']"> <fo:block xsl:use-attribute-sets="specification-style"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']"> + <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']"> <fo:block xsl:use-attribute-sets="measurement-target-style"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']"> + <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']"> <fo:block xsl:use-attribute-sets="verification-style"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']"> + <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']"> <fo:block xsl:use-attribute-sets="import-style"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]"> + <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]"> <fo:block xsl:use-attribute-sets="component-style"> <xsl:apply-templates/> </fo:block> </xsl:template> <!-- ========== --> @@ -9155,11 +9327,11 @@ <!-- ========== --> <!-- ========== --> <!-- requirement, recommendation, permission table --> <!-- ========== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']"> + <xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']"> <fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt" role="SKIP"> <xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']"> <xsl:attribute name="margin-bottom">0pt</xsl:attribute> </xsl:if> <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP"> @@ -9189,23 +9361,23 @@ </xsl:if> </fo:block-container> </fo:block-container> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='thead']" mode="requirement"> + <xsl:template match="*[local-name()='thead']" mode="requirement"> <fo:table-header> <xsl:apply-templates mode="requirement"/> </fo:table-header> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='tbody']" mode="requirement"> + <xsl:template match="*[local-name()='tbody']" mode="requirement"> <fo:table-body> <xsl:apply-templates mode="requirement"/> </fo:table-body> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='tr']" mode="requirement"> + <xsl:template match="*[local-name()='tr']" mode="requirement"> <fo:table-row height="7mm" border-bottom="0.5pt solid grey"> <xsl:if test="parent::*[local-name()='thead'] or starts-with(*[local-name()='td' or local-name()='th'][1], 'Requirement ') or starts-with(*[local-name()='td' or local-name()='th'][1], 'Recommendation ')"> <xsl:attribute name="font-weight">bold</xsl:attribute> @@ -9213,11 +9385,11 @@ <xsl:apply-templates mode="requirement"/> </fo:table-row> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='th']" mode="requirement"> + <xsl:template match="*[local-name()='th']" mode="requirement"> <fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" --> <xsl:call-template name="setTextAlignment"> <xsl:with-param name="default">left</xsl:with-param> </xsl:call-template> @@ -9227,11 +9399,11 @@ <xsl:apply-templates/> </fo:block> </fo:table-cell> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='td']" mode="requirement"> + <xsl:template match="*[local-name()='td']" mode="requirement"> <fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" --> <xsl:if test="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']"> <xsl:attribute name="padding">0mm</xsl:attribute> <xsl:attribute name="padding-left">0mm</xsl:attribute> </xsl:if> @@ -9249,18 +9421,18 @@ <xsl:apply-templates/> </fo:block> </fo:table-cell> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2"> + <xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2"> <fo:block font-size="11pt"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]"> + <xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]"> <fo:block> <xsl:apply-templates/> </fo:block> </xsl:template> <!-- ========== --> @@ -9268,30 +9440,30 @@ <!-- ========== --> <!-- ====== --> <!-- termexample --> <!-- ====== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'termexample']"> + <xsl:template match="*[local-name() = 'termexample']"> <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style"> <xsl:call-template name="refine_termexample-style"/> <xsl:call-template name="setBlockSpanAll"/> <xsl:apply-templates select="*[local-name()='name']"/> <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'termexample']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']"> <xsl:if test="normalize-space() != ''"> <fo:inline xsl:use-attribute-sets="termexample-name-style"> <xsl:call-template name="refine_termexample-name-style"/> <xsl:apply-templates/> </fo:inline> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'termexample']/*[local-name() = 'p']"> + <xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']"> <xsl:variable name="element">inline </xsl:variable> <xsl:choose> @@ -9321,11 +9493,11 @@ text line 2 4. EXAMPLE text line 1 text line 2 --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'example']"> + <xsl:template match="*[local-name() = 'example']"> <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP"> <xsl:call-template name="setBlockSpanAll"/> @@ -9349,13 +9521,21 @@ </xsl:apply-templates> </fo:block> <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP"> <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP"> - <xsl:apply-templates select="node()[not(local-name() = 'name')]"> - <xsl:with-param name="fo_element" select="$fo_element"/> - </xsl:apply-templates> + <xsl:variable name="example_body"> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"> + <xsl:with-param name="fo_element" select="$fo_element"/> + </xsl:apply-templates> + </xsl:variable> + <xsl:choose> + <xsl:when test="xalan:nodeset($example_body)/*"> + <xsl:copy-of select="$example_body"/> + </xsl:when> + <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise> + </xsl:choose> </fo:block-container> </fo:block-container> </xsl:when> <!-- end block --> <xsl:when test="contains(normalize-space($fo_element), 'list')"> @@ -9416,11 +9596,11 @@ </xsl:choose> </fo:block-container> </fo:block-container> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'example']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']"> <xsl:param name="fo_element">block</xsl:param> <xsl:choose> <xsl:when test="ancestor::*[local-name() = 'appendix']"> <fo:inline> @@ -9440,17 +9620,17 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']"> <fo:inline xsl:use-attribute-sets="example-name-style"> <xsl:apply-templates/> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'example']/*[local-name() = 'p']"> + <xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']"> <xsl:param name="fo_element">block</xsl:param> <xsl:variable name="num"><xsl:number/></xsl:variable> <xsl:variable name="element"> @@ -9490,11 +9670,11 @@ <!-- ====== --> <!-- termsource --> <!-- origin --> <!-- modification --> <!-- ====== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'termsource']" name="termsource"> + <xsl:template match="*[local-name() = 'termsource']" name="termsource"> <fo:block xsl:use-attribute-sets="termsource-style"> <xsl:call-template name="refine_termsource-style"/> <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] --> @@ -9529,28 +9709,28 @@ </xsl:otherwise> </xsl:choose> --> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ') or starts-with(., '[SOURCE: Quoted from: ') or starts-with(., '[SOURCE: Modified from: ')]" priority="2"> + <xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ') or starts-with(., '[SOURCE: Quoted from: ') or starts-with(., '[SOURCE: Modified from: ')]" priority="2"> <xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'termsource']/text()"> + <xsl:template match="*[local-name() = 'termsource']/text()"> <xsl:if test="normalize-space() != ''"> <xsl:value-of select="."/> </xsl:if> </xsl:template> <!-- text SOURCE: --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'termsource']/*[local-name() = 'strong'][1][following-sibling::*[1][local-name() = 'origin']]/text()"> + <xsl:template match="*[local-name() = 'termsource']/*[local-name() = 'strong'][1][following-sibling::*[1][local-name() = 'origin']]/text()"> <fo:inline xsl:use-attribute-sets="termsource-text-style"> <xsl:value-of select="."/> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'origin']"> + <xsl:template match="*[local-name() = 'origin']"> <xsl:call-template name="insert_basic_link"> <xsl:with-param name="element"> <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}"> <xsl:if test="normalize-space(@citeas) = ''"> <xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute> @@ -9562,11 +9742,11 @@ </xsl:with-param> </xsl:call-template> </xsl:template> <!-- not using, see https://github.com/glossarist/iev-document/issues/23 --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'modification']"> + <xsl:template match="*[local-name() = 'modification']"> <xsl:variable name="title-modified"> <xsl:call-template name="getLocalizedString"> <xsl:with-param name="key">modified</xsl:with-param> </xsl:call-template> </xsl:variable> @@ -9577,15 +9757,15 @@ <xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text> — </xsl:text></xsl:if></xsl:otherwise> </xsl:choose> <xsl:apply-templates/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'modification']/*[local-name() = 'p']"> + <xsl:template match="*[local-name() = 'modification']/*[local-name() = 'p']"> <fo:inline><xsl:apply-templates/></fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'modification']/text()"> + <xsl:template match="*[local-name() = 'modification']/text()"> <xsl:if test="normalize-space() != ''"> <!-- <xsl:value-of select="."/> --> <xsl:call-template name="text"/> </xsl:if> </xsl:template> @@ -9596,11 +9776,11 @@ <!-- ====== --> <!-- qoute --> <!-- source --> <!-- author --> <!-- ====== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'quote']"> + <xsl:template match="*[local-name() = 'quote']"> <fo:block-container margin-left="0mm" role="SKIP"> <xsl:call-template name="setBlockSpanAll"/> <xsl:if test="parent::*[local-name() = 'note']"> @@ -9630,11 +9810,11 @@ </fo:block-container> </fo:block-container> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'source']"> + <xsl:template match="*[local-name() = 'source']"> <xsl:if test="../*[local-name() = 'author']"> <xsl:text>, </xsl:text> </xsl:if> <xsl:call-template name="insert_basic_link"> <xsl:with-param name="element"> @@ -9643,38 +9823,38 @@ </fo:basic-link> </xsl:with-param> </xsl:call-template> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'author']"> + <xsl:template match="*[local-name() = 'author']"> <xsl:text>— </xsl:text> <xsl:apply-templates/> </xsl:template> <!-- ====== --> <!-- ====== --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitems_"> + <xsl:variable name="bibitems_"> <xsl:for-each select="//*[local-name() = 'bibitem']"> <xsl:copy-of select="."/> </xsl:for-each> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitems" select="xalan:nodeset($bibitems_)"/> + <xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/> <!-- get all hidden bibitems to exclude them from eref/origin processing --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitems_hidden_"> + <xsl:variable name="bibitems_hidden_"> <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']"> <xsl:copy-of select="."/> </xsl:for-each> <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']"> <xsl:copy-of select="."/> </xsl:for-each> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/> + <xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/> <!-- ====== --> <!-- eref --> <!-- ====== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'eref']" name="eref"> + <xsl:template match="*[local-name() = 'eref']" name="eref"> <xsl:variable name="current_bibitemid" select="@bibitemid"/> <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> --> <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/> <xsl:choose> <!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) --> @@ -9731,11 +9911,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_basic_link_style"> + <xsl:template name="refine_basic_link_style"> <xsl:attribute name="color">blue</xsl:attribute> <xsl:attribute name="text-decoration">underline</xsl:attribute> </xsl:template> <!-- refine_basic_link_style --> @@ -9743,11 +9923,11 @@ <!-- ====== --> <!-- END eref --> <!-- ====== --> <!-- Tabulation processing --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'tab']"> + <xsl:template match="*[local-name() = 'tab']"> <!-- zero-space char --> <xsl:variable name="depth"> <xsl:call-template name="getLevel"> <xsl:with-param name="depth" select="../@depth"/> </xsl:call-template> @@ -9789,22 +9969,22 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- tab --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertNonBreakSpaces"> + <xsl:template name="insertNonBreakSpaces"> <xsl:param name="count"/> <xsl:if test="$count &gt; 0"> <xsl:text> </xsl:text> <xsl:call-template name="insertNonBreakSpaces"> <xsl:with-param name="count" select="$count - 1"/> </xsl:call-template> </xsl:if> </xsl:template> <!-- Preferred, admitted, deprecated --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'preferred']"> + <xsl:template match="*[local-name() = 'preferred']"> <xsl:variable name="level"> <xsl:call-template name="getLevel"/> </xsl:variable> <xsl:variable name="font-size"> inherit @@ -9825,62 +10005,62 @@ <xsl:apply-templates/> </fo:block> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'domain']"> + <xsl:template match="*[local-name() = 'domain']"> <fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline> <xsl:text> </xsl:text> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'admitted']"> + <xsl:template match="*[local-name() = 'admitted']"> <fo:block xsl:use-attribute-sets="admitted-style"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'deprecates']"> + <xsl:template match="*[local-name() = 'deprecates']"> <fo:block xsl:use-attribute-sets="deprecates-style"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setStyle_preferred"> + <xsl:template name="setStyle_preferred"> <xsl:if test="*[local-name() = 'strong']"> <xsl:attribute name="font-weight">normal</xsl:attribute> </xsl:if> </xsl:template> <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. --> <!-- in metanorma xml preferred terms delimited by semicolons --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'preferred']/text()[contains(., ';')] | *[local-name() = 'preferred']/*[local-name() = 'strong']/text()[contains(., ';')]"> + <xsl:template match="*[local-name() = 'preferred']/text()[contains(., ';')] | *[local-name() = 'preferred']/*[local-name() = 'strong']/text()[contains(., ';')]"> <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), ';', $linebreak)"/> </xsl:template> <!-- End Preferred, admitted, deprecated --> <!-- ========== --> <!-- definition --> <!-- ========== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'definition']"> + <xsl:template match="*[local-name() = 'definition']"> <fo:block xsl:use-attribute-sets="definition-style" role="SKIP"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]"> + <xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]"> <xsl:apply-templates/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]"> + <xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]"> <fo:inline> <xsl:apply-templates/></fo:inline> <fo:block/> </xsl:template> <!-- ========== --> <!-- END definition --> <!-- ========== --> <!-- main sections --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2"> + <xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2"> <fo:block> <xsl:call-template name="setId"/> <xsl:call-template name="sections_element_style"/> @@ -9889,33 +10069,64 @@ </fo:block> </xsl:template> <!-- note: @top-level added in mode=" update_xml_step_move_pagebreak" --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sections']/*[local-name() = 'page_sequence']/*[not(@top-level)]" priority="2"> - <xsl:call-template name="sections_node"/> + <xsl:template match="*[local-name() = 'sections']/*[local-name() = 'page_sequence']/*[not(@top-level)]" priority="2"> + <xsl:choose> + <xsl:when test="local-name() = 'clause' and normalize-space() = '' and count(*) = 0"/> + <xsl:otherwise> + <xsl:call-template name="sections_node"/> + </xsl:otherwise> + </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="sections_element_style"> + <!-- page_sequence/sections/clause --> + <xsl:template match="*[local-name() = 'page_sequence']/*[local-name() = 'sections']/*[not(@top-level)]" priority="2"> + <xsl:choose> + <xsl:when test="local-name() = 'clause' and normalize-space() = '' and count(*) = 0"/> + <xsl:otherwise> + <xsl:call-template name="sections_node"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + <xsl:template name="sections_element_style"> + </xsl:template> <!-- sections_element_style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2" name="preface_node"> <!-- /*/*[local-name() = 'preface']/* --> + <xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2" name="preface_node"> <!-- /*/*[local-name() = 'preface']/* --> <fo:block break-after="page"/> <fo:block> <xsl:call-template name="setId"/> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'preface']/*[local-name() = 'page_sequence']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* --> - <xsl:call-template name="preface_node"/> + <!-- preface/ page_sequence/clause --> + <xsl:template match="*[local-name() = 'preface']/*[local-name() = 'page_sequence']/*[not(@top-level)]" priority="2"> <!-- /*/*[local-name() = 'preface']/* --> + <xsl:choose> + <xsl:when test="local-name() = 'clause' and normalize-space() = '' and count(*) = 0"/> + <xsl:otherwise> + <xsl:call-template name="preface_node"/> + </xsl:otherwise> + </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'clause'][normalize-space() != '' or *[local-name() = 'figure'] or @id]" name="template_clause"> <!-- if clause isn't empty --> + <!-- page_sequence/preface/clause --> + <xsl:template match="*[local-name() = 'page_sequence']/*[local-name() = 'preface']/*[not(@top-level)]" priority="2"> <!-- /*/*[local-name() = 'preface']/* --> + <xsl:choose> + <xsl:when test="local-name() = 'clause' and normalize-space() = '' and count(*) = 0"/> + <xsl:otherwise> + <xsl:call-template name="preface_node"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template match="*[local-name() = 'clause'][normalize-space() != '' or *[local-name() = 'figure'] or @id]" name="template_clause"> <!-- if clause isn't empty --> <fo:block> <xsl:if test="parent::*[local-name() = 'copyright-statement']"> <xsl:attribute name="role">SKIP</xsl:attribute> </xsl:if> @@ -9927,21 +10138,21 @@ <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_clause_style"> + <xsl:template name="refine_clause_style"> </xsl:template> <!-- refine_clause_style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'definitions']"> + <xsl:template match="*[local-name() = 'definitions']"> <fo:block id="{@id}"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'annex'][normalize-space() != '']"> + <xsl:template match="*[local-name() = 'annex'][normalize-space() != '']"> <xsl:choose> <xsl:when test="@continue = 'true'"> <!-- it's using for figure/table on top level for block span --> <fo:block> <xsl:apply-templates/> </fo:block> @@ -9964,15 +10175,15 @@ </fo:block> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_annex_style"> + <xsl:template name="refine_annex_style"> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'review']"> <!-- 'review' will be processed in mn2pdf/review.xsl --> + <xsl:template match="*[local-name() = 'review']"> <!-- 'review' will be processed in mn2pdf/review.xsl --> <!-- comment 2019-11-29 --> <!-- <fo:block font-weight="bold">Review:</fo:block> <xsl:apply-templates /> --> <xsl:variable name="id_from" select="normalize-space(current()/@from)"/> @@ -9992,31 +10203,31 @@ </xsl:choose> </xsl:template> <!-- https://github.com/metanorma/mn-samples-bsi/issues/312 --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'review'][@type = 'other']"/> + <xsl:template match="*[local-name() = 'review'][@type = 'other']"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'name']/text()"> + <xsl:template match="*[local-name() = 'name']/text()"> <!-- 0xA0 to space replacement --> <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/> </xsl:template> <!-- ===================================== --> <!-- Lists processing --> <!-- ===================================== --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="ul_labels_"> + <xsl:variable name="ul_labels_"> <!-- <label>&#x2014;</label> --> <!-- em dash --> <label level="1" font-size="150%" line-height="80%">•</label> <label level="2">—</label><!-- em dash --> <label level="3" font-size="75%">o</label> <!-- white circle --> </xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="ul_labels" select="xalan:nodeset($ul_labels_)"/> + <xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setULLabel"> + <xsl:template name="setULLabel"> <xsl:variable name="list_level__"> <xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/> </xsl:variable> <xsl:variable name="list_level_" select="number($list_level__)"/> <xsl:variable name="list_level"> @@ -10038,16 +10249,16 @@ <xsl:otherwise> <xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="label" mode="ul_labels"> + <xsl:template match="label" mode="ul_labels"> <xsl:copy-of select="@*[not(local-name() = 'level')]"/> <xsl:value-of select="."/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getListItemFormat"> + <xsl:template name="getListItemFormat"> <!-- Example: for BSI <?list-type loweralpha?> --> <xsl:variable name="processing_instruction_type" select="normalize-space(../preceding-sibling::*[1]/processing-instruction('list-type'))"/> <xsl:choose> <xsl:when test="local-name(..) = 'ul'"> <xsl:choose> @@ -10174,11 +10385,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'ul'] | *[local-name() = 'ol']"> + <xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']"> <xsl:param name="indent">0</xsl:param> <xsl:choose> <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']"> <fo:block-container role="SKIP"> <xsl:attribute name="margin-left"> @@ -10209,15 +10420,15 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_list_container_style"> + <xsl:template name="refine_list_container_style"> </xsl:template> <!-- refine_list_container_style --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list"> + <xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list"> <xsl:apply-templates select="*[local-name() = 'name']"> <xsl:with-param name="process">true</xsl:with-param> </xsl:apply-templates> @@ -10273,24 +10484,24 @@ <xsl:call-template name="note"/> </xsl:for-each> --> <xsl:apply-templates select="./*[local-name() = 'note']"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="refine_list-style_provisional-distance-between-starts"> + <xsl:template name="refine_list-style_provisional-distance-between-starts"> </xsl:template> <!-- refine_list-style_provisional-distance-between-starts --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']"> <xsl:param name="process">false</xsl:param> <xsl:if test="$process = 'true'"> <fo:block xsl:use-attribute-sets="list-name-style"> <xsl:apply-templates/> </fo:block> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name()='li']"> + <xsl:template match="*[local-name()='li']"> <xsl:param name="indent">0</xsl:param> <!-- <fo:list-item xsl:use-attribute-sets="list-item-style"> <fo:list-item-label end-indent="label-end()"><fo:block>x</fo:block></fo:list-item-label> <fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style"> <fo:block>debug li indent=<xsl:value-of select="$indent"/></fo:block> @@ -10340,28 +10551,28 @@ <!-- =================== --> <!-- Index section processing --> <!-- =================== --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="index" select="document($external_index)"/> + <xsl:variable name="index" select="document($external_index)"/> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="bookmark_in_fn"> + <xsl:variable name="bookmark_in_fn"> <xsl:for-each select="//*[local-name() = 'bookmark'][ancestor::*[local-name() = 'fn']]"> <bookmark><xsl:value-of select="@id"/></bookmark> </xsl:for-each> </xsl:variable> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="index_add_id"> + <xsl:template match="@*|node()" mode="index_add_id"> <xsl:param name="docid"/> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="index_add_id"> <xsl:with-param name="docid" select="$docid"/> </xsl:apply-templates> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'xref']" mode="index_add_id"> + <xsl:template match="*[local-name() = 'xref']" mode="index_add_id"> <xsl:param name="docid"/> <xsl:variable name="id"> <xsl:call-template name="generateIndexXrefId"> <xsl:with-param name="docid" select="$docid"/> </xsl:call-template> @@ -10390,24 +10601,24 @@ </xsl:apply-templates> </xsl:copy> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="index_update"> + <xsl:template match="@*|node()" mode="index_update"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="index_update"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'indexsect']//*[local-name() = 'li']" mode="index_update"> + <xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" mode="index_update"> <xsl:copy> <xsl:apply-templates select="@*" mode="index_update"/> <xsl:apply-templates select="node()[1]" mode="process_li_element"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'indexsect']//*[local-name() = 'li']/node()" mode="process_li_element" priority="2"> + <xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/node()" mode="process_li_element" priority="2"> <xsl:param name="element"/> <xsl:param name="remove" select="'false'"/> <xsl:param name="target"/> <!-- <node></node> --> <xsl:choose> @@ -10496,22 +10707,22 @@ <xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="xref_copy"> + <xsl:template match="@*|node()" mode="xref_copy"> <xsl:param name="target"/> <xsl:copy> <xsl:apply-templates select="@*" mode="xref_copy"/> <xsl:if test="$target != '' and not(xalan:nodeset($bookmark_in_fn)//bookmark[. = $target])"> <xsl:attribute name="target"><xsl:value-of select="$target"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="node()" mode="xref_copy"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="generateIndexXrefId"> + <xsl:template name="generateIndexXrefId"> <xsl:param name="docid"/> <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/> <xsl:variable name="docid_curr"> @@ -10524,53 +10735,53 @@ </xsl:variable> <xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable> <xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', --> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4"> + <xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4"> <fo:block xsl:use-attribute-sets="indexsect-title-style"> <!-- Index --> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'indexsect']/*[local-name() = 'clause']/*[local-name() = 'title']" priority="4"> + <xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']/*[local-name() = 'title']" priority="4"> <!-- Letter A, B, C, ... --> <fo:block xsl:use-attribute-sets="indexsect-clause-title-style"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'indexsect']/*[local-name() = 'clause']" priority="4"> + <xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']" priority="4"> <xsl:apply-templates/> <fo:block> <xsl:if test="following-sibling::*[local-name() = 'clause']"> <fo:block> </fo:block> </xsl:if> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'indexsect']//*[local-name() = 'ul']" priority="4"> + <xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'ul']" priority="4"> <xsl:apply-templates/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4"> + <xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4"> <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/> <fo:block start-indent="{5 * $level}mm" text-indent="-5mm"> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()"> + <xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()"> <!-- to split by '_' and other chars --> <xsl:call-template name="add-zero-spaces-java"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/> + <xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'bookmark']" name="bookmark"> + <xsl:template match="*[local-name() = 'bookmark']" name="bookmark"> <!-- <fo:inline id="{@id}" font-size="1pt"/> --> <fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline> <!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml --> <xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if> </xsl:template> @@ -10579,11 +10790,11 @@ <!-- =================== --> <!-- ============ --> <!-- errata --> <!-- ============ --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'errata']"> + <xsl:template match="*[local-name() = 'errata']"> <!-- <row> <date>05-07-2013</date> <type>Editorial</type> <change>Changed CA-9 Priority Code from P1 to P2 in <xref target="tabled2"/>.</change> <pages>D-3</pages> @@ -10605,17 +10816,17 @@ <xsl:apply-templates/> </fo:table-body> </fo:table> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'errata']/*[local-name() = 'row']"> + <xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']"> <fo:table-row> <xsl:apply-templates/> </fo:table-row> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'errata']/*[local-name() = 'row']/*"> + <xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']/*"> <fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm"> <fo:block role="SKIP"><xsl:apply-templates/></fo:block> </fo:table-cell> </xsl:template> <!-- ============ --> @@ -10627,29 +10838,29 @@ <!-- ======================= --> <!-- ========================================================== --> <!-- Reference sections (Normative References and Bibliography) --> <!-- ========================================================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'references'][@hidden='true']" priority="3"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"> + <xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/> + <xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"> <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> </xsl:template> <!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/> + <xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/> <!-- Normative references --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'references'][@normative='true']" priority="2"> + <xsl:template match="*[local-name() = 'references'][@normative='true']" priority="2"> <fo:block id="{@id}"> <xsl:apply-templates/> </fo:block> </xsl:template> <!-- Bibliography (non-normative references) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'references']"> + <xsl:template match="*[local-name() = 'references']"> <xsl:if test="not(ancestor::*[local-name() = 'annex'])"> </xsl:if> <!-- <xsl:if test="ancestor::*[local-name() = 'annex']"> @@ -10667,16 +10878,16 @@ </fo:block> </xsl:template> <!-- references --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'bibitem']"> + <xsl:template match="*[local-name() = 'bibitem']"> <xsl:call-template name="bibitem"/> </xsl:template> <!-- Normative references --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2"> + <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2"> <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-normative-list-style"> <xsl:variable name="docidentifier"> <xsl:apply-templates select="*[local-name() = 'biblio-tag']"> @@ -10712,18 +10923,18 @@ </fo:list-block> </xsl:template> <!-- bibitem --> <!-- Bibliography (non-normative references) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2"> + <xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2"> <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first --> <xsl:call-template name="bibitem"/> </xsl:template> <!-- references[not(@normative='true')]/bibitem --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertListItem_Bibitem"> + <xsl:template name="insertListItem_Bibitem"> <xsl:choose> <xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when> <xsl:otherwise> <fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style"> @@ -10749,11 +10960,11 @@ <xsl:apply-templates select="following-sibling::*[1][local-name() = 'bibitem']"> <xsl:with-param name="skip">false</xsl:with-param> </xsl:apply-templates> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="processBibitem"> + <xsl:template name="processBibitem"> <xsl:param name="biblio_tag_part">both</xsl:param> <!-- start bibitem processing --> <xsl:if test=".//*[local-name() = 'fn']"> <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute> @@ -10765,24 +10976,24 @@ <xsl:apply-templates select="*[local-name() = 'formattedref']"/> <!-- end bibitem processing --> </xsl:template> <!-- processBibitem (bibitem) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'title']" mode="title"> + <xsl:template match="*[local-name() = 'title']" mode="title"> <fo:inline><xsl:apply-templates/></fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'bibitem']/*[local-name() = 'docidentifier']"/> + <xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'docidentifier']"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'formattedref']"> + <xsl:template match="*[local-name() = 'formattedref']"> <!-- <xsl:if test="$namespace = 'unece' or $namespace = 'unece-rec'"> <xsl:text>, </xsl:text> </xsl:if> --> <xsl:apply-templates/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'biblio-tag']"> + <xsl:template match="*[local-name() = 'biblio-tag']"> <xsl:param name="biblio_tag_part">both</xsl:param> <xsl:choose> <xsl:when test="$biblio_tag_part = 'first' and *[local-name() = 'tab']"> <xsl:apply-templates select="./*[local-name() = 'tab'][1]/preceding-sibling::node()"/> </xsl:when> @@ -10793,11 +11004,11 @@ <xsl:apply-templates/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'biblio-tag']/*[local-name() = 'tab']" priority="2"> + <xsl:template match="*[local-name() = 'biblio-tag']/*[local-name() = 'tab']" priority="2"> <xsl:text> </xsl:text> </xsl:template> <!-- ======================= --> <!-- END Bibliography rendering --> @@ -10808,27 +11019,27 @@ <!-- ========================================================== --> <!-- =================== --> <!-- Form's elements processing --> <!-- =================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'form']"> + <xsl:template match="*[local-name() = 'form']"> <fo:block> <xsl:apply-templates/> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'form']//*[local-name() = 'label']"> + <xsl:template match="*[local-name() = 'form']//*[local-name() = 'label']"> <fo:inline><xsl:apply-templates/></fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'text' or @type = 'date' or @type = 'file' or @type = 'password']"> + <xsl:template match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'text' or @type = 'date' or @type = 'file' or @type = 'password']"> <fo:inline> <xsl:call-template name="text_input"/> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="text_input"> + <xsl:template name="text_input"> <xsl:variable name="count"> <xsl:choose> <xsl:when test="normalize-space(@maxlength) != ''"><xsl:value-of select="@maxlength"/></xsl:when> <xsl:when test="normalize-space(@size) != ''"><xsl:value-of select="@size"/></xsl:when> <xsl:otherwise>10</xsl:otherwise> @@ -10839,21 +11050,21 @@ <xsl:with-param name="count" select="$count"/> </xsl:call-template> <xsl:text> </xsl:text> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'button']"> + <xsl:template match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'button']"> <xsl:variable name="caption"> <xsl:choose> <xsl:when test="normalize-space(@value) != ''"><xsl:value-of select="@value"/></xsl:when> <xsl:otherwise>BUTTON</xsl:otherwise> </xsl:choose> </xsl:variable> <fo:inline>[<xsl:value-of select="$caption"/>]</fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'checkbox']"> + <xsl:template match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'checkbox']"> <fo:inline padding-right="1mm"> <fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%"> <xsl:attribute name="height">3.5mm</xsl:attribute> <xsl:attribute name="content-width">100%</xsl:attribute> <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute> @@ -10863,11 +11074,11 @@ </svg> </fo:instream-foreign-object> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'radio']"> + <xsl:template match="*[local-name() = 'form']//*[local-name() = 'input'][@type = 'radio']"> <fo:inline padding-right="1mm"> <fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%"> <xsl:attribute name="height">3.5mm</xsl:attribute> <xsl:attribute name="content-width">100%</xsl:attribute> <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute> @@ -10878,17 +11089,17 @@ </svg> </fo:instream-foreign-object> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'form']//*[local-name() = 'select']"> + <xsl:template match="*[local-name() = 'form']//*[local-name() = 'select']"> <fo:inline> <xsl:call-template name="text_input"/> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'form']//*[local-name() = 'textarea']"> + <xsl:template match="*[local-name() = 'form']//*[local-name() = 'textarea']"> <fo:block-container border="1pt solid black" width="50%"> <fo:block> </fo:block> </fo:block-container> </xsl:template> @@ -10898,11 +11109,11 @@ <!-- =================== --> <!-- Table of Contents (ToC) processing --> <!-- =================== --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="toc_level"> + <xsl:variable name="toc_level"> <!-- https://www.metanorma.org/author/ref/document-attributes/ --> <xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:--> <xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render --> <xsl:choose> <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml --> @@ -10911,11 +11122,11 @@ 2 </xsl:otherwise> </xsl:choose> </xsl:variable> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'toc']"> + <xsl:template match="*[local-name() = 'toc']"> <xsl:param name="colwidths"/> <xsl:variable name="colwidths_"> <xsl:choose> <xsl:when test="not($colwidths)"> <xsl:variable name="toc_table_simple"> @@ -10944,21 +11155,21 @@ </fo:table-body> </fo:table> </fo:block> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'toc']//*[local-name() = 'li']" priority="2"> + <xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']" priority="2"> <fo:table-row min-height="5mm"> <xsl:apply-templates/> </fo:table-row> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'toc']//*[local-name() = 'li']/*[local-name() = 'p']"> + <xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']/*[local-name() = 'p']"> <xsl:apply-templates/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'toc']//*[local-name() = 'xref']" priority="3"> + <xsl:template match="*[local-name() = 'toc']//*[local-name() = 'xref']" priority="3"> <!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> --> <xsl:variable name="target" select="@target"/> <xsl:for-each select="*[local-name() = 'tab']"> <xsl:variable name="current_id" select="generate-id()"/> <fo:table-cell> @@ -10993,24 +11204,24 @@ </xsl:template> <!-- ================================== --> <!-- calculate ToC table columns widths --> <!-- ================================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*" mode="toc_table_width"> + <xsl:template match="*" mode="toc_table_width"> <xsl:apply-templates mode="toc_table_width"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'clause'][@type = 'toc']/*[local-name() = 'title']" mode="toc_table_width"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'clause'][not(@type = 'toc')]/*[local-name() = 'title']" mode="toc_table_width"/> + <xsl:template match="*[local-name() = 'clause'][@type = 'toc']/*[local-name() = 'title']" mode="toc_table_width"/> + <xsl:template match="*[local-name() = 'clause'][not(@type = 'toc')]/*[local-name() = 'title']" mode="toc_table_width"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'li']" mode="toc_table_width"> + <xsl:template match="*[local-name() = 'li']" mode="toc_table_width"> <tr> <xsl:apply-templates mode="toc_table_width"/> </tr> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'xref']" mode="toc_table_width"> + <xsl:template match="*[local-name() = 'xref']" mode="toc_table_width"> <!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> --> <xsl:for-each select="*[local-name() = 'tab']"> <xsl:variable name="current_id" select="generate-id()"/> <td> <xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]"> @@ -11028,11 +11239,11 @@ <!-- =================== --> <!-- End Table of Contents (ToC) processing --> <!-- =================== --> <!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insert_basic_link"> + <xsl:template name="insert_basic_link"> <xsl:param name="element"/> <xsl:variable name="element_node" select="xalan:nodeset($element)"/> <xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/> <xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/> <xsl:choose> @@ -11048,38 +11259,38 @@ </fo:inline> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'variant-title']"/> <!-- [@type = 'sub'] --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"> + <xsl:template match="*[local-name() = 'variant-title']"/> <!-- [@type = 'sub'] --> + <xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"> <fo:inline padding-right="5mm"> </fo:inline> <fo:inline><xsl:apply-templates/></fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'blacksquare']" name="blacksquare"> + <xsl:template match="*[local-name() = 'blacksquare']" name="blacksquare"> <fo:inline padding-right="2.5mm" baseline-shift="5%"> <fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad"> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 2 2"> <rect x="0" y="0" width="2" height="2" fill="black"/> </svg> </fo:instream-foreign-object> </fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@language"> + <xsl:template match="@language"> <xsl:copy-of select="."/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="4"> + <xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="4"> <xsl:call-template name="title"/> </xsl:template> <!-- ================ --> <!-- Admonition --> <!-- ================ --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'admonition']"> + <xsl:template match="*[local-name() = 'admonition']"> <!-- text in the box --> <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style"> <xsl:call-template name="setBlockSpanAll"/> @@ -11097,11 +11308,11 @@ </fo:block-container> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="displayAdmonitionName"> + <xsl:template name="displayAdmonitionName"> <xsl:param name="sep"/> <!-- Example: ' - ' --> <!-- <xsl:choose> <xsl:when test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'"> <xsl:choose> <xsl:when test="@type='important'"><xsl:apply-templates select="@type"/></xsl:when> @@ -11124,11 +11335,11 @@ <xsl:if test="normalize-space($name) != ''"> <xsl:value-of select="$sep"/> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'admonition']/*[local-name() = 'name']"> + <xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']"> <xsl:apply-templates/> </xsl:template> <!-- <xsl:template match="*[local-name() = 'admonition']/@type"> <xsl:variable name="admonition_type_"> @@ -11141,11 +11352,11 @@ <xsl:if test="$admonition_type = ''"> <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/> </xsl:if> </xsl:template> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'admonition']/*[local-name() = 'p']"> + <xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']"> <!-- processing for admonition/p found in the template for 'p' --> <xsl:call-template name="paragraph"/> </xsl:template> @@ -11155,11 +11366,11 @@ <!-- ===================================== --> <!-- Update xml --> <!-- ===================================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="updateXML"> + <xsl:template name="updateXML"> <xsl:if test="$debug = 'true'"><xsl:message>START updated_xml_step1</xsl:message></xsl:if> <xsl:variable name="startTime1" select="java:getTime(java:java.util.Date.new())"/> <!-- STEP1: Re-order elements in 'preface', 'sections' based on @displayorder --> <xsl:variable name="updated_xml_step1"> @@ -11219,11 +11430,18 @@ <!-- <redirect:write file="updated_xml_step3_{java:getTime(java:java.util.Date.new())}.xml"> <xsl:copy-of select="$updated_xml_step3"/> </redirect:write> --> </xsl:if> + <!-- <xsl:if test="$debug = 'true'"><xsl:message>START copying updated_xml_step3</xsl:message></xsl:if> + <xsl:variable name="startTime4" select="java:getTime(java:java.util.Date.new())"/> --> <xsl:copy-of select="$updated_xml_step3"/> + <!-- <xsl:variable name="endTime4" select="java:getTime(java:java.util.Date.new())"/> + <xsl:if test="$debug = 'true'"> + <xsl:message>DEBUG: processing time <xsl:value-of select="$endTime4 - $startTime4"/> msec.</xsl:message> + <xsl:message>END copying updated_xml_step3</xsl:message> + </xsl:if> --> </xsl:template> <!-- =========================================================================== --> <!-- STEP1: --> @@ -11232,18 +11450,18 @@ <!-- - Ignore 'span' without style --> <!-- - Remove semantic xml part --> <!-- - Remove image/emf (EMF vector image for Word) --> <!-- - add @id, redundant for table auto-layout algorithm --> <!-- =========================================================================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="update_xml_step1"> + <xsl:template match="@*|node()" mode="update_xml_step1"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/> </xsl:copy> </xsl:template> <!-- change section's order based on @displayorder value --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'preface']" mode="update_xml_step1"> + <xsl:template match="*[local-name() = 'preface']" mode="update_xml_step1"> <xsl:copy> <xsl:copy-of select="@*"/> <xsl:variable name="nodes_preface_"> <xsl:for-each select="*"> @@ -11270,11 +11488,11 @@ </xsl:for-each> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sections']" mode="update_xml_step1"> + <xsl:template match="*[local-name() = 'sections']" mode="update_xml_step1"> <xsl:copy> <xsl:copy-of select="@*"/> <xsl:variable name="nodes_sections_"> <xsl:for-each select="*"> @@ -11302,11 +11520,11 @@ </xsl:for-each> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'bibliography']" mode="update_xml_step1"> + <xsl:template match="*[local-name() = 'bibliography']" mode="update_xml_step1"> <xsl:copy> <xsl:copy-of select="@*"/> <!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') --> <xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]"> <xsl:sort select="@displayorder" data-type="number"/> @@ -11314,61 +11532,61 @@ </xsl:for-each> </xsl:copy> </xsl:template> <!-- Example with 'class': <span class="stdpublisher">ISO</span> <span class="stddocNumber">10303</span>-<span class="stddocPartNumber">1</span>:<span class="stdyear">1994</span> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'span'][@style or @class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']" mode="update_xml_step1" priority="2"> + <xsl:template match="*[local-name() = 'span'][@style or @class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']" mode="update_xml_step1" priority="2"> <xsl:copy> <xsl:copy-of select="@*"/> <xsl:apply-templates mode="update_xml_step1"/> </xsl:copy> </xsl:template> <!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'span']" mode="update_xml_step1"> + <xsl:template match="*[local-name() = 'span']" mode="update_xml_step1"> <xsl:apply-templates mode="update_xml_step1"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2"> + <xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2"> <xsl:copy> <xsl:copy-of select="@*"/> <xsl:apply-templates mode="update_xml_step1"/> </xsl:copy> </xsl:template> <!-- remove semantic xml --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'metanorma-extension']/*[local-name() = 'metanorma']/*[local-name() = 'source']" mode="update_xml_step1"/> + <xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'metanorma']/*[local-name() = 'source']" mode="update_xml_step1"/> <!-- remove image/emf --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'image']/*[local-name() = 'emf']" mode="update_xml_step1"/> + <xsl:template match="*[local-name() = 'image']/*[local-name() = 'emf']" mode="update_xml_step1"/> <!-- remove preprocess-xslt --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'preprocess-xslt']" mode="update_xml_step1"/> + <xsl:template match="*[local-name() = 'preprocess-xslt']" mode="update_xml_step1"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'stem'] | *[local-name() = 'image'] | *[local-name() = 'sourcecode'] | *[local-name() = 'bibdata'] | *[local-name() = 'localized-strings']" mode="update_xml_step1"> + <xsl:template match="*[local-name() = 'stem'] | *[local-name() = 'image'] | *[local-name() = 'sourcecode'] | *[local-name() = 'bibdata'] | *[local-name() = 'localized-strings']" mode="update_xml_step1"> <xsl:copy-of select="."/> </xsl:template> <!-- add @id, mandatory for table auto-layout algorithm --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'dl' or local-name() = 'table'][not(@id)]" mode="update_xml_step1"> + <xsl:template match="*[local-name() = 'dl' or local-name() = 'table'][not(@id)]" mode="update_xml_step1"> <xsl:copy> <xsl:copy-of select="@*"/> <xsl:call-template name="add_id"/> <xsl:apply-templates mode="update_xml_step1"/> </xsl:copy> </xsl:template> <!-- prevent empty thead processing in XSL-FO, remove it --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'table']/*[local-name() = 'thead'][count(*) = 0]" mode="update_xml_step1"/> + <xsl:template match="*[local-name() = 'table']/*[local-name() = 'thead'][count(*) = 0]" mode="update_xml_step1"/> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="add_id"> + <xsl:template name="add_id"> <xsl:if test="not(@id)"> <!-- add @id - first element with @id plus '_element_name' --> <xsl:attribute name="id"><xsl:value-of select="(.//*[@id])[1]/@id"/>_<xsl:value-of select="local-name()"/></xsl:attribute> </xsl:if> </xsl:template> <!-- optimization: remove clause if table_only_with_id isn't empty and clause doesn't contain table or dl with table_only_with_id --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'clause' or local-name() = 'p' or local-name() = 'definitions' or local-name() = 'annex']" mode="update_xml_step1"> + <xsl:template match="*[local-name() = 'clause' or local-name() = 'p' or local-name() = 'definitions' or local-name() = 'annex']" mode="update_xml_step1"> <xsl:choose> <xsl:when test="($table_only_with_id != '' or $table_only_with_ids != '') and local-name() = 'p' and (ancestor::*[local-name() = 'table' or local-name() = 'dl' or local-name() = 'toc'])"> <xsl:copy> <xsl:copy-of select="@*"/> <xsl:apply-templates mode="update_xml_step1"/> @@ -11400,19 +11618,22 @@ <!-- =========================================================================== --> <!-- =========================================================================== --> <!-- STEP MOVE PAGEBREAK: move <pagebreak/> at top level under 'preface' and 'sections' --> <!-- =========================================================================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="update_xml_step_move_pagebreak"> + <xsl:template match="@*|node()" mode="update_xml_step_move_pagebreak"> + <xsl:param name="page_sequence_at_top">false</xsl:param> <xsl:copy> - <xsl:apply-templates select="@*|node()" mode="update_xml_step_move_pagebreak"/> + <xsl:apply-templates select="@*|node()" mode="update_xml_step_move_pagebreak"> + <xsl:with-param name="page_sequence_at_top" select="$page_sequence_at_top"/> + </xsl:apply-templates> </xsl:copy> </xsl:template> <!-- replace 'pagebreak' by closing tags + page_sequence and opening page_sequence + tags --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'pagebreak'][not(following-sibling::*[1][local-name() = 'pagebreak'])]" mode="update_xml_step_move_pagebreak"> - + <xsl:template match="*[local-name() = 'pagebreak'][not(following-sibling::*[1][local-name() = 'pagebreak'])]" mode="update_xml_step_move_pagebreak"> + <xsl:param name="page_sequence_at_top"/> <!-- <xsl:choose> <xsl:when test="ancestor::*[local-name() = 'sections']"> </xsl:when> <xsl:when test="ancestor::*[local-name() = 'annex']"> @@ -11432,11 +11653,13 @@ <xsl:if test="contains($isLast, 'false')"> <xsl:variable name="orientation" select="normalize-space(@orientation)"/> <xsl:variable name="tree_"> - <xsl:call-template name="makeAncestorsElementsTree"/> + <xsl:call-template name="makeAncestorsElementsTree"> + <xsl:with-param name="page_sequence_at_top" select="$page_sequence_at_top"/> + </xsl:call-template> </xsl:variable> <xsl:variable name="tree" select="xalan:nodeset($tree_)"/> <!-- close fo:page-sequence (closing preceding fo elements) --> <xsl:call-template name="insertClosingElements"> @@ -11453,20 +11676,34 @@ </xsl:call-template> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="makeAncestorsElementsTree"> - <xsl:for-each select="ancestor::*[ancestor::*[local-name() = 'preface'] or ancestor::*[local-name() = 'sections'] or ancestor-or-self::*[local-name() = 'annex']]"> - <element pos="{position()}"> - <xsl:copy-of select="@*[local-name() != 'id']"/> - <xsl:value-of select="name()"/> - </element> - </xsl:for-each> + <xsl:template name="makeAncestorsElementsTree"> + <xsl:param name="page_sequence_at_top"/> + + <xsl:choose> + <xsl:when test="$page_sequence_at_top = 'true'"> + <xsl:for-each select="ancestor::*[ancestor::*[contains(local-name(), '-standard')]]"> + <element pos="{position()}"> + <xsl:copy-of select="@*[local-name() != 'id']"/> + <xsl:value-of select="name()"/> + </element> + </xsl:for-each> + </xsl:when> + <xsl:otherwise> + <xsl:for-each select="ancestor::*[ancestor::*[local-name() = 'preface'] or ancestor::*[local-name() = 'sections'] or ancestor-or-self::*[local-name() = 'annex']]"> + <element pos="{position()}"> + <xsl:copy-of select="@*[local-name() != 'id']"/> + <xsl:value-of select="name()"/> + </element> + </xsl:for-each> + </xsl:otherwise> + </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertClosingElements"> + <xsl:template name="insertClosingElements"> <xsl:param name="tree"/> <xsl:for-each select="$tree//element"> <xsl:sort data-type="number" order="descending" select="@pos"/> <xsl:text disable-output-escaping="yes">&lt;/</xsl:text> <xsl:value-of select="."/> @@ -11475,11 +11712,11 @@ <xsl:message>&lt;/<xsl:value-of select="."/>&gt;</xsl:message> </xsl:if> </xsl:for-each> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertOpeningElements"> + <xsl:template name="insertOpeningElements"> <xsl:param name="tree"/> <xsl:for-each select="$tree//element"> <xsl:text disable-output-escaping="yes">&lt;</xsl:text> <xsl:value-of select="."/> <xsl:for-each select="@*[local-name() != 'pos']"> @@ -11496,16 +11733,19 @@ </xsl:if> </xsl:for-each> </xsl:template> <!-- move full page width figures, tables at top level --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'figure' or local-name() = 'table'][normalize-space(@width) != 'text-width']" mode="update_xml_step_move_pagebreak"> + <xsl:template match="*[local-name() = 'figure' or local-name() = 'table'][normalize-space(@width) != 'text-width']" mode="update_xml_step_move_pagebreak"> + <xsl:param name="page_sequence_at_top">false</xsl:param> <xsl:choose> <xsl:when test="$layout_columns != 1"> <xsl:variable name="tree_"> - <xsl:call-template name="makeAncestorsElementsTree"/> + <xsl:call-template name="makeAncestorsElementsTree"> + <xsl:with-param name="page_sequence_at_top" select="$page_sequence_at_top"/> + </xsl:call-template> </xsl:variable> <xsl:variable name="tree" select="xalan:nodeset($tree_)"/> <xsl:call-template name="insertClosingElements"> <xsl:with-param name="tree" select="$tree"/> @@ -11537,100 +11777,159 @@ <!-- XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line' --> <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b --> <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY --> <!-- =========================================================================== --> <!-- Example: <keep-together_within-line>ISO 10303-51</keep-together_within-line> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="update_xml_enclose_keep-together_within-line"> + <xsl:template match="@*|node()" mode="update_xml_enclose_keep-together_within-line"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="update_xml_enclose_keep-together_within-line"/> </xsl:copy> </xsl:template> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="express_reference_separators">_.\</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="express_reference_characters" select="concat($upper,$lower,'1234567890',$express_reference_separators)"/> + <xsl:variable name="express_reference_separators">_.\</xsl:variable> + <xsl:variable name="express_reference_characters" select="concat($upper,$lower,'1234567890',$express_reference_separators)"/> + <xsl:variable name="regex_express_reference">(^([A-Za-z0-9_.\\]+)$)</xsl:variable> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable> + <xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable> + <xsl:variable name="tag_keep-together_within-line_open">###<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable> + <xsl:variable name="tag_keep-together_within-line_close">###/<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'link'][not(contains(.,' '))] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'] or ancestor::*[local-name() = 'svg'] or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line"> + <!-- \S matches any non-whitespace character (equivalent to [^\r\n\t\f\v ]) --> + <!-- <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable> --> + <!-- add &lt; and &gt; to \S --> + <xsl:variable name="regex_S">[^\r\n\t\f\v \&lt;&gt;\u3000-\u9FFF]</xsl:variable> + <xsl:variable name="regex_solidus_units">((\b((<xsl:value-of select="$regex_S"/>{1,3}\/<xsl:value-of select="$regex_S"/>+)|(<xsl:value-of select="$regex_S"/>+\/<xsl:value-of select="$regex_S"/>{1,3}))\b)|(\/<xsl:value-of select="$regex_S"/>{1,3})\b)</xsl:variable> - <!-- enclose standard's number into tag 'keep-together_within-line' --> - <xsl:variable name="tag_keep-together_within-line_open">###<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable> - <xsl:variable name="tag_keep-together_within-line_close">###/<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable> - <xsl:variable name="text__" select="java:replaceAll(java:java.lang.String.new(.), $regex_standard_reference, concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/> - <xsl:variable name="text_"> - <xsl:choose> - <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells --> - <xsl:otherwise><xsl:value-of select="$text__"/></xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable name="text"><text><xsl:call-template name="replace_text_tags"> + <xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable> + <xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable> + + <xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'link'][not(contains(.,' '))] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'] or ancestor::*[local-name() = 'svg'] or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line"> + + <xsl:variable name="parent" select="local-name(..)"/> + + <xsl:if test="1 = 2"> <!-- alternative variant --> + + <xsl:variable name="regexs"> + <!-- enclose standard's number into tag 'keep-together_within-line' --> + <xsl:if test="not(ancestor::*[local-name() = 'table'])"><regex><xsl:value-of select="$regex_standard_reference"/></regex></xsl:if> + <!-- if EXPRESS reference --> + + <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b --> + <regex><xsl:value-of select="$regex_solidus_units"/></regex> + <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY --> + <xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']"> + <regex><xsl:value-of select="$regex_dots_units"/></regex> + </xsl:if> + </xsl:variable> + + <xsl:variable name="regex_replacement"><xsl:text>(</xsl:text> + <xsl:for-each select="xalan:nodeset($regexs)/regex"> + <xsl:value-of select="."/> + <xsl:if test="position() != last()">|</xsl:if> + </xsl:for-each> + <xsl:text>)</xsl:text> + </xsl:variable> + + <!-- regex_replacement='<xsl:value-of select="$regex_replacement"/>' --> + + <xsl:variable name="text_replaced" select="java:replaceAll(java:java.lang.String.new(.), $regex_replacement, concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/> + + <!-- text_replaced='<xsl:value-of select="$text_replaced"/>' --> + + <xsl:call-template name="replace_text_tags"> <xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/> <xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/> - <xsl:with-param name="text" select="$text_"/> - </xsl:call-template></text></xsl:variable> + <xsl:with-param name="text" select="$text_replaced"/> + </xsl:call-template> + </xsl:if> - <xsl:variable name="parent" select="local-name(..)"/> + <xsl:if test="1 = 1"> + <!-- enclose standard's number into tag 'keep-together_within-line' --> + <xsl:variable name="text"> + <xsl:element name="text" namespace="{$namespace_full}"> + <xsl:choose> + <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells --> + <xsl:otherwise> + <xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.), $regex_standard_reference, concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/> + <!-- <xsl:value-of select="$text__"/> --> + + <xsl:call-template name="replace_text_tags"> + <xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/> + <xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/> + <xsl:with-param name="text" select="$text_"/> + </xsl:call-template> + + </xsl:otherwise> + </xsl:choose> + </xsl:element> + </xsl:variable> + <xsl:variable name="text2"> - <text><xsl:for-each select="xalan:nodeset($text)/text/node()"> + <xsl:element name="text" namespace="{$namespace_full}"> + <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()"> <xsl:copy-of select="."/> - </xsl:for-each></text> + </xsl:for-each> + </xsl:element> </xsl:variable> <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b --> - <!-- \S matches any non-whitespace character (equivalent to [^\r\n\t\f\v ]) --> - <!-- <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable> --> - <!-- add &lt; and &gt; to \S --> - <xsl:variable name="regex_S">[^\r\n\t\f\v \&lt;&gt;\u3000-\u9FFF]</xsl:variable> - <xsl:variable name="regex_solidus_units">((\b((<xsl:value-of select="$regex_S"/>{1,3}\/<xsl:value-of select="$regex_S"/>+)|(<xsl:value-of select="$regex_S"/>+\/<xsl:value-of select="$regex_S"/>{1,3}))\b)|(\/<xsl:value-of select="$regex_S"/>{1,3})\b)</xsl:variable> <xsl:variable name="text3"> - <text><xsl:for-each select="xalan:nodeset($text2)/text/node()"> - <xsl:choose> - <xsl:when test="self::text()"> - <xsl:variable name="text_units_" select="java:replaceAll(java:java.lang.String.new(.),$regex_solidus_units,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/> - <xsl:variable name="text_units"><text><xsl:call-template name="replace_text_tags"> - <xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/> - <xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/> - <xsl:with-param name="text" select="$text_units_"/> - </xsl:call-template></text></xsl:variable> - <xsl:copy-of select="xalan:nodeset($text_units)/text/node()"/> - </xsl:when> - <xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise> <!-- copy 'as-is' for <fo:inline keep-together.within-line="always" ... --> - </xsl:choose> - </xsl:for-each></text> + <xsl:element name="text" namespace="{$namespace_full}"> + <xsl:for-each select="xalan:nodeset($text2)/*[local-name() = 'text']/node()"> + <xsl:choose> + <xsl:when test="self::text()"> + <xsl:variable name="text_units" select="java:replaceAll(java:java.lang.String.new(.),$regex_solidus_units,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/> + <!-- <xsl:variable name="text_units"> + <xsl:element name="text" namespace="{$namespace_full}"> --> + <xsl:call-template name="replace_text_tags"> + <xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/> + <xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/> + <xsl:with-param name="text" select="$text_units"/> + </xsl:call-template> + <!-- </xsl:element> + </xsl:variable> + <xsl:copy-of select="xalan:nodeset($text_units)/*[local-name() = 'text']/node()"/> --> + </xsl:when> + <xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise> <!-- copy 'as-is' for <fo:inline keep-together.within-line="always" ... --> + </xsl:choose> + </xsl:for-each> + </xsl:element> </xsl:variable> <xsl:choose> <xsl:when test="ancestor::*[local-name() = 'td' or local-name() = 'th']"> <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY --> - <xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable> - <xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable> - <xsl:for-each select="xalan:nodeset($text3)/text/node()"> + <xsl:for-each select="xalan:nodeset($text3)/*[local-name() = 'text']/node()"> <xsl:choose> <xsl:when test="self::text()"> - <xsl:variable name="text_dots_" select="java:replaceAll(java:java.lang.String.new(.),$regex_dots_units,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/> - <xsl:variable name="text_dots"><text><xsl:call-template name="replace_text_tags"> - <xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/> - <xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/> - <xsl:with-param name="text" select="$text_dots_"/> - </xsl:call-template></text></xsl:variable> - <xsl:copy-of select="xalan:nodeset($text_dots)/text/node()"/> + <xsl:variable name="text_dots" select="java:replaceAll(java:java.lang.String.new(.),$regex_dots_units,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/> + <!-- <xsl:variable name="text_dots"> + <xsl:element name="text" namespace="{$namespace_full}"> --> + <xsl:call-template name="replace_text_tags"> + <xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/> + <xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/> + <xsl:with-param name="text" select="$text_dots"/> + </xsl:call-template> + <!-- </xsl:element> + </xsl:variable> + <xsl:copy-of select="xalan:nodeset($text_dots)/*[local-name() = 'text']/node()"/> --> </xsl:when> <xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise> <!-- copy 'as-is' for <fo:inline keep-together.within-line="always" ... --> </xsl:choose> </xsl:for-each> </xsl:when> - <xsl:otherwise><xsl:copy-of select="xalan:nodeset($text3)/text/node()"/></xsl:otherwise> + <xsl:otherwise><xsl:copy-of select="xalan:nodeset($text3)/*[local-name() = 'text']/node()"/></xsl:otherwise> </xsl:choose> - + </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'stem'] | *[local-name() = 'image']" mode="update_xml_enclose_keep-together_within-line"> + <xsl:template match="*[local-name() = 'stem'] | *[local-name() = 'image']" mode="update_xml_enclose_keep-together_within-line"> <xsl:copy-of select="."/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="replace_text_tags"> + <xsl:template name="replace_text_tags"> <xsl:param name="tag_open"/> <xsl:param name="tag_close"/> <xsl:param name="text"/> <xsl:choose> <xsl:when test="contains($text, $tag_open)"> @@ -11657,17 +11956,17 @@ <!-- ===================================== --> <!-- ===================================== --> <!-- Make linear XML (need for landscape orientation) --> <!-- ===================================== --> <!-- ===================================== --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="@*|node()" mode="linear_xml"> + <xsl:template match="@*|node()" mode="linear_xml"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="linear_xml"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="processing-instruction()" mode="linear_xml"> + <xsl:template match="processing-instruction()" mode="linear_xml"> <xsl:copy-of select="."/> </xsl:template> <!-- From: <clause> @@ -11677,11 +11976,11 @@ To: <clause/> <title>...</title> <p>...</p> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'foreword'] | *[local-name() = 'foreword']//*[local-name() = 'clause'] | *[local-name() = 'preface']//*[local-name() = 'clause'][not(@type = 'corrigenda') and not(@type = 'policy') and not(@type = 'related-refs')] | *[local-name() = 'introduction'] | *[local-name() = 'introduction']//*[local-name() = 'clause'] | *[local-name() = 'sections']//*[local-name() = 'clause'] | *[local-name() = 'annex'] | *[local-name() = 'annex']//*[local-name() = 'clause'] | *[local-name() = 'references'][not(@hidden = 'true')] | *[local-name() = 'bibliography']/*[local-name() = 'clause'] | *[local-name() = 'colophon'] | *[local-name() = 'colophon']//*[local-name() = 'clause'] | *[local-name()='sections']//*[local-name()='terms'] | *[local-name()='sections']//*[local-name()='definitions'] | *[local-name()='annex']//*[local-name()='definitions']" mode="linear_xml" name="clause_linear"> + <xsl:template match="*[local-name() = 'foreword'] | *[local-name() = 'foreword']//*[local-name() = 'clause'] | *[local-name() = 'preface']//*[local-name() = 'clause'][not(@type = 'corrigenda') and not(@type = 'policy') and not(@type = 'related-refs')] | *[local-name() = 'introduction'] | *[local-name() = 'introduction']//*[local-name() = 'clause'] | *[local-name() = 'sections']//*[local-name() = 'clause'] | *[local-name() = 'annex'] | *[local-name() = 'annex']//*[local-name() = 'clause'] | *[local-name() = 'references'][not(@hidden = 'true')] | *[local-name() = 'bibliography']/*[local-name() = 'clause'] | *[local-name() = 'colophon'] | *[local-name() = 'colophon']//*[local-name() = 'clause'] | *[local-name()='sections']//*[local-name()='terms'] | *[local-name()='sections']//*[local-name()='definitions'] | *[local-name()='annex']//*[local-name()='definitions']" mode="linear_xml" name="clause_linear"> <xsl:copy> <xsl:apply-templates select="@*" mode="linear_xml"/> <xsl:attribute name="keep-with-next">always</xsl:attribute> @@ -11692,11 +11991,11 @@ </xsl:copy> <xsl:apply-templates mode="linear_xml"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'term']" mode="linear_xml" priority="2"> + <xsl:template match="*[local-name() = 'term']" mode="linear_xml" priority="2"> <xsl:copy> <xsl:apply-templates select="@*" mode="linear_xml"/> <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:variable name="level"> <xsl:call-template name="getLevel"/> @@ -11706,11 +12005,11 @@ <xsl:apply-templates select="node()[not(local-name() = 'term')]" mode="linear_xml"/> </xsl:copy> <xsl:apply-templates select="*[local-name() = 'term']" mode="linear_xml"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'introduction']//*[local-name() = 'title'] | *[local-name() = 'foreword']//*[local-name() = 'title'] | *[local-name() = 'preface']//*[local-name() = 'title'] | *[local-name() = 'sections']//*[local-name() = 'title'] | *[local-name() = 'annex']//*[local-name() = 'title'] | *[local-name() = 'bibliography']/*[local-name() = 'clause']/*[local-name() = 'title'] | *[local-name() = 'references']/*[local-name() = 'title'] | *[local-name() = 'colophon']//*[local-name() = 'title']" mode="linear_xml" priority="2"> + <xsl:template match="*[local-name() = 'introduction']//*[local-name() = 'title'] | *[local-name() = 'foreword']//*[local-name() = 'title'] | *[local-name() = 'preface']//*[local-name() = 'title'] | *[local-name() = 'sections']//*[local-name() = 'title'] | *[local-name() = 'annex']//*[local-name() = 'title'] | *[local-name() = 'bibliography']/*[local-name() = 'clause']/*[local-name() = 'title'] | *[local-name() = 'references']/*[local-name() = 'title'] | *[local-name() = 'colophon']//*[local-name() = 'title']" mode="linear_xml" priority="2"> <xsl:copy> <xsl:apply-templates select="@*" mode="linear_xml"/> <xsl:attribute name="keep-with-next">always</xsl:attribute> @@ -11749,11 +12048,11 @@ <xsl:apply-templates mode="linear_xml"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'li']" mode="linear_xml" priority="2"> + <xsl:template match="*[local-name() = 'li']" mode="linear_xml" priority="2"> <xsl:copy> <xsl:apply-templates select="@*" mode="linear_xml"/> <xsl:variable name="ancestor"> <xsl:choose> @@ -11770,11 +12069,11 @@ </xsl:copy> </xsl:template> <!-- add @to = figure, table, clause --> <!-- add @depth = from --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'xref']" mode="linear_xml"> + <xsl:template match="*[local-name() = 'xref']" mode="linear_xml"> <xsl:copy> <xsl:apply-templates select="@*" mode="linear_xml"/> <xsl:variable name="target" select="@target"/> <xsl:attribute name="to"> <xsl:value-of select="local-name(//*[@id = current()/@target][1])"/> @@ -11784,11 +12083,11 @@ </xsl:attribute> <xsl:apply-templates select="node()" mode="linear_xml"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[not(ancestor::*[local-name() = 'sourcecode'])]/*[local-name() = 'p' or local-name() = 'strong' or local-name() = 'em']/text()" mode="linear_xml"> + <xsl:template match="*[not(ancestor::*[local-name() = 'sourcecode'])]/*[local-name() = 'p' or local-name() = 'strong' or local-name() = 'em']/text()" mode="linear_xml"> <xsl:choose> <xsl:when test="contains(., $non_breaking_hyphen)"> <xsl:call-template name="replaceChar"> <xsl:with-param name="text" select="."/> <xsl:with-param name="replace" select="$non_breaking_hyphen"/> @@ -11797,11 +12096,11 @@ </xsl:when> <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="replaceChar"> + <xsl:template name="replaceChar"> <xsl:param name="text"/> <xsl:param name="replace"/> <xsl:param name="by"/> <xsl:choose> <xsl:when test="$text = '' or $replace = '' or not($replace)"> @@ -11820,21 +12119,21 @@ <xsl:value-of select="$text"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'inlineChar']"> + <xsl:template match="*[local-name() = 'inlineChar']"> <fo:inline><xsl:value-of select="."/></fo:inline> </xsl:template> <!-- change @reference to actual value, and add skip_footnote_body="true" for repeatable (2nd, 3rd, ...) --> <!-- <fn reference="1"> <p id="_8e5cf917-f75a-4a49-b0aa-1714cb6cf954">Formerly denoted as 15 % (m/m).</p> </fn> --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))]" mode="linear_xml" name="linear_xml_fn"> + <xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))]" mode="linear_xml" name="linear_xml_fn"> <xsl:variable name="p_fn_"> <xsl:call-template name="get_fn_list"/> <!-- <xsl:choose> <xsl:when test="$namespace = 'jis'"> <xsl:call-template name="get_fn_list_for_element"/> @@ -11868,11 +12167,11 @@ </xsl:attribute> <xsl:apply-templates select="node()" mode="linear_xml"/> </xsl:copy> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'p'][@type = 'section-title']" priority="3" mode="linear_xml"> + <xsl:template match="*[local-name() = 'p'][@type = 'section-title']" priority="3" mode="linear_xml"> <xsl:copy> <xsl:apply-templates select="@*" mode="linear_xml"/> <xsl:if test="@depth = '1'"> <xsl:attribute name="mainsection">true</xsl:attribute> </xsl:if> @@ -11884,15 +12183,15 @@ <!-- END: Make linear XML (need for landscape orientation) --> <!-- ===================================== --> <!-- ===================================== --> <!-- for correct rendering combining chars --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*[local-name() = 'lang_none']"> + <xsl:template match="*[local-name() = 'lang_none']"> <fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="printEdition"> + <xsl:template name="printEdition"> <xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/> <xsl:choose> <xsl:when test="$edition_i18n != ''"> <!-- Example: <edition language="fr">deuxième édition</edition> --> @@ -11916,11 +12215,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- convert YYYY-MM-DD to 'Month YYYY' or 'Month DD, YYYY' or DD Month YYYY --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="convertDate"> + <xsl:template name="convertDate"> <xsl:param name="date"/> <xsl:param name="format" select="'short'"/> <xsl:variable name="year" select="substring($date, 1, 4)"/> <xsl:variable name="month" select="substring($date, 6, 2)"/> <xsl:variable name="day" select="substring($date, 9, 2)"/> @@ -11954,11 +12253,11 @@ </xsl:variable> <xsl:value-of select="$result"/> </xsl:template> <!-- convertDate --> <!-- return Month's name by number --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getMonthByNum"> + <xsl:template name="getMonthByNum"> <xsl:param name="num"/> <xsl:param name="lang">en</xsl:param> <xsl:param name="lowercase">false</xsl:param> <!-- return 'january' instead of 'January' --> <xsl:variable name="monthStr_"> <xsl:choose> @@ -12003,11 +12302,11 @@ <xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise> </xsl:choose> </xsl:template> <!-- getMonthByNum --> <!-- return Month's name by number from localized strings --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getMonthLocalizedByNum"> + <xsl:template name="getMonthLocalizedByNum"> <xsl:param name="num"/> <xsl:variable name="monthStr"> <xsl:choose> <xsl:when test="$num = '01'">january</xsl:when> <xsl:when test="$num = '02'">february</xsl:when> @@ -12026,11 +12325,11 @@ <xsl:call-template name="getLocalizedString"> <xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param> </xsl:call-template> </xsl:template> <!-- getMonthLocalizedByNum --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertKeywords"> + <xsl:template name="insertKeywords"> <xsl:param name="sorting" select="'true'"/> <xsl:param name="meta" select="'false'"/> <xsl:param name="charAtEnd" select="'.'"/> <xsl:param name="charDelim" select="', '"/> <xsl:choose> @@ -12054,11 +12353,11 @@ </xsl:for-each> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertKeyword"> + <xsl:template name="insertKeyword"> <xsl:param name="charAtEnd"/> <xsl:param name="charDelim"/> <xsl:param name="meta"/> <xsl:choose> <xsl:when test="$meta = 'true'"> @@ -12072,11 +12371,11 @@ <xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when> <xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="addPDFUAmeta"> + <xsl:template name="addPDFUAmeta"> <pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf"> <pdf:dictionary type="normal" key="ViewerPreferences"> <pdf:boolean key="DisplayDocTitle">true</pdf:boolean> </pdf:dictionary> </pdf:catalog> @@ -12142,13 +12441,22 @@ <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/> <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{@name}"/> </xsl:otherwise> </xsl:choose> </xsl:for-each> + <!-- references to external attachments (no binary-encoded within the Metanorma XML file) --> + <xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])"> + <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]"> + <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/> + <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, $attachment_path, ')')"/> + <xsl:variable name="filename_embedded" select="substring-after($attachment_path, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/> + <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{$filename_embedded}"/> + </xsl:for-each> + </xsl:if> </xsl:template> <!-- addPDFUAmeta --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getId"> + <xsl:template name="getId"> <xsl:choose> <xsl:when test="../@id"> <xsl:value-of select="../@id"/> </xsl:when> <xsl:otherwise> @@ -12156,11 +12464,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- Get or calculate depth of the element --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getLevel"> + <xsl:template name="getLevel"> <xsl:param name="depth"/> <xsl:choose> <xsl:when test="normalize-space(@depth) != ''"> <xsl:value-of select="@depth"/> </xsl:when> @@ -12203,11 +12511,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- getLevel --> <!-- Get or calculate depth of term's name --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getLevelTermName"> + <xsl:template name="getLevelTermName"> <xsl:choose> <xsl:when test="normalize-space(../@depth) != ''"> <xsl:value-of select="../@depth"/> </xsl:when> <xsl:otherwise> @@ -12226,11 +12534,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- getLevelTermName --> <!-- split string by separator --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="split"> + <xsl:template name="split"> <xsl:param name="pText" select="."/> <xsl:param name="sep" select="','"/> <xsl:param name="normalize-space" select="'true'"/> <xsl:param name="keep_sep" select="'false'"/> <xsl:if test="string-length($pText) &gt;0"> @@ -12252,19 +12560,19 @@ <xsl:with-param name="keep_sep" select="$keep_sep"/> </xsl:call-template> </xsl:if> </xsl:template> <!-- split --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getDocumentId"> + <xsl:template name="getDocumentId"> <xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getDocumentId_fromCurrentNode"> + <xsl:template name="getDocumentId_fromCurrentNode"> <xsl:call-template name="getLang_fromCurrentNode"/><xsl:value-of select=".//*[local-name() = 'p'][1]/@id"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="namespaceCheck"> + <xsl:template name="namespaceCheck"> <xsl:variable name="documentNS" select="namespace-uri(/*)"/> <xsl:variable name="XSLNS"> <xsl:value-of select="document('')//*/namespace::iho"/> @@ -12272,11 +12580,11 @@ <xsl:if test="$documentNS != $XSLNS"> <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message> </xsl:if> </xsl:template> <!-- namespaceCheck --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getLanguage"> + <xsl:template name="getLanguage"> <xsl:param name="lang"/> <xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/> <xsl:choose> <xsl:when test="$language = 'en'">English</xsl:when> <xsl:when test="$language = 'fr'">French</xsl:when> @@ -12284,11 +12592,11 @@ <xsl:when test="$language = 'cn'">Chinese</xsl:when> <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setId"> + <xsl:template name="setId"> <xsl:param name="prefix"/> <xsl:attribute name="id"> <xsl:choose> <xsl:when test="@id"> <xsl:value-of select="concat($prefix, @id)"/> @@ -12298,11 +12606,11 @@ </xsl:otherwise> </xsl:choose> </xsl:attribute> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="add-letter-spacing"> + <xsl:template name="add-letter-spacing"> <xsl:param name="text"/> <xsl:param name="letter-spacing" select="'0.15'"/> <xsl:if test="string-length($text) &gt; 0"> <xsl:variable name="char" select="substring($text, 1, 1)"/> <fo:inline padding-right="{$letter-spacing}mm"> @@ -12317,11 +12625,11 @@ <xsl:with-param name="letter-spacing" select="$letter-spacing"/> </xsl:call-template> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="repeat"> + <xsl:template name="repeat"> <xsl:param name="char" select="'*'"/> <xsl:param name="count"/> <xsl:if test="$count &gt; 0"> <xsl:value-of select="$char"/> <xsl:call-template name="repeat"> @@ -12329,11 +12637,11 @@ <xsl:with-param name="count" select="$count - 1"/> </xsl:call-template> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getLocalizedString"> + <xsl:template name="getLocalizedString"> <xsl:param name="key"/> <xsl:param name="formatted">false</xsl:param> <xsl:param name="lang"/> <xsl:param name="returnEmptyIfNotFound">false</xsl:param> @@ -12385,11 +12693,11 @@ <xsl:value-of select="$key_"/> </xsl:otherwise> </xsl:choose> </xsl:template> <!-- getLocalizedString --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setTrackChangesStyles"> + <xsl:template name="setTrackChangesStyles"> <xsl:param name="isAdded"/> <xsl:param name="isDeleted"/> <xsl:choose> <xsl:when test="local-name() = 'math'"> <xsl:if test="$isAdded = 'true'"> @@ -12414,30 +12722,30 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- setTrackChangesStyles --> <!-- see https://xmlgraphics.apache.org/fop/2.5/complexscripts.html#bidi_controls--> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="LRM" select="'‎'"/> <!-- U+200E - LEFT-TO-RIGHT MARK (LRM) --> - <xsl:variable xmlns:redirect="http://xml.apache.org/xalan/redirect" name="RLM" select="'‏'"/> <!-- U+200F - RIGHT-TO-LEFT MARK (RLM) --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setWritingMode"> + <xsl:variable name="LRM" select="'‎'"/> <!-- U+200E - LEFT-TO-RIGHT MARK (LRM) --> + <xsl:variable name="RLM" select="'‏'"/> <!-- U+200F - RIGHT-TO-LEFT MARK (RLM) --> + <xsl:template name="setWritingMode"> <xsl:if test="$lang = 'ar'"> <xsl:attribute name="writing-mode">rl-tb</xsl:attribute> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setAlignment"> + <xsl:template name="setAlignment"> <xsl:param name="align" select="normalize-space(@align)"/> <xsl:choose> <xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when> <xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when> <xsl:when test="$align != ''"> <xsl:value-of select="$align"/> </xsl:when> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setTextAlignment"> + <xsl:template name="setTextAlignment"> <xsl:param name="default">left</xsl:param> <xsl:variable name="align" select="normalize-space(@align)"/> <xsl:attribute name="text-align"> <xsl:choose> <xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when> @@ -12452,19 +12760,19 @@ <xsl:if test="$align = 'indent'"> <xsl:attribute name="margin-left">7mm</xsl:attribute> </xsl:if> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setBlockAttributes"> + <xsl:template name="setBlockAttributes"> <xsl:param name="text_align_default">left</xsl:param> <xsl:call-template name="setTextAlignment"> <xsl:with-param name="default" select="$text_align_default"/> </xsl:call-template> <xsl:call-template name="setKeepAttributes"/> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setKeepAttributes"> + <xsl:template name="setKeepAttributes"> <!-- https://www.metanorma.org/author/topics/document-format/text/#avoiding-page-breaks --> <!-- Example: keep-lines-together="true" --> <xsl:if test="@keep-lines-together = 'true'"> <xsl:attribute name="keep-together.within-column">always</xsl:attribute> </xsl:if> @@ -12474,11 +12782,11 @@ </xsl:if> </xsl:template> <!-- insert cover page image --> <!-- background cover image --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="insertBackgroundPageImage"> + <xsl:template name="insertBackgroundPageImage"> <xsl:param name="number">1</xsl:param> <xsl:param name="name">coverpage-image</xsl:param> <xsl:variable name="num" select="number($number)"/> <!-- background image --> <fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage_{$name}_{$number}_{generate-id()}"> @@ -12510,11 +12818,11 @@ </xsl:for-each> </fo:block> </fo:block-container> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getImageURL"> + <xsl:template name="getImageURL"> <xsl:param name="src"/> <xsl:choose> <xsl:when test="starts-with($src, 'data:image')"> <xsl:value-of select="$src"/> </xsl:when> @@ -12522,11 +12830,11 @@ <xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="getSVG"> + <xsl:template name="getSVG"> <xsl:choose> <xsl:when test="*[local-name() = 'svg']"> <xsl:apply-templates select="*[local-name() = 'svg']" mode="svg_update"/> </xsl:when> <xsl:otherwise> @@ -12538,11 +12846,11 @@ </xsl:choose> </xsl:template> <!-- END: insert cover page image --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="number-to-words"> + <xsl:template name="number-to-words"> <xsl:param name="number"/> <xsl:param name="first"/> <xsl:if test="$number != ''"> <xsl:variable name="words"> <words> @@ -12737,11 +13045,11 @@ </xsl:choose> </xsl:if> </xsl:template> <!-- number-to-words --> <!-- st for 1, nd for 2, rd for 3, th for 4, 5, 6, ... --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="number-to-ordinal"> + <xsl:template name="number-to-ordinal"> <xsl:param name="number"/> <xsl:param name="curr_lang"/> <xsl:choose> <xsl:when test="$curr_lang = 'fr'"> <xsl:choose> @@ -12759,11 +13067,11 @@ </xsl:otherwise> </xsl:choose> </xsl:template> <!-- number-to-ordinal --> <!-- add the attribute fox:alt-text, required for PDF/UA --> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="setAltText"> + <xsl:template name="setAltText"> <xsl:param name="value"/> <xsl:attribute name="fox:alt-text"> <xsl:choose> <xsl:when test="normalize-space($value) != ''"> <xsl:value-of select="$value"/> @@ -12771,11 +13079,11 @@ <xsl:otherwise>_</xsl:otherwise> </xsl:choose> </xsl:attribute> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" name="substring-after-last"> + <xsl:template name="substring-after-last"> <xsl:param name="value"/> <xsl:param name="delimiter"/> <xsl:choose> <xsl:when test="contains($value, $delimiter)"> <xsl:call-template name="substring-after-last"> @@ -12787,10 +13095,10 @@ <xsl:value-of select="$value"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template xmlns:redirect="http://xml.apache.org/xalan/redirect" match="*" mode="print_as_xml"> + <xsl:template match="*" mode="print_as_xml"> <xsl:param name="level">0</xsl:param> <fo:block margin-left="{2*$level}mm"> <xsl:text> &lt;</xsl:text> \ No newline at end of file