lib/isodoc/itu/itu.technical-report.xsl in metanorma-itu-2.0.0 vs lib/isodoc/itu/itu.technical-report.xsl in metanorma-itu-2.0.1

- old
+ new

@@ -707,18 +707,18 @@ <xsl:when test="$meeting-date_from_year = $meeting-date_to_year">ddMM</xsl:when> <xsl:otherwise>ddMMyyyy</xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:variable name="meeting-date_from_str"> - <xsl:call-template name="convertDateLocalized"> + <xsl:call-template name="convertDate"> <xsl:with-param name="date" select="$meeting-date_from"/> <xsl:with-param name="format" select="$date_format"/> </xsl:call-template> </xsl:variable> <xsl:variable name="meeting-date_to_str"> - <xsl:call-template name="convertDateLocalized"> + <xsl:call-template name="convertDate"> <xsl:with-param name="date" select="$meeting-date_to"/> <xsl:with-param name="format" select="'ddMMyyyy'"/> </xsl:call-template> </xsl:variable> @@ -1228,13 +1228,10 @@ </xsl:template> <!-- ============================= --> <!-- CONTENTS --> <!-- ============================= --> - <xsl:template match="node()" mode="contents"> - <xsl:apply-templates mode="contents"/> - </xsl:template> <!-- element with title --> <xsl:template match="*[itu:title]" mode="contents"> <xsl:variable name="level"> <xsl:call-template name="getLevel"> @@ -1403,11 +1400,11 @@ <!-- ============================= --> <!-- PARAGRAPHS --> <!-- ============================= --> - <xsl:template match="itu:p | itu:sections/itu:p"> + <xsl:template match="itu:p | itu:sections/itu:p" name="paragraph"> <xsl:variable name="previous-element" select="local-name(preceding-sibling::*[1])"/> <xsl:variable name="element-name"> <xsl:choose> <xsl:when test="../@inline-header = 'true' and $previous-element = 'title'">fo:inline</xsl:when> <!-- first paragraph after inline title --> <xsl:otherwise>fo:block</xsl:otherwise> @@ -1463,124 +1460,15 @@ <xsl:if test="$element-name = 'fo:inline'"> <fo:block><xsl:value-of select="$linebreak"/></fo:block> </xsl:if> </xsl:template> -<!-- <xsl:template match="itu:note"> - <fo:block id="{@id}"> - <xsl:apply-templates /> - </fo:block> - </xsl:template> - <xsl:template match="itu:note/itu:p" name="note"> - <fo:block font-size="11pt" space-before="4pt" text-align="justify"> - <xsl:if test="ancestor::itu:figure"> - <xsl:attribute name="keep-with-previous">always</xsl:attribute> - </xsl:if> - <xsl:apply-templates select="../itu:name" mode="presentation"/> - <xsl:apply-templates /> - </fo:block> - </xsl:template> --> - - <!-- ============================= --> <!-- ============================= --> - <!-- ============================= --> - <!-- Bibliography --> - <!-- ============================= --> - - <!-- Example: [ITU-T A.23] ITU-T A.23, Recommendation ITU-T A.23, Annex A (2014), Guide for ITU-T and ISO/IEC JTC 1 cooperation. --> - <xsl:template match="itu:bibitem"> - <fo:block id="{@id}" margin-top="6pt" margin-left="14mm" text-indent="-14mm"> - <xsl:if test="$doctype = 'implementers-guide'"> - <xsl:attribute name="margin-left">0mm</xsl:attribute> - <xsl:attribute name="text-indent">0mm</xsl:attribute> - </xsl:if> - - <xsl:variable name="bibitem_label"> - <xsl:choose> - <xsl:when test="itu:docidentifier[@type = 'metanorma']"> - <xsl:value-of select="itu:docidentifier[@type = 'metanorma']"/> - </xsl:when> - <xsl:otherwise> - <fo:inline padding-right="5mm"> - <xsl:text>[</xsl:text> - <xsl:value-of select="itu:docidentifier[not(@type = 'metanorma-ordinal')]"/> - <xsl:text>] </xsl:text> - </fo:inline> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="bibitem_body"> - <xsl:text> </xsl:text> - <xsl:choose> - <xsl:when test="itu:docidentifier[@type = 'metanorma']"> - <xsl:if test="itu:docidentifier[not(@type) or not(@type = 'metanorma' or @type = 'metanorma-ordinal')]"> - <xsl:value-of select="itu:docidentifier[not(@type) or not(@type = 'metanorma' or @type = 'metanorma-ordinal')]"/> - <xsl:text>, </xsl:text> - </xsl:if> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="itu:docidentifier[not(@type = 'metanorma-ordinal')]"/> - <xsl:if test="itu:title"> - <xsl:text>, </xsl:text> - </xsl:if> - </xsl:otherwise> - </xsl:choose> - <xsl:if test="itu:title"> - <fo:inline font-style="italic"> - <xsl:choose> - <xsl:when test="itu:title[@type = 'main' and @language = 'en']"> - <xsl:value-of select="itu:title[@type = 'main' and @language = 'en']"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="itu:title"/> - </xsl:otherwise> - </xsl:choose> - </fo:inline> - </xsl:if> - <xsl:if test="itu:formattedref and not(itu:docidentifier[@type = 'metanorma'])">, </xsl:if> - <xsl:apply-templates select="itu:formattedref"/> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$doctype = 'implementers-guide'"> - <fo:table width="100%" table-layout="fixed"> - <fo:table-column column-width="20%"/> - <fo:table-column column-width="80%"/> - <fo:table-body> - <fo:table-row> - <fo:table-cell><fo:block><xsl:copy-of select="$bibitem_label"/></fo:block></fo:table-cell> - <fo:table-cell><fo:block><xsl:copy-of select="$bibitem_body"/></fo:block></fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$bibitem_label"/> - <xsl:copy-of select="$bibitem_body"/> - </xsl:otherwise> - </xsl:choose> - - </fo:block> - </xsl:template> - <xsl:template match="itu:bibitem/itu:docidentifier"/> - - <xsl:template match="itu:bibitem/itu:title"/> - - <xsl:template match="itu:formattedref"> - <xsl:apply-templates/> - </xsl:template> - - - <!-- ============================= --> - <!-- ============================= --> - - <xsl:template match="itu:clause[@id='draft-warning']/itu:title" mode="caution"> <fo:block font-size="16pt" font-family="Times New Roman" font-style="italic" font-weight="bold" text-align="center" space-after="6pt" role="H1"> <xsl:apply-templates/> <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/> @@ -1760,11 +1648,11 @@ <xsl:when test="$level = 4">2mm</xsl:when> <xsl:when test="$level = 3">4mm</xsl:when> <xsl:otherwise>5mm</xsl:otherwise> </xsl:choose> </xsl:attribute> - <xsl:apply-templates select="ancestor::itu:term[1]/itu:name" mode="presentation"/> + <xsl:apply-templates select="ancestor::itu:term[1]/itu:name"/> </fo:inline> <fo:inline font-weight="bold"> <xsl:call-template name="setStyle_preferred"/> <xsl:apply-templates/> </fo:inline> @@ -1868,11 +1756,11 @@ <!-- Examples: [b-ASM] b-ASM, http://www.eecs.umich.edu/gasm/ (accessed 20 March 2018). [b-Börger & Stärk] b-Börger & Stärk, Börger, E., and Stärk, R. S. (2003), Abstract State Machines: A Method for High-Level System Design and Analysis, Springer-Verlag. --> - <xsl:template match="itu:annex//itu:bibitem"> + <xsl:template match="itu:annex//itu:bibitem" priority="3"> <fo:block margin-top="6pt" margin-left="10mm" text-indent="-10mm"> <fo:inline id="{@id}" padding-right="5mm">[<xsl:value-of select="itu:docidentifier[not(@type = 'metanorma-ordinal')]"/>]</fo:inline> <xsl:text> </xsl:text> <xsl:apply-templates select="itu:docidentifier[not(@type = 'metanorma-ordinal')]" mode="content"/> <xsl:if test="node()[local-name(.) != current()/itu:docidentifier]">, </xsl:if> @@ -1910,12 +1798,12 @@ </xsl:template> <xsl:template match="itu:ul//itu:note | itu:ol//itu:note" priority="2"/> <xsl:template match="itu:ul//itu:note | itu:ol//itu:note" mode="process"> <fo:block id="{@id}"> - <xsl:apply-templates select="itu:name" mode="presentation"/> - <xsl:apply-templates mode="process"/> + <xsl:apply-templates select="itu:name"/> + <xsl:apply-templates select="node()[not(local-name() = 'name')]" mode="process"/> </fo:block> </xsl:template> <xsl:template match="itu:ul//itu:note/itu:name | itu:ol//itu:note/itu:name" mode="process" priority="2"/> <xsl:template match="itu:ul//itu:note/itu:p | itu:ol//itu:note/itu:p" mode="process" priority="2"> <fo:block font-size="11pt" margin-top="4pt"> @@ -2056,11 +1944,11 @@ <xsl:apply-templates/> </fo:block> </fo:table-cell> <fo:table-cell display-align="center"> <fo:block text-align="right" margin-left="0mm"> - <xsl:apply-templates select="../itu:name" mode="presentation"/> + <xsl:apply-templates select="../itu:name" mode="formula_number"/> </fo:block> </fo:table-cell> </fo:table-row> </fo:table-body> </fo:table> @@ -2070,25 +1958,11 @@ <xsl:template match="itu:formula" mode="process"> <xsl:call-template name="formula"/> </xsl:template> - <xsl:template match="itu:references[@normative='true']"> - <fo:block id="{@id}"> - <xsl:apply-templates/> - </fo:block> - </xsl:template> - <xsl:template match="itu:references[not(@normative='true')]"> - <fo:block break-after="page"/> - <fo:block id="{@id}"> - <xsl:apply-templates/> - </fo:block> - </xsl:template> - - - <xsl:template name="insertHeaderFooter"> <fo:static-content flow-name="footer-even" font-family="Times New Roman" font-size="11pt" role="artifact"> <fo:block-container height="19mm" display-align="after"> <fo:table table-layout="fixed" width="100%" display-align="after"> <fo:table-column column-width="10%"/> @@ -2288,37 +2162,36 @@ <xsl:with-param name="text" select="substring($text, 2)"/> </xsl:call-template> </xsl:if> </xsl:template> -<xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="titles_"> +<xsl:variable name="titles_"> <title-edition lang="en"> - <xsl:text>Edition </xsl:text> - - + <xsl:text>Edition </xsl:text> + </title-edition> <title-edition lang="fr"> - - <xsl:text>Édition </xsl:text> - + <xsl:text>Édition </xsl:text> </title-edition> - <!-- These titles of Table of contents renders different than determined in localized-strings --> <title-toc lang="en"> </title-toc> <title-toc lang="fr"> + <xsl:text>Sommaire</xsl:text> + </title-toc> + <title-toc lang="zh"> + <xsl:text>Contents</xsl:text> + </title-toc> - - <title-descriptors lang="en">Descriptors</title-descriptors> <title-part lang="en"> @@ -2330,16 +2203,12 @@ </title-part> <title-part lang="zh">第 # 部分:</title-part> - <title-subpart lang="en"> - - </title-subpart> - <title-subpart lang="fr"> - - </title-subpart> + <title-subpart lang="en">Sub-part #</title-subpart> + <title-subpart lang="fr">Partie de sub #</title-subpart> <title-list-tables lang="en">List of Tables</title-list-tables> <title-list-figures lang="en">List of Figures</title-list-figures> @@ -2350,11 +2219,11 @@ <title-summary lang="en">Summary</title-summary> <title-continued lang="en">(continued)</title-continued> <title-continued lang="fr">(continué)</title-continued> - </xsl:variable><xsl:variable name="bibdata"> + </xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><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><xsl:variable name="tab_zh">　</xsl:variable><xsl:template name="getTitle"> <xsl:param name="name"/> <xsl:param name="lang"/> @@ -2379,36 +2248,60 @@ </xsl:otherwise> </xsl:choose> </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="root-style"> + + + + + + + <xsl:attribute name="font-family">Times New Roman, STIX Two Math</xsl:attribute> <xsl:attribute name="font-size">12pt</xsl:attribute> + + + + + + + </xsl:attribute-set><xsl:attribute-set name="link-style"> + </xsl:attribute-set><xsl:attribute-set name="sourcecode-container-style"> + <xsl:attribute name="margin-left">0mm</xsl:attribute> + </xsl:attribute-set><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">Courier New</xsl:attribute> <xsl:attribute name="margin-top">6pt</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> + + + </xsl:attribute-set><xsl:attribute-set name="permission-style"> </xsl:attribute-set><xsl:attribute-set name="permission-name-style"> </xsl:attribute-set><xsl:attribute-set name="permission-label-style"> @@ -2511,11 +2404,63 @@ </xsl:attribute-set><xsl:variable name="table-border_"> - </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-name-style"> + </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><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">10pt</xsl:attribute> + <xsl:attribute name="space-after">18pt</xsl:attribute> + + + + + + + + + + + + + </xsl:attribute-set><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="margin-left">0mm</xsl:attribute> + <xsl:attribute name="margin-right">0mm</xsl:attribute> + + + + + + + + + + + + + + + + + + + + + </xsl:attribute-set><xsl:attribute-set name="table-name-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="text-align">center</xsl:attribute> @@ -2531,12 +2476,160 @@ + </xsl:attribute-set><xsl:attribute-set name="table-row-style"> + <xsl:attribute name="min-height">4mm</xsl:attribute> + + + + + </xsl:attribute-set><xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style"> + <xsl:attribute name="font-weight">bold</xsl:attribute> + + + + + + + + + + </xsl:attribute-set><xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style"> + + + + </xsl:attribute-set><xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style"> + + </xsl:attribute-set><xsl:attribute-set name="table-header-cell-style"> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="border">solid black 1pt</xsl:attribute> + <xsl:attribute name="padding-left">1mm</xsl:attribute> + <xsl:attribute name="display-align">center</xsl:attribute> + + + + + + + + + + + + + + </xsl:attribute-set><xsl:attribute-set name="table-cell-style"> + <xsl:attribute name="display-align">center</xsl:attribute> + <xsl:attribute name="border">solid black 1pt</xsl:attribute> + <xsl:attribute name="padding-left">1mm</xsl:attribute> + + + + + + + + <xsl:attribute name="display-align">before</xsl:attribute> + + + + + + + </xsl:attribute-set><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-set><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-set><xsl:attribute-set name="table-fn-style"> + <xsl:attribute name="margin-bottom">12pt</xsl:attribute> + + + + + + + <xsl:attribute name="margin-bottom">2pt</xsl:attribute> + <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute> + <xsl:attribute name="text-indent">-5mm</xsl:attribute> + <xsl:attribute name="start-indent">5mm</xsl:attribute> + + </xsl:attribute-set><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 name="padding-right">3mm</xsl:attribute> + <xsl:attribute name="font-size">70%</xsl:attribute> + + + + + + </xsl:attribute-set><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 name="table-fn-body-style"> + + </xsl:attribute-set><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 name="figure-fn-body-style"> + <xsl:attribute name="text-align">justify</xsl:attribute> + <xsl:attribute name="margin-bottom">12pt</xsl:attribute> + + </xsl:attribute-set><xsl:attribute-set name="dt-row-style"> + + + </xsl:attribute-set><xsl:attribute-set name="dt-style"> + <xsl:attribute name="margin-top">6pt</xsl:attribute> + + + + + + + + + + </xsl:attribute-set><xsl:attribute-set name="appendix-style"> </xsl:attribute-set><xsl:attribute-set name="appendix-example-style"> @@ -2597,10 +2690,11 @@ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style"> + <xsl:attribute name="padding-right">2mm</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="note-p-style"> @@ -2659,17 +2753,22 @@ + </xsl:attribute-set><xsl:attribute-set name="termsource-text-style"> + + </xsl:attribute-set><xsl:attribute-set name="origin-style"> </xsl:attribute-set><xsl:attribute-set name="term-style"> + </xsl:attribute-set><xsl:attribute-set name="figure-style"> + </xsl:attribute-set><xsl:attribute-set name="figure-name-style"> @@ -2772,10 +2871,24 @@ </xsl:attribute-set><xsl:attribute-set name="list-style"> </xsl:attribute-set><xsl:attribute-set name="toc-style"> <xsl:attribute name="line-height">135%</xsl:attribute> + </xsl:attribute-set><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 name="vertical-align">super</xsl:attribute> + <xsl:attribute name="color">blue</xsl:attribute> + + + + + + </xsl:attribute-set><xsl:attribute-set name="fn-style"> <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="fn-num-style"> <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute> @@ -2845,34 +2958,206 @@ - </xsl:attribute-set><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 name="ace_tag">ace-tag_</xsl:variable><xsl:template name="OLD_processPrefaceSectionsDefault_Contents"> - <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/> - <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/> - <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/> - <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/> - <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/> - </xsl:template><xsl:template name="processPrefaceSectionsDefault_Contents"> + </xsl:attribute-set><xsl:attribute-set name="admonition-style"> + + + + + + + + + + + + + + + </xsl:attribute-set><xsl:attribute-set name="admonition-container-style"> + + + + + + + + + + + </xsl:attribute-set><xsl:attribute-set name="admonition-name-style"> + <xsl:attribute name="keep-with-next">always</xsl:attribute> + + + + + + + + + + + + + + </xsl:attribute-set><xsl:attribute-set name="admonition-p-style"> + + + + + + + + + + + + </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style"> + + + + + + + + + + <xsl:attribute name="margin-top">6pt</xsl:attribute> + <xsl:attribute name="margin-left">14mm</xsl:attribute> + <xsl:attribute name="text-indent">-14mm</xsl:attribute> + + + + + + + + + + + </xsl:attribute-set><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:attribute-set><xsl:attribute-set name="bibitem-non-normative-style"> + + + + <xsl:attribute name="margin-top">6pt</xsl:attribute> + <xsl:attribute name="margin-left">14mm</xsl:attribute> + <xsl:attribute name="text-indent">-14mm</xsl:attribute> + + + </xsl:attribute-set><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-set><xsl:attribute-set name="bibitem-normative-list-body-style"> + + + <xsl:attribute name="margin-top">6pt</xsl:attribute> + <xsl:attribute name="margin-left">14mm</xsl:attribute> + <xsl:attribute name="text-indent">-14mm</xsl:attribute> + + </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style"> + + + <xsl:attribute name="margin-top">6pt</xsl:attribute> + <xsl:attribute name="margin-left">14mm</xsl:attribute> + <xsl:attribute name="text-indent">-14mm</xsl:attribute> + + </xsl:attribute-set><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><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><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><xsl:attribute-set name="references-non-normative-style"> + + + + </xsl:attribute-set><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 name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents"> <xsl:for-each select="/*/*[local-name()='preface']/*"> <xsl:sort select="@displayorder" data-type="number"/> <xsl:apply-templates select="." mode="contents"/> </xsl:for-each> - </xsl:template><xsl:template name="OLD_processMainSectionsDefault_Contents"> - <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/> - - <!-- Normative references --> - <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]" mode="contents"/> - <!-- Terms and definitions --> - <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]" mode="contents"/> - <!-- Another main sections --> - <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]" mode="contents"/> - <xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/> - <!-- Bibliography --> - <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/> - </xsl:template><xsl:template name="processMainSectionsDefault_Contents"> <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]"> <xsl:sort select="@displayorder" data-type="number"/> <xsl:apply-templates select="." mode="contents"/> @@ -2885,33 +3170,15 @@ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@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="contents"/> </xsl:for-each> - </xsl:template><xsl:template name="OLD_processPrefaceSectionsDefault"> - <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/> - <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/> - <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/> - <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/> - <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/> </xsl:template><xsl:template name="processPrefaceSectionsDefault"> <xsl:for-each select="/*/*[local-name()='preface']/*"> <xsl:sort select="@displayorder" data-type="number"/> <xsl:apply-templates select="."/> </xsl:for-each> - </xsl:template><xsl:template name="OLD_processMainSectionsDefault"> - <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'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]"/> - <!-- Another main sections --> - <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]"/> - <xsl:apply-templates select="/*/*[local-name()='annex']"/> - <!-- Bibliography --> - <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/> </xsl:template><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="."/> @@ -2948,161 +3215,115 @@ <xsl:variable name="simple-table"> <xsl:call-template name="getSimpleTable"/> </xsl:variable> - <!-- <xsl:if test="$namespace = 'bipm'"> - <fo:block>&#xA0;</fo:block> - </xsl:if> --> - <!-- Display table's name before table as standalone block --> <!-- $namespace = 'iso' or --> - <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/> + <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table --> + - - - - <xsl:call-template name="fn_name_display"/> - + <xsl:call-template name="table_name_fn_display"/> <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/> - <!-- <xsl:variable name="cols-count"> - <xsl:choose> - <xsl:when test="*[local-name()='thead']"> - <xsl:call-template name="calculate-columns-numbers"> - <xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="calculate-columns-numbers"> - <xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> --> - <!-- cols-count=<xsl:copy-of select="$cols-count"/> --> - <!-- cols-count2=<xsl:copy-of select="$cols-count2"/> --> - <xsl:variable name="colwidths"> <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])"> <xsl:call-template name="calculate-column-widths"> <xsl:with-param name="cols-count" select="$cols-count"/> <xsl:with-param name="table" select="$simple-table"/> </xsl:call-template> </xsl:if> </xsl:variable> <!-- colwidths=<xsl:copy-of select="$colwidths"/> --> - <!-- <xsl:variable name="colwidths2"> - <xsl:call-template name="calculate-column-widths"> - <xsl:with-param name="cols-count" select="$cols-count"/> - </xsl:call-template> - </xsl:variable> --> - <!-- cols-count=<xsl:copy-of select="$cols-count"/> - colwidthsNew=<xsl:copy-of select="$colwidths"/> - colwidthsOld=<xsl:copy-of select="$colwidths2"/>z --> - - <xsl:variable name="margin-left"> + <xsl:variable name="margin-side"> <xsl:choose> <xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when> <xsl:otherwise>0</xsl:otherwise> </xsl:choose> </xsl:variable> - <fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm"> + <fo:block-container xsl:use-attribute-sets="table-container-style"> + + - <xsl:attribute name="font-size">10pt</xsl:attribute> + + - <xsl:attribute name="space-after">6pt</xsl:attribute> - - - - <xsl:attribute name="margin-left">0mm</xsl:attribute> - <xsl:attribute name="margin-right">0mm</xsl:attribute> - <xsl:attribute name="space-after">18pt</xsl:attribute> + <xsl:if test="$doctype = 'service-publication' and $lang != 'ar'"> + <xsl:attribute name="font-family">Calibri</xsl:attribute> + </xsl:if> + - + <!-- end table block-container attributes --> - - - - - - <xsl:if test="$doctype = 'service-publication' and $lang != 'ar'"> - <xsl:attribute name="font-family">Calibri</xsl:attribute> - </xsl:if> - - <!-- display table's name before table for PAS inside block-container (2-columnn layout) --> + <xsl:variable name="table_width_default">100%</xsl:variable> <xsl:variable name="table_width"> <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) --> - 100% - - + <xsl:value-of select="$table_width_default"/> </xsl:variable> + <xsl:variable name="table_attributes"> - <attribute name="table-layout">fixed</attribute> - <attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></attribute> - <attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute> - <attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute> - - - - - - - <attribute name="margin-left">0mm</attribute> - <attribute name="margin-right">0mm</attribute> - <xsl:if test="$doctype = 'service-publication'"> - <attribute name="border">1pt solid rgb(211,211,211)</attribute> - </xsl:if> - - - - - - - - - + + <xsl:element name="table_attributes" use-attribute-sets="table-style"> + <xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute> + + + + + + + + + + + <xsl:if test="$doctype = 'service-publication'"> + <xsl:attribute name="border">1pt solid rgb(211,211,211)</xsl:attribute> + </xsl:if> + + + + + + </xsl:element> </xsl:variable> - <fo:table id="{@id}" table-omit-footer-at-break="true"> + <fo:table id="{@id}"> - <xsl:for-each select="xalan:nodeset($table_attributes)/attribute"> - <xsl:attribute name="{@name}"> + <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*"> + <xsl:attribute name="{local-name()}"> <xsl:value-of select="."/> </xsl:attribute> </xsl:for-each> <xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/> <xsl:if test="$isNoteOrFnExist = 'true'"> <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer --> </xsl:if> - <xsl:choose> <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']"> <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']"> <fo:table-column column-width="{@width}"/> </xsl:for-each> @@ -3124,11 +3345,11 @@ <xsl:choose> <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']"> <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/> </xsl:when> <xsl:otherwise> - <xsl:apply-templates/> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </xsl:otherwise> </xsl:choose> </fo:table> @@ -3139,29 +3360,10 @@ <xsl:with-param name="colwidths" select="$colwidths"/> <xsl:with-param name="colgroup" select="$colgroup"/> </xsl:call-template> </xsl:for-each> - <!-- insert footer as table --> - <!-- <fo:table> - <xsl:for-each select="xalan::nodeset($table_attributes)/attribute"> - <xsl:attribute name="{@name}"> - <xsl:value-of select="."/> - </xsl:attribute> - </xsl:for-each> - - <xsl:for-each select="xalan:nodeset($colwidths)//column"> - <xsl:choose> - <xsl:when test=". = 1 or . = 0"> - <fo:table-column column-width="proportional-column-width(2)"/> - </xsl:when> - <xsl:otherwise> - <fo:table-column column-width="proportional-column-width({.})"/> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> - </fo:table>--> @@ -3218,22 +3420,21 @@ </xsl:otherwise> </xsl:choose> </xsl:otherwise> </xsl:choose> - </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation"> + </xsl:template><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"> + - <xsl:choose> <xsl:when test="$continued = 'true'"> - <!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> --> </xsl:when> <xsl:otherwise> <xsl:apply-templates/> </xsl:otherwise> @@ -3292,17 +3493,10 @@ </xsl:when> <xsl:otherwise> <xsl:for-each select="xalan:nodeset($table)/*/tr"> <xsl:variable name="td_text"> <xsl:apply-templates select="td[$curr-col]" mode="td_text"/> - - <!-- <xsl:if test="$namespace = 'bipm'"> - <xsl:for-each select="*[local-name()='td'][$curr-col]//*[local-name()='math']"> - <word><xsl:value-of select="normalize-space(.)"/></word> - </xsl:for-each> - </xsl:if> --> - </xsl:variable> <xsl:variable name="words"> <xsl:variable name="string_with_added_zerospaces"> <xsl:call-template name="add-zero-spaces-java"> <xsl:with-param name="text" select="$td_text"/> @@ -3335,11 +3529,10 @@ </xsl:for-each> </xsl:otherwise> </xsl:choose> </xsl:variable> - <column> <xsl:for-each select="xalan:nodeset($widths)//width"> <xsl:sort select="." data-type="number" order="descending"/> <xsl:if test="position()=1"> @@ -3371,11 +3564,10 @@ <xsl:variable name="math_text" select="normalize-space(xalan:nodeset($mathml))"/> <xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces --> </xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process"> <xsl:param name="cols-count"/> - <!-- font-weight="bold" --> <fo:table-header> <xsl:apply-templates/> </fo:table-header> @@ -3383,17 +3575,16 @@ <xsl:param name="cols-count"/> <!-- row for title --> <fo:table-row> <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"> - <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation"> + <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']"> <xsl:with-param name="continued">true</xsl:with-param> </xsl:apply-templates> - </fo:table-cell> </fo:table-row> </xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody"> <fo:table-body> <xsl:apply-templates/> @@ -3405,72 +3596,10 @@ <xsl:if test="../*[local-name()='tfoot']"> <fo:table-footer> <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/> </fo:table-footer> </xsl:if> - </xsl:template><xsl:template name="insertTableFooter2"> - <xsl:param name="cols-count"/> - <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/> - <xsl:if test="../*[local-name()='tfoot'] or $isNoteOrFnExist = 'true'"> - - <fo:table-footer> - - <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/> - - <!-- if there are note(s) or fn(s) then create footer row --> - <xsl:if test="$isNoteOrFnExist = 'true'"> - - - - <fo:table-row> - <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}"> - - - - <xsl:if test="ancestor::*[local-name()='preface']"> - <xsl:attribute name="border">solid black 0pt</xsl:attribute> - </xsl:if> - - <!-- fn will be processed inside 'note' processing --> - - - - - - - <!-- except gb --> - - <xsl:apply-templates select="../*[local-name()='note']" mode="process"/> - - - <!-- show Note under table in preface (ex. abstract) sections --> - <!-- empty, because notes show at page side in main sections --> - <!-- <xsl:if test="$namespace = 'bipm'"> - <xsl:choose> - <xsl:when test="ancestor::*[local-name()='preface']"> - <xsl:apply-templates select="../*[local-name()='note']" mode="process"/> - </xsl:when> - <xsl:otherwise> - <fo:block/> - </xsl:otherwise> - </xsl:choose> - </xsl:if> --> - - - <!-- horizontal row separator --> - - - <!-- fn processing --> - <xsl:call-template name="fn_display"/> - - </fo:table-cell> - </fo:table-row> - - </xsl:if> - </fo:table-footer> - - </xsl:if> </xsl:template><xsl:template name="insertTableFooterInSeparateTable"> <xsl:param name="table_attributes"/> <xsl:param name="colwidths"/> <xsl:param name="colgroup"/> @@ -3492,21 +3621,22 @@ </xsl:otherwise> </xsl:choose> </xsl:variable> <fo:table keep-with-previous="always"> - <xsl:for-each select="xalan:nodeset($table_attributes)/attribute"> + <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*"> + <xsl:variable name="name" select="local-name()"/> <xsl:choose> - <xsl:when test="@name = 'border-top'"> - <xsl:attribute name="{@name}">0pt solid black</xsl:attribute> + <xsl:when test="$name = 'border-top'"> + <xsl:attribute name="{$name}">0pt solid black</xsl:attribute> </xsl:when> - <xsl:when test="@name = 'border'"> - <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute> + <xsl:when test="$name = 'border'"> + <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute> <xsl:attribute name="border-top">0pt solid black</xsl:attribute> </xsl:when> <xsl:otherwise> - <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute> + <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute> </xsl:otherwise> </xsl:choose> </xsl:for-each> @@ -3537,65 +3667,51 @@ </xsl:otherwise> </xsl:choose> <fo:table-body> <fo:table-row> - <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}"> + <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}"> + - <xsl:if test="ancestor::*[local-name()='preface']"> - <xsl:attribute name="border">solid black 0pt</xsl:attribute> + <xsl:if test="$doctype != 'service-publication'"> + <xsl:attribute name="border">solid black 0pt</xsl:attribute> + </xsl:if> </xsl:if> <xsl:if test="$doctype = 'service-publication'"> <xsl:attribute name="border">none</xsl:attribute> </xsl:if> + <!-- fn will be processed inside 'note' processing --> - - - <xsl:if test="$doctype = 'service-publication'"> <fo:block margin-top="7pt" margin-bottom="2pt"><fo:inline>____________</fo:inline></fo:block> </xsl:if> <!-- for BSI (not PAS) display Notes before footnotes --> - <!-- except gb --> + <!-- except gb and bsi --> - <xsl:apply-templates select="../*[local-name()='note']" mode="process"/> + <xsl:apply-templates select="../*[local-name()='note']" mode="process"/> + - <!-- <xsl:if test="$namespace = 'bipm'"> - <xsl:choose> - <xsl:when test="ancestor::*[local-name()='preface']"> - show Note under table in preface (ex. abstract) sections - <xsl:apply-templates select="../*[local-name()='note']" mode="process"/> - </xsl:when> - <xsl:otherwise> - empty, because notes show at page side in main sections - <fo:block/> - </xsl:otherwise> - </xsl:choose> - </xsl:if> --> - - <!-- horizontal row separator --> <!-- fn processing --> - <xsl:call-template name="fn_display"/> + <xsl:call-template name="table_fn_display"/> - <!-- for PAS display Notes after footnotes --> </fo:table-cell> </fo:table-row> @@ -3632,122 +3748,107 @@ <fo:table-body> <xsl:apply-templates/> - <!-- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/> --> - + </fo:table-body> - </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name"> - <xsl:choose> - <xsl:when test="substring-after(., '—') != ''"> - <xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="."/> - </xsl:otherwise> - </xsl:choose> - </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name"> - <xsl:apply-templates mode="presentation_name"/> - </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name"> - <xsl:apply-templates select="."/> - </xsl:template><xsl:template match="*[local-name()='tr']"> - <xsl:variable name="parent-name" select="local-name(..)"/> - <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> --> - <fo:table-row min-height="4mm"> - <xsl:if test="$parent-name = 'thead'"> - <xsl:attribute name="font-weight">bold</xsl:attribute> - - - - - - - - <xsl:if test="$doctype = 'service-publication'"> - <xsl:attribute name="border-bottom">1.1pt solid black</xsl:attribute> - </xsl:if> - - + </xsl:template><xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2"> + <fo:table-row xsl:use-attribute-sets="table-header-row-style"> + + + + + + + <xsl:if test="$doctype = 'service-publication'"> + <xsl:attribute name="border-bottom">1.1pt solid black</xsl:attribute> </xsl:if> - <xsl:if test="$parent-name = 'tfoot'"> - - - - </xsl:if> - - - - - - - - - - <xsl:if test="$doctype = 'service-publication'"> - <xsl:attribute name="min-height">5mm</xsl:attribute> - </xsl:if> - - - <!-- <xsl:if test="$namespace = 'bipm'"> - <xsl:attribute name="height">8mm</xsl:attribute> - </xsl:if> --> - + + + <xsl:call-template name="setTableRowAttributes"/> + <xsl:apply-templates/> </fo:table-row> + </xsl:template><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="setTableRowAttributes"/> + <xsl:apply-templates/> + </fo:table-row> + </xsl:template><xsl:template match="*[local-name()='tr']"> + <fo:table-row xsl:use-attribute-sets="table-body-row-style"> + + + + + + <xsl:call-template name="setTableRowAttributes"/> + <xsl:apply-templates/> + </fo:table-row> + </xsl:template><xsl:template name="setTableRowAttributes"> + + + + + + + <xsl:if test="$doctype = 'service-publication'"> + <xsl:attribute name="min-height">5mm</xsl:attribute> + </xsl:if> + + + </xsl:template><xsl:template match="*[local-name()='th']"> - <fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center"> - <xsl:attribute name="text-align"> - <xsl:choose> - <xsl:when test="@align"> - <xsl:call-template name="setAlignment"/> - <!-- <xsl:value-of select="@align"/> --> - </xsl:when> - <xsl:otherwise>center</xsl:otherwise> - </xsl:choose> - </xsl:attribute> + <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:if test="ancestor::*[local-name()='preface']"> - <xsl:attribute name="border">solid black 0pt</xsl:attribute> + <xsl:if test="$doctype != 'service-publication'"> + <xsl:attribute name="border">solid black 0pt</xsl:attribute> + </xsl:if> </xsl:if> <xsl:if test="$doctype = 'service-publication'"> <xsl:attribute name="border">1pt solid rgb(211,211,211)</xsl:attribute> <xsl:attribute name="border-bottom">1pt solid black</xsl:attribute> <xsl:attribute name="padding-top">1mm</xsl:attribute> </xsl:if> - - - - - - <xsl:if test="$lang = 'ar'"> <xsl:attribute name="padding-right">1mm</xsl:attribute> </xsl:if> - <xsl:if test="@colspan"> - <xsl:attribute name="number-columns-spanned"> - <xsl:value-of select="@colspan"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="@rowspan"> - <xsl:attribute name="number-rows-spanned"> - <xsl:value-of select="@rowspan"/> - </xsl:attribute> - </xsl:if> - <xsl:call-template name="display-align"/> + + <xsl:call-template name="setTableCellAttributes"/> + <fo:block> <xsl:apply-templates/> </fo:block> </fo:table-cell> + </xsl:template><xsl:template name="setTableCellAttributes"> + <xsl:if test="@colspan"> + <xsl:attribute name="number-columns-spanned"> + <xsl:value-of select="@colspan"/> + </xsl:attribute> + </xsl:if> + <xsl:if test="@rowspan"> + <xsl:attribute name="number-rows-spanned"> + <xsl:value-of select="@rowspan"/> + </xsl:attribute> + </xsl:if> + <xsl:call-template name="display-align"/> </xsl:template><xsl:template name="display-align"> <xsl:if test="@valign"> <xsl:attribute name="display-align"> <xsl:choose> <xsl:when test="@valign = 'top'">before</xsl:when> @@ -3756,95 +3857,83 @@ <xsl:otherwise>before</xsl:otherwise> </xsl:choose> </xsl:attribute> </xsl:if> </xsl:template><xsl:template match="*[local-name()='td']"> - <fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm"> - <xsl:attribute name="text-align"> - <xsl:choose> - <xsl:when test="@align"> - <xsl:call-template name="setAlignment"/> - <!-- <xsl:value-of select="@align"/> --> - </xsl:when> - <xsl:otherwise>left</xsl:otherwise> - </xsl:choose> - </xsl:attribute> + <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:if test="$lang = 'ar'"> <xsl:attribute name="padding-right">1mm</xsl:attribute> </xsl:if> + <!-- bsi --> + + + + + + + <xsl:if test="ancestor::*[local-name()='preface']"> <xsl:attribute name="border">solid black 0pt</xsl:attribute> </xsl:if> - <xsl:attribute name="display-align">before</xsl:attribute> <xsl:if test="$doctype = 'service-publication'"> <xsl:attribute name="border">1pt solid rgb(211,211,211)</xsl:attribute> <xsl:attribute name="padding-top">1mm</xsl:attribute> </xsl:if> + - - - - - - - <xsl:if test=".//*[local-name() = 'table']"> + <xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table --> <xsl:attribute name="padding-right">1mm</xsl:attribute> </xsl:if> - <xsl:if test="@colspan"> - <xsl:attribute name="number-columns-spanned"> - <xsl:value-of select="@colspan"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="@rowspan"> - <xsl:attribute name="number-rows-spanned"> - <xsl:value-of select="@rowspan"/> - </xsl:attribute> - </xsl:if> - <xsl:call-template name="display-align"/> + + <xsl:call-template name="setTableCellAttributes"/> + <fo:block> - + + + <xsl:apply-templates/> </fo:block> </fo:table-cell> </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2"/><xsl:template match="*[local-name()='table']/*[local-name()='note']" mode="process"> + + <fo:block xsl:use-attribute-sets="table-note-style"> + + + + - - <fo:block font-size="10pt" margin-bottom="12pt"> + <!-- Table's note name (NOTE, for example) --> + <fo:inline xsl:use-attribute-sets="table-note-name-style"> - - <!-- Table's note name (NOTE, for example) --> - - <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style"> + <xsl:apply-templates select="*[local-name() = 'name']"/> - - - - - <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/> - - </fo:inline> - - - - <xsl:apply-templates mode="process"/> - </fo:block> + </fo:inline> + + + + <xsl:apply-templates select="node()[not(local-name() = 'name')]" mode="process"/> + </fo:block> </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='name']" mode="process"/><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process"> <xsl:apply-templates/> </xsl:template><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"> @@ -3920,13 +4009,12 @@ <xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false'"> <fo:footnote xsl:use-attribute-sets="fn-style"> <xsl:copy-of select="$footnote_inline"/> <fo:footnote-body> - <fo:block-container text-indent="0" start-indent="0"> + <fo:block-container xsl:use-attribute-sets="fn-container-body-style"> - <fo:block xsl:use-attribute-sets="fn-body-style"> <xsl:if test="$doctype = 'service-publication'"> <xsl:attribute name="font-size">10pt</xsl:attribute> @@ -3944,60 +4032,43 @@ </xsl:when> <xsl:otherwise> <xsl:copy-of select="$footnote_inline"/> </xsl:otherwise> </xsl:choose> - </xsl:template><xsl:template name="fn_display"> + </xsl:template><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> </xsl:variable> <xsl:for-each select="xalan:nodeset($references)//fn"> <xsl:variable name="reference" select="@reference"/> <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note--> - <fo:block margin-bottom="12pt"> + <fo:block xsl:use-attribute-sets="table-fn-style"> - - - - <xsl:attribute name="margin-bottom">2pt</xsl:attribute> - <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute> - <xsl:attribute name="text-indent">-5mm</xsl:attribute> - <xsl:attribute name="start-indent">5mm</xsl:attribute> - - - <fo:inline font-size="80%" padding-right="5mm" id="{@id}"> + <fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style"> - <xsl:attribute name="vertical-align">super</xsl:attribute> + <xsl:value-of select="@reference"/> - <xsl:attribute name="padding-right">3mm</xsl:attribute> - <xsl:attribute name="font-size">70%</xsl:attribute> - <xsl:value-of select="@reference"/> + <xsl:text>)</xsl:text> - <!-- <xsl:if test="@preface = 'true'"> --> - <xsl:text>)</xsl:text> - <!-- </xsl:if> --> - </fo:inline> - <fo:inline> - - <!-- <xsl:apply-templates /> --> + <fo:inline xsl:use-attribute-sets="table-fn-body-style"> <xsl:copy-of select="./node()"/> </fo:inline> </fo:block> </xsl:if> </xsl:for-each> @@ -4009,81 +4080,73 @@ </xsl:if> <xsl:apply-templates/> </fn> - </xsl:template><xsl:template name="fn_name_display"> - <!-- <xsl:variable name="references"> - <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']"> - <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}"> - <xsl:apply-templates /> - </fn> - </xsl:for-each> - </xsl:variable> - $references=<xsl:copy-of select="$references"/> --> + </xsl:template><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/> </fo:block> </xsl:for-each> </xsl:template><xsl:template name="fn_display_figure"> - <xsl:variable name="key_iso"> - <!-- and (not(@class) or @class !='pseudocode') --> - </xsl:variable> + <xsl:variable name="references"> <xsl:for-each select=".//*[local-name()='fn'][not(parent::*[local-name()='name'])]"> <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}"> <xsl:apply-templates/> </fn> </xsl:for-each> </xsl:variable> + + <xsl:if test="xalan:nodeset($references)//fn"> - <!-- current hierarchy is 'figure' element --> - <xsl:variable name="following_dl_colwidths"> - <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' --> - <xsl:variable name="html-table"> - <xsl:variable name="doc_ns"> + <xsl:variable name="key_iso"> + + </xsl:variable> + + <!-- current hierarchy is 'figure' element --> + <xsl:variable name="following_dl_colwidths"> + <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' --> + <xsl:variable name="html-table"> + <xsl:variable name="doc_ns"> + + </xsl:variable> + <xsl:variable name="ns"> + <xsl:choose> + <xsl:when test="normalize-space($doc_ns) != ''"> + <xsl:value-of select="normalize-space($doc_ns)"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="substring-before(name(/*), '-')"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> - </xsl:variable> - <xsl:variable name="ns"> - <xsl:choose> - <xsl:when test="normalize-space($doc_ns) != ''"> - <xsl:value-of select="normalize-space($doc_ns)"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="substring-before(name(/*), '-')"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> --> - <!-- <xsl:element name="{$ns}:table"> --> <xsl:for-each select="*[local-name() = 'dl'][1]"> <tbody> <xsl:apply-templates mode="dl"/> </tbody> </xsl:for-each> - <!-- </xsl:element> --> - </xsl:variable> - - <xsl:call-template name="calculate-column-widths"> - <xsl:with-param name="cols-count" select="2"/> - <xsl:with-param name="table" select="$html-table"/> - </xsl:call-template> - - </xsl:if> - </xsl:variable> - - - <xsl:variable name="maxlength_dt"> - <xsl:for-each select="*[local-name() = 'dl'][1]"> - <xsl:call-template name="getMaxLength_dt"/> - </xsl:for-each> - </xsl:variable> - - <xsl:if test="xalan:nodeset($references)//fn"> + </xsl:variable> + + <xsl:call-template name="calculate-column-widths"> + <xsl:with-param name="cols-count" select="2"/> + <xsl:with-param name="table" select="$html-table"/> + </xsl:call-template> + + </xsl:if> + </xsl:variable> + + <xsl:variable name="maxlength_dt"> + <xsl:for-each select="*[local-name() = 'dl'][1]"> + <xsl:call-template name="getMaxLength_dt"/> + </xsl:for-each> + </xsl:variable> + <fo:block> <fo:table width="95%" table-layout="fixed"> <xsl:if test="normalize-space($key_iso) = 'true'"> <xsl:attribute name="font-size">10pt</xsl:attribute> @@ -4106,24 +4169,22 @@ <xsl:variable name="reference" select="@reference"/> <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note--> <fo:table-row> <fo:table-cell> <fo:block> - <fo:inline font-size="80%" padding-right="5mm" vertical-align="super" id="{@id}"> - + <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fn-number-style"> <xsl:value-of select="@reference"/> </fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> - <fo:block text-align="justify" margin-bottom="12pt"> - + <fo:block xsl:use-attribute-sets="figure-fn-body-style"> <xsl:if test="normalize-space($key_iso) = 'true'"> - <xsl:attribute name="margin-bottom">0</xsl:attribute> + + <xsl:attribute name="margin-bottom">0</xsl:attribute> + </xsl:if> - - <!-- <xsl:apply-templates /> --> <xsl:copy-of select="./node()"/> </fo:block> </fo:table-cell> </fo:table-row> </xsl:if> @@ -4132,25 +4193,16 @@ </fo:table> </fo:block> </xsl:if> </xsl:template><xsl:template match="*[local-name()='fn']"> - <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> --> - <fo:inline font-size="80%" keep-with-previous.within-line="always"> + <fo:inline xsl:use-attribute-sets="fn-reference-style"> + - - - - <xsl:attribute name="vertical-align">super</xsl:attribute> - <xsl:attribute name="color">blue</xsl:attribute> - - - - <fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id--> <xsl:value-of select="@reference"/> @@ -4166,15 +4218,15 @@ </xsl:template><xsl:template match="*[local-name()='dl']"> <xsl:variable name="isAdded" select="@added"/> <xsl:variable name="isDeleted" select="@deleted"/> <fo:block-container> - <xsl:if test="not(ancestor::*[local-name() = 'quote'])"> - <xsl:attribute name="margin-left">0mm</xsl:attribute> - </xsl:if> + <xsl:if test="not(ancestor::*[local-name() = 'quote'])"> + <xsl:attribute name="margin-left">0mm</xsl:attribute> + </xsl:if> + - <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> <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise> @@ -4186,39 +4238,38 @@ <xsl:call-template name="setTrackChangesStyles"> <xsl:with-param name="isAdded" select="$isAdded"/> <xsl:with-param name="isDeleted" select="$isDeleted"/> </xsl:call-template> - <fo:block-container> + <fo:block-container margin-left="0mm"> + - <xsl:attribute name="margin-left">0mm</xsl:attribute> - <xsl:attribute name="margin-right">0mm</xsl:attribute> + <xsl:attribute name="margin-right">0mm</xsl:attribute> + - <xsl:variable name="parent" select="local-name(..)"/> <xsl:variable name="key_iso"> <!-- and (not(../@class) or ../@class !='pseudocode') --> </xsl:variable> <xsl:choose> <xsl:when test="$parent = 'formula' and count(*[local-name()='dt']) = 1"> <!-- only one component --> - - <fo:block margin-bottom="12pt" text-align="left"> - - <xsl:variable name="title-where"> - <xsl:call-template name="getLocalizedString"> - <xsl:with-param name="key">where</xsl:with-param> - </xsl:call-template> - </xsl:variable> - <xsl:value-of select="$title-where"/><xsl:text> </xsl:text> - <xsl:apply-templates select="*[local-name()='dt']/*"/> - <xsl:text/> - <xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/> - </fo:block> - + <fo:block margin-bottom="12pt" text-align="left"> + + <xsl:variable name="title-where"> + <xsl:call-template name="getLocalizedString"> + <xsl:with-param name="key">where</xsl:with-param> + </xsl:call-template> + </xsl:variable> + <xsl:value-of select="$title-where"/><xsl:text> </xsl:text> + <xsl:apply-templates select="*[local-name()='dt']/*"/> + <xsl:text/> + <xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/> + </fo:block> + </xsl:when> <xsl:when test="$parent = 'formula'"> <!-- a few components --> <fo:block margin-bottom="12pt" text-align="left"> @@ -4256,13 +4307,10 @@ <xsl:if test="$parent = 'figure' or $parent = 'formula'"> <xsl:attribute name="margin-left">7.4mm</xsl:attribute> </xsl:if> - <xsl:if test="$parent = 'li'"> - <!-- <xsl:attribute name="margin-left">-4mm</xsl:attribute> --> - </xsl:if> <fo:block> @@ -4270,13 +4318,11 @@ <fo:table width="95%" table-layout="fixed"> <xsl:choose> - <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"> - <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> --> - </xsl:when> + <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/> <xsl:when test="normalize-space($key_iso) = 'true'"> <xsl:attribute name="font-size">10pt</xsl:attribute> </xsl:when> </xsl:choose> @@ -4293,16 +4339,13 @@ <xsl:otherwise> <xsl:value-of select="substring-before(name(/*), '-')"/> </xsl:otherwise> </xsl:choose> </xsl:variable> - <!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> --> - <!-- <xsl:element name="{$ns}:table"> --> - <tbody> - <xsl:apply-templates mode="dl"/> - </tbody> - <!-- </xsl:element> --> + <tbody> + <xsl:apply-templates mode="dl"/> + </tbody> </xsl:variable> <!-- html-table<xsl:copy-of select="$html-table"/> --> <xsl:variable name="colwidths"> <xsl:call-template name="calculate-column-widths"> <xsl:with-param name="cols-count" select="2"/> @@ -4378,12 +4421,10 @@ </xsl:otherwise> </xsl:choose> </xsl:for-each> </xsl:otherwise> </xsl:choose> - <!-- <fo:table-column column-width="15%"/> - <fo:table-column column-width="85%"/> --> </xsl:otherwise> </xsl:choose> </xsl:template><xsl:template name="getMaxLength_dt"> <xsl:variable name="lengths"> <xsl:for-each select="*[local-name()='dt']"> @@ -4394,16 +4435,10 @@ </xsl:variable> <length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length> </xsl:for-each> </xsl:variable> <xsl:variable name="maxLength"> - <!-- <xsl:for-each select="*[local-name()='dt']"> - <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/> - <xsl:if test="position() = 1"> - <xsl:value-of select="string-length(normalize-space(.))"/> - </xsl:if> - </xsl:for-each> --> <xsl:for-each select="xalan:nodeset($lengths)/length"> <xsl:sort select="." data-type="number" order="descending"/> <xsl:if test="position() = 1"> <xsl:value-of select="."/> </xsl:if> @@ -4425,106 +4460,67 @@ <fo:table-cell> <fo:block margin-top="6pt"> <xsl:if test="normalize-space($key_iso) = 'true'"> <xsl:attribute name="margin-top">0</xsl:attribute> </xsl:if> - <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/> + <xsl:apply-templates select="*[local-name() = 'name']"/> </fo:block> </fo:table-cell> <fo:table-cell> <fo:block> - <xsl:apply-templates/> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> </fo:table-cell> </fo:table-row> </xsl:template><xsl:template match="*[local-name()='dt']" mode="dl"> <tr> <td> <xsl:apply-templates/> </td> <td> - - <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/> - + <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/> + </td> </tr> </xsl:template><xsl:template match="*[local-name()='dt']"> <xsl:param name="key_iso"/> - <fo:table-row> - - + <fo:table-row xsl:use-attribute-sets="dt-row-style"> <fo:table-cell> <xsl:if test="ancestor::*[1][local-name() = 'dl']/preceding-sibling::*[1][local-name() = 'formula']"> <xsl:attribute name="padding-right">3mm</xsl:attribute> </xsl:if> - <fo:block margin-top="6pt"> + <fo:block xsl:use-attribute-sets="dt-style"> <xsl:copy-of select="@id"/> - <xsl:if test="normalize-space($key_iso) = 'true'"> <xsl:attribute name="margin-top">0</xsl:attribute> - </xsl:if> - - <xsl:if test="ancestor::*[1][local-name() = 'dl']/preceding-sibling::*[1][local-name() = 'formula']"> <xsl:attribute name="text-align">right</xsl:attribute> </xsl:if> - - <xsl:apply-templates/> - <!-- <xsl:if test="$namespace = 'gb'"> - <xsl:if test="ancestor::*[local-name()='formula']"> - <xsl:text>—</xsl:text> - </xsl:if> - </xsl:if> --> </fo:block> </fo:table-cell> <fo:table-cell> <fo:block> <xsl:attribute name="text-align">justify</xsl:attribute> - <!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'"> - <xsl:if test="local-name(*[1]) != 'stem'"> - <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/> - </xsl:if> - </xsl:if> --> - - <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/> - + + <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/> </fo:block> </fo:table-cell> </fo:table-row> - <!-- <xsl:if test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'"> - <xsl:if test="local-name(*[1]) = 'stem'"> - <fo:table-row> - <fo:table-cell> - <fo:block margin-top="6pt"> - <xsl:if test="normalize-space($key_iso) = 'true'"> - <xsl:attribute name="margin-top">0</xsl:attribute> - </xsl:if> - <xsl:text>&#xA0;</xsl:text> - </fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block> - <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/> - </fo:block> - </fo:table-cell> - </fo:table-row> - </xsl:if> - </xsl:if> --> </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process"> <xsl:apply-templates/> </xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process"> <xsl:apply-templates select="@language"/> <xsl:apply-templates/> @@ -4549,10 +4545,11 @@ <fo:inline font-size="80%" vertical-align="sub"> <xsl:apply-templates/> </fo:inline> </xsl:template><xsl:template match="*[local-name()='tt']"> <fo:inline xsl:use-attribute-sets="tt-style"> + <xsl:variable name="_font-size"> @@ -4585,19 +4582,25 @@ </xsl:template><xsl:template match="*[local-name()='underline']"> <fo:inline text-decoration="underline"> <xsl:apply-templates/> </fo:inline> </xsl:template><xsl:template match="*[local-name()='add']"> + <xsl:param name="skip">true</xsl:param> <xsl:choose> <xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start --> - <fo:inline> - <xsl:call-template name="insertTag"> - <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end --> - <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C --> - <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C --> - </xsl:call-template> - </fo:inline> + <xsl:choose> + <xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab'])) and ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when> + <xsl:otherwise> + <fo:inline> + <xsl:call-template name="insertTag"> + <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end --> + <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C --> + <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C --> + </xsl:call-template> + </fo:inline> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:when test="@amendment"> <fo:inline> <xsl:call-template name="insertTag"> <xsl:with-param name="kind">A</xsl:with-param> @@ -4636,12 +4639,10 @@ <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"/> <fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-20%"><!-- alignment-baseline="middle" --> - <!-- <xsl:attribute name="width">7mm</xsl:attribute> - <xsl:attribute name="content-height">100%</xsl:attribute> --> <xsl:attribute name="height">5mm</xsl:attribute> <xsl:attribute name="content-width">100%</xsl:attribute> <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute> <xsl:attribute name="scaling">uniform</xsl:attribute> <svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80"> @@ -4855,18 +4856,10 @@ <xsl:apply-templates select="xalan:nodeset($simple-table-colspan)" mode="simple-table-rowspan"/> </xsl:variable> <xsl:copy-of select="xalan:nodeset($simple-table-rowspan)"/> - <!-- <xsl:choose> - <xsl:when test="current()//*[local-name()='th'][@colspan] or current()//*[local-name()='td'][@colspan] "> - - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="current()"/> - </xsl:otherwise> - </xsl:choose> --> </xsl:variable> <xsl:copy-of select="$simple-table"/> </xsl:template><xsl:template match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan"> <xsl:apply-templates mode="simple-table-colspan"/> </xsl:template><xsl:template match="*[local-name()='fn']" mode="simple-table-colspan"/><xsl:template match="*[local-name()='th'] | *[local-name()='td']" mode="simple-table-colspan"> @@ -4981,23 +4974,19 @@ <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, ' ')"/> - <!-- <xsl:value-of select="translate(substring($substr, 1, 1), $lower, $upper)"/> - <xsl:value-of select="substring($substr, 2)"/> --> <xsl:call-template name="capitalize"> <xsl:with-param name="str" select="$substr"/> </xsl:call-template> <xsl:text> </xsl:text> <xsl:call-template name="capitalizeWords"> <xsl:with-param name="str" select="substring-after($str2, ' ')"/> </xsl:call-template> </xsl:when> <xsl:otherwise> - <!-- <xsl:value-of select="translate(substring($str2, 1, 1), $lower, $upper)"/> - <xsl:value-of select="substring($str2, 2)"/> --> <xsl:call-template name="capitalize"> <xsl:with-param name="str" select="$str2"/> </xsl:call-template> </xsl:otherwise> </xsl:choose> @@ -5021,10 +5010,11 @@ <xsl:variable name="mathml"> <xsl:apply-templates select="." mode="mathml"/> </xsl:variable> <fo:instream-foreign-object fox:alt-text="Math"> + <xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/> <xsl:variable name="comment_text_"> <xsl:choose> @@ -5052,11 +5042,11 @@ <xsl:attribute name="fox:actual-text"> <xsl:value-of select="$mathml_content"/> </xsl:attribute> - <!-- <xsl:copy-of select="."/> --> + <xsl:copy-of select="xalan:nodeset($mathml)"/> </fo:instream-foreign-object> </fo:inline> </xsl:template><xsl:template match="mathml:*" mode="mathml_actual_text"> <!-- <xsl:text>a+b</xsl:text> --> @@ -5111,10 +5101,14 @@ </xsl:variable> <fo:inline xsl:use-attribute-sets="link-style"> + + + + <xsl:choose> <xsl:when test="$target_text = ''"> <xsl:apply-templates/> </xsl:when> <xsl:otherwise> @@ -5168,11 +5162,10 @@ <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 match="*[local-name() = 'xref']"> <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style"> - <xsl:apply-templates/> </fo:basic-link> </xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula"> <fo:block-container margin-left="0mm"> <xsl:if test="parent::*[local-name() = 'note']"> @@ -5196,57 +5189,72 @@ </fo:inline> </xsl:template><xsl:template match="*[local-name() = 'admitted']/*[local-name() = 'stem']"> <fo:inline> <xsl:apply-templates/> </fo:inline> - </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="presentation"> + </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="formula_number"> <!-- show by demand --> <xsl:if test="normalize-space() != ''"> <xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text> </xsl:if> </xsl:template><xsl:template match="*[local-name() = 'note']" name="note"> <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style"> + + + + + + <fo:block-container margin-left="0mm"> + + - - - - - <fo:block> + <fo:block> + + - <xsl:if test="ancestor::itu:figure"> - <xsl:attribute name="keep-with-previous">always</xsl:attribute> - </xsl:if> - - - - - - - <fo:inline xsl:use-attribute-sets="note-name-style"> - <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/> - </fo:inline> - <xsl:apply-templates/> - </fo:block> - - + <xsl:if test="ancestor::itu:figure"> + <xsl:attribute name="keep-with-previous">always</xsl:attribute> + </xsl:if> + + + + + <fo:inline xsl:use-attribute-sets="note-name-style"> + + + + <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name--> + <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"> + <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]"> + <xsl:with-param name="skip">false</xsl:with-param> + </xsl:apply-templates> + </xsl:if> + + <xsl:apply-templates select="*[local-name() = 'name']"/> + + </fo:inline> + + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> + </fo:block> + </fo:block-container> </fo:block-container> </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']"> <xsl:variable name="num"><xsl:number/></xsl:variable> <xsl:choose> - <xsl:when test="$num = 1"> + <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"> <xsl:apply-templates/> </fo:inline> </xsl:when> <xsl:otherwise> @@ -5257,16 +5265,20 @@ </xsl:choose> </xsl:template><xsl:template match="*[local-name() = 'termnote']"> <fo:block id="{@id}" xsl:use-attribute-sets="termnote-style"> <fo:inline xsl:use-attribute-sets="termnote-name-style"> + - <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/> + + <xsl:apply-templates select="*[local-name() = 'name']"/> + </fo:inline> - <xsl:apply-templates/> + + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> - </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name'] | *[local-name() = 'termnote']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']" mode="presentation"> + </xsl:template><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"/> @@ -5281,11 +5293,11 @@ </xsl:variable> <xsl:if test="normalize-space() != ''"> <xsl:apply-templates/> <xsl:value-of select="$suffix"/> </xsl:if> - </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']" mode="presentation"> + </xsl:template><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"/> @@ -5308,29 +5320,27 @@ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> --> <fo:block id="{@id}"> <xsl:apply-templates/> </fo:block> </xsl:template><xsl:template match="*[local-name() = 'term']"> - <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> --> <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/> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> - </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation"> + </xsl:template><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}"> <xsl:apply-templates/> - <!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'"> - <xsl:text>.</xsl:text> - </xsl:if> --> </fo:inline> </xsl:if> </xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure"> <xsl:variable name="isAdded" select="@added"/> <xsl:variable name="isDeleted" select="@deleted"/> @@ -5339,28 +5349,30 @@ <xsl:call-template name="setTrackChangesStyles"> <xsl:with-param name="isAdded" select="$isAdded"/> <xsl:with-param name="isDeleted" select="$isDeleted"/> </xsl:call-template> - <fo:block> - - <xsl:apply-templates/> + + + <fo:block xsl:use-attribute-sets="figure-style"> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> <xsl:call-template name="fn_display_figure"/> <xsl:for-each select="*[local-name() = 'note']"> <xsl:call-template name="note"/> </xsl:for-each> - <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/> + <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image --> + </fo:block-container> </xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']"> <fo:block id="{@id}"> - <xsl:apply-templates/> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> - <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/> + <xsl:apply-templates select="*[local-name() = 'name']"/> </xsl:template><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><xsl:template match="*[local-name() = 'image']"> @@ -5463,13 +5475,11 @@ <xsl:variable name="decoder" select="java:java.util.Base64.getDecoder()"/> <xsl:variable name="fileContent" select="java:decode($decoder, $base64String)"/> <xsl:variable name="bis" select="java:java.io.ByteArrayInputStream.new($fileContent)"/> <xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($bis)"/> <xsl:variable name="width" select="java:getWidth($bufferedImage)"/> - <!-- width=<xsl:value-of select="$width"/> --> <xsl:variable name="height" select="java:getHeight($bufferedImage)"/> - <!-- height=<xsl:value-of select="$height"/> --> <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 595.28 841.89;" height="{$height}" width="{$width}" viewBox="0 0 {$width} {$height}" y="0px" x="0px" id="Layer_1" version="1.1"> <image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{@src}" height="{$height}" width="{$width}" style="overflow:visible;"/> <xsl:call-template name="svg_cross"> <xsl:with-param name="width" select="$width"/> <xsl:with-param name="height" select="$height"/> @@ -5735,11 +5745,11 @@ <fo:block> </fo:block></fo:block-container> </fo:inline-container> </fo:basic-link> </fo:block> </fo:block-container> - </xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><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:template><xsl:template match="*[local-name() = 'emf']"/><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 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> @@ -5888,12 +5898,10 @@ - - </fo:bookmark-tree> </xsl:if> </xsl:template><xsl:template name="insertFigureBookmarks"> <xsl:param name="contents"/> <xsl:if test="xalan:nodeset($contents)/figure"> @@ -5960,11 +5968,11 @@ </xsl:when> <xsl:otherwise> <xsl:apply-templates mode="bookmark"/> </xsl:otherwise> </xsl:choose> - </xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation"> + </xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><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:apply-templates/> @@ -5976,16 +5984,10 @@ <xsl:with-param name="mode" select="$mode"/> </xsl:apply-templates> <!-- <xsl:text> </xsl:text> --> </xsl:template><xsl:template name="getSection"> <xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/> - <!-- - <xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"> - <xsl:value-of select="."/> - </xsl:for-each> - --> - </xsl:template><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> @@ -6050,20 +6052,25 @@ </xsl:template><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 match="*[local-name() = 'add'][starts-with(text(), $ace_tag)]" mode="contents_item"> + </xsl:template><xsl:template match="*[local-name() = 'add']" mode="contents_item"> <xsl:param name="mode">bookmarks</xsl:param> - <xsl:if test="$mode = 'contents'"> - <xsl:copy> - <xsl:apply-templates mode="contents_item"/> - </xsl:copy> - </xsl:if> + <xsl:choose> + <xsl:when test="starts-with(text(), $ace_tag)"> + <xsl:if test="$mode = 'contents'"> + <xsl:copy> + <xsl:apply-templates mode="contents_item"/> + </xsl:copy> + </xsl:if> + </xsl:when> + <xsl:otherwise><xsl:apply-templates mode="contents_item"/></xsl:otherwise> + </xsl:choose> </xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode"> - <fo:block-container margin-left="0mm"> + <fo:block-container xsl:use-attribute-sets="sourcecode-container-style"> <xsl:copy-of select="@id"/> <xsl:if test="parent::*[local-name() = 'note']"> <xsl:attribute name="margin-left"> <xsl:choose> @@ -6096,10 +6103,11 @@ </xsl:variable> + <xsl:variable name="font-size" select="normalize-space($_font-size)"/> <xsl:if test="$font-size != ''"> <xsl:attribute name="font-size"> <xsl:choose> <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when> @@ -6112,15 +6120,15 @@ - <xsl:apply-templates/> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> - <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/> + <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content --> </fo:block-container> @@ -6130,22 +6138,22 @@ <xsl:call-template name="add-zero-spaces-equal"/> </xsl:variable> <xsl:call-template name="add-zero-spaces-java"> <xsl:with-param name="text" select="$text"/> </xsl:call-template> - </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="presentation"> + </xsl:template><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> </xsl:template><xsl:template match="*[local-name() = 'permission']"> <fo:block id="{@id}" xsl:use-attribute-sets="permission-style"> - <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/> - <xsl:apply-templates/> + <xsl:apply-templates select="*[local-name()='name']"/> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> - </xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']" mode="presentation"> + </xsl:template><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> @@ -6154,52 +6162,52 @@ <fo:block xsl:use-attribute-sets="permission-label-style"> <xsl:apply-templates/> </fo:block> </xsl:template><xsl:template match="*[local-name() = 'requirement']"> <fo:block id="{@id}" xsl:use-attribute-sets="requirement-style"> - <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/> - <xsl:apply-templates select="*[local-name()='label']" mode="presentation"/> - <xsl:apply-templates select="@obligation" mode="presentation"/> - <xsl:apply-templates select="*[local-name()='subject']" mode="presentation"/> - <xsl:apply-templates/> + <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 match="*[local-name() = 'requirement']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']" mode="presentation"> + </xsl:template><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 match="*[local-name() = 'requirement']/*[local-name() = 'label']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']" mode="presentation"> + </xsl:template><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 match="*[local-name() = 'requirement']/@obligation" mode="presentation"> + </xsl:template><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 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><xsl:template match="*[local-name() = 'recommendation']"> <fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style"> - <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/> - <xsl:apply-templates/> + <xsl:apply-templates select="*[local-name()='name']"/> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> - </xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']" mode="presentation"> + </xsl:template><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 match="*[local-name() = 'recommendation']/*[local-name() = 'label']"> <fo:block xsl:use-attribute-sets="recommendation-label-style"> <xsl:apply-templates/> </fo:block> - </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation"> - <fo:block xsl:use-attribute-sets="subject-style"> - <xsl:text>Target Type </xsl:text><xsl:apply-templates/> - </fo:block> </xsl:template><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 match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']"> @@ -6239,22 +6247,20 @@ <xsl:variable name="simple-table"> <xsl:call-template name="getSimpleTable"/> </xsl:variable> <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/> <xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])"> - <!-- <fo:table-column column-width="35mm"/> - <fo:table-column column-width="115mm"/> --> <fo:table-column column-width="30%"/> <fo:table-column column-width="70%"/> </xsl:if> <xsl:apply-templates mode="requirement"/> </fo:table> <!-- fn processing --> <xsl:if test=".//*[local-name() = 'fn']"> <xsl:for-each select="*[local-name() = 'tbody']"> <fo:block font-size="90%" border-bottom="1pt solid black"> - <xsl:call-template name="fn_display"/> + <xsl:call-template name="table_fn_display"/> </fo:block> </xsl:for-each> </xsl:if> </fo:block-container> </fo:block-container> @@ -6267,11 +6273,10 @@ <xsl:apply-templates mode="requirement"/> </fo:table-body> </xsl:template><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']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) --> - <!-- <xsl:attribute name="border">1pt solid black</xsl:attribute> --> <xsl:attribute name="background-color">rgb(33, 55, 92)</xsl:attribute> </xsl:if> <xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')"> <xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute> </xsl:if> @@ -6280,38 +6285,15 @@ </xsl:if> <xsl:apply-templates mode="requirement"/> </fo:table-row> </xsl:template><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:attribute name="text-align"> - <xsl:choose> - <xsl:when test="@align"> - <xsl:value-of select="@align"/> - </xsl:when> - <xsl:otherwise>left</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:if test="@colspan"> - <xsl:attribute name="number-columns-spanned"> - <xsl:value-of select="@colspan"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="@rowspan"> - <xsl:attribute name="number-rows-spanned"> - <xsl:value-of select="@rowspan"/> - </xsl:attribute> - </xsl:if> - <xsl:call-template name="display-align"/> + <xsl:call-template name="setTextAlignment"> + <xsl:with-param name="default">left</xsl:with-param> + </xsl:call-template> - <!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'"> - <xsl:attribute name="padding-top">0.5mm</xsl:attribute> - <xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute> - </xsl:if> - <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'"> - <xsl:attribute name="padding-top">0.5mm</xsl:attribute> - <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute> - </xsl:if> --> + <xsl:call-template name="setTableCellAttributes"/> <fo:block> <xsl:apply-templates/> </fo:block> </fo:table-cell> @@ -6319,41 +6301,19 @@ <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> - <xsl:attribute name="text-align"> - <xsl:choose> - <xsl:when test="@align"> - <xsl:value-of select="@align"/> - </xsl:when> - <xsl:otherwise>left</xsl:otherwise> - </xsl:choose> - </xsl:attribute> + <xsl:call-template name="setTextAlignment"> + <xsl:with-param name="default">left</xsl:with-param> + </xsl:call-template> + <xsl:if test="following-sibling::*[local-name()='td'] and not(preceding-sibling::*[local-name()='td'])"> <xsl:attribute name="font-weight">bold</xsl:attribute> </xsl:if> - <xsl:if test="@colspan"> - <xsl:attribute name="number-columns-spanned"> - <xsl:value-of select="@colspan"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="@rowspan"> - <xsl:attribute name="number-rows-spanned"> - <xsl:value-of select="@rowspan"/> - </xsl:attribute> - </xsl:if> - <xsl:call-template name="display-align"/> - <!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'"> - <xsl:attribute name="padding-left">0.5mm</xsl:attribute> - <xsl:attribute name="padding-top">0.5mm</xsl:attribute> - <xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])"> - <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute> - </xsl:if> - </xsl:if> --> - <!-- 2nd line and below --> + <xsl:call-template name="setTableCellAttributes"/> <fo:block> <xsl:apply-templates/> </fo:block> </fo:table-cell> @@ -6361,19 +6321,19 @@ <fo:block font-size="11pt"> <xsl:apply-templates/> </fo:block> </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]"> - <fo:block> <!-- margin-bottom="10pt" --> + <fo:block> <xsl:apply-templates/> </fo:block> </xsl:template><xsl:template match="*[local-name() = 'termexample']"> <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style"> - <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/> - <xsl:apply-templates/> + <xsl:apply-templates select="*[local-name()='name']"/> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> - </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']" mode="presentation"> + </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']"> <xsl:if test="normalize-space() != ''"> <fo:inline xsl:use-attribute-sets="termexample-name-style"> <xsl:apply-templates/> </fo:inline> </xsl:if> @@ -6395,13 +6355,11 @@ <fo:block id="{@id}" xsl:use-attribute-sets="example-style"> <xsl:variable name="fo_element"> <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl']">block</xsl:if> - block - - + block </xsl:variable> <!-- display 'EXAMPLE' --> <xsl:apply-templates select="*[local-name()='name']"> <xsl:with-param name="fo_element" select="$fo_element"/> @@ -6470,10 +6428,12 @@ </xsl:otherwise> </xsl:choose> </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource"> <fo:block xsl:use-attribute-sets="termsource-style"> + + <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] --> <xsl:variable name="termsource_text"> <xsl:apply-templates/> </xsl:variable> <xsl:copy-of select="$termsource_text"/> @@ -6507,13 +6467,11 @@ </xsl:template><xsl:template match="*[local-name() = 'termsource']/text()"> <xsl:if test="normalize-space() != ''"> <xsl:value-of select="."/> </xsl:if> </xsl:template><xsl:template match="*[local-name() = 'termsource']/*[local-name() = 'strong'][1][following-sibling::*[1][local-name() = 'origin']]/text()"> - <fo:inline> - - + <fo:inline xsl:use-attribute-sets="termsource-text-style"> <xsl:value-of select="."/> </fo:inline> </xsl:template><xsl:template match="*[local-name() = 'origin']"> <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}"> <xsl:if test="normalize-space(@citeas) = ''"> @@ -6552,11 +6510,10 @@ <fo:block-container margin-left="0mm"> <fo:block xsl:use-attribute-sets="quote-style"> - <!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> --> <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source --> </fo:block> <xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']"> <fo:block xsl:use-attribute-sets="quote-source-style"> @@ -6595,20 +6552,18 @@ <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:choose> - <xsl:when test="normalize-space($bibitemid) != ''"> + <xsl:when test="normalize-space($bibitemid) != ''"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link --> <fo:inline xsl:use-attribute-sets="eref-style"> <xsl:if test="@type = 'footnote'"> + <xsl:attribute name="keep-together.within-line">always</xsl:attribute> + <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute> + <xsl:attribute name="vertical-align">super</xsl:attribute> + <xsl:attribute name="font-size">80%</xsl:attribute> - <xsl:attribute name="keep-together.within-line">always</xsl:attribute> - <xsl:attribute name="font-size">80%</xsl:attribute> - <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute> - <xsl:attribute name="vertical-align">super</xsl:attribute> - - </xsl:if> <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()"/> @@ -6620,11 +6575,10 @@ </xsl:if> <xsl:if test="@type = 'inline'"> - </xsl:if> <xsl:apply-templates/> @@ -6681,12 +6635,10 @@ <xsl:value-of select="normalize-space($padding)"/> </xsl:otherwise> </xsl:choose> </xsl:variable> - <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> --> - <xsl:choose> <xsl:when test="$lang = 'zh'"> <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline> </xsl:when> <xsl:when test="../../@inline-header = 'true'"> @@ -6738,11 +6690,10 @@ </fo:block> </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]"> <xsl:apply-templates/> </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]"> <fo:inline> <xsl:apply-templates/></fo:inline> - <!-- <fo:block>&#xA0;</fo:block> --> <fo:block/> </xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2"> <fo:block> <xsl:call-template name="setId"/> @@ -6788,15 +6739,10 @@ </fo:block> </xsl:template><xsl:template match="*[local-name() = 'definitions']"> <fo:block id="{@id}"> <xsl:apply-templates/> </fo:block> - </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']"> - - <fo:block id="{@id}"> - <xsl:apply-templates/> - </fo:block> </xsl:template><xsl:template match="*[local-name() = 'annex']"> <fo:block break-after="page"/> <fo:block id="{@id}"> </fo:block> @@ -7055,36 +7001,128 @@ </fo:table-row> </xsl:template><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><xsl:apply-templates/></fo:block> </fo:table-cell> - </xsl:template><xsl:template name="processBibitem"> + </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/><xsl:template match="*[local-name() = 'references'][@normative='true']" priority="2"> + <fo:block id="{@id}"> + <xsl:apply-templates/> + </fo:block> + </xsl:template><xsl:template match="*[local-name() = 'references']"> + <xsl:if test="not(ancestor::*[local-name() = 'annex'])"> + + <fo:block break-after="page"/> + + </xsl:if> + <!-- <xsl:if test="ancestor::*[local-name() = 'annex']"> + <xsl:if test="$namespace = 'csa' or $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'itu'"> + <fo:block break-after="page"/> + </xsl:if> + </xsl:if> --> + <fo:block id="{@id}" xsl:use-attribute-sets="references-non-normative-style"> + <xsl:apply-templates/> + </fo:block> + </xsl:template><xsl:template match="*[local-name() = 'bibitem']"> + <xsl:call-template name="bibitem"/> + </xsl:template><xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2"> - - - - + <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style"> + <xsl:call-template name="processBibitem"/> + </fo:block> + + </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2"> - - <!-- end MPFD bibitem processing --> + <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style"> + <xsl:call-template name="processBibitem"/> + </fo:block> + - <!-- start M3D bibitem processing --> + </xsl:template><xsl:template name="processBibitem"> - - + + <!-- Example: [ITU-T A.23] ITU-T A.23, Recommendation ITU-T A.23, Annex A (2014), Guide for ITU-T and ISO/IEC JTC 1 cooperation. --> + <xsl:if test="$doctype = 'implementers-guide'"> + <xsl:attribute name="margin-left">0mm</xsl:attribute> + <xsl:attribute name="text-indent">0mm</xsl:attribute> + </xsl:if> + + <xsl:variable name="bibitem_label"> + <xsl:choose> + <xsl:when test="itu:docidentifier[@type = 'metanorma']"> + <xsl:value-of select="itu:docidentifier[@type = 'metanorma']"/> + </xsl:when> + <xsl:otherwise> + <fo:inline padding-right="5mm"> + <xsl:text>[</xsl:text> + <xsl:value-of select="itu:docidentifier[not(@type = 'metanorma-ordinal')]"/> + <xsl:text>] </xsl:text> + </fo:inline> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="bibitem_body"> + <xsl:text> </xsl:text> + <xsl:choose> + <xsl:when test="itu:docidentifier[@type = 'metanorma']"> + <xsl:if test="itu:docidentifier[not(@type) or not(@type = 'metanorma' or @type = 'metanorma-ordinal')]"> + <xsl:value-of select="itu:docidentifier[not(@type) or not(@type = 'metanorma' or @type = 'metanorma-ordinal')]"/> + <xsl:text>, </xsl:text> + </xsl:if> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="itu:docidentifier[not(@type = 'metanorma-ordinal')]"/> + <xsl:if test="itu:title"> + <xsl:text>, </xsl:text> + </xsl:if> + </xsl:otherwise> + </xsl:choose> + <xsl:if test="itu:title"> + <xsl:choose> + <xsl:when test="itu:title[@type = 'main' and @language = 'en']"> + <xsl:apply-templates select="itu:title[@type = 'main' and @language = 'en']"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="itu:title"/> + </xsl:otherwise> + </xsl:choose> + </xsl:if> + <xsl:if test="itu:formattedref and not(itu:docidentifier[@type = 'metanorma'])">, </xsl:if> + <xsl:apply-templates select="itu:formattedref"/> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$doctype = 'implementers-guide'"> + <fo:table width="100%" table-layout="fixed"> + <fo:table-column column-width="20%"/> + <fo:table-column column-width="80%"/> + <fo:table-body> + <fo:table-row> + <fo:table-cell><fo:block><xsl:copy-of select="$bibitem_label"/></fo:block></fo:table-cell> + <fo:table-cell><fo:block><xsl:copy-of select="$bibitem_body"/></fo:block></fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$bibitem_label"/> + <xsl:copy-of select="$bibitem_body"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template><xsl:template name="processBibitemDocId"> <xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/> <xsl:choose> <xsl:when test="normalize-space($_doc_ident) != ''"> <!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/> @@ -7137,10 +7175,52 @@ <xsl:value-of select="translate(.,'. ','')"/> </xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip"> <xsl:value-of select="substring(.,1,1)"/> </xsl:template><xsl:template match="*[local-name() = 'title']" mode="title"> <fo:inline><xsl:apply-templates/></fo:inline> + </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'title']" priority="2"> + <!-- <fo:inline><xsl:apply-templates /></fo:inline> --> + <fo:inline font-style="italic"> <!-- BIPM BSI CSD CSA GB IEC IHO ISO ITU JCGM --> + <xsl:apply-templates/> + </fo:inline> + </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" priority="2"> + <fo:footnote> + <xsl:variable name="number"> + + <xsl:number level="any" count="*[local-name() = 'bibitem']/*[local-name() = 'note']"/> + + </xsl:variable> + <fo:inline xsl:use-attribute-sets="bibitem-note-fn-style"> + <fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}"> + <xsl:value-of select="$number"/> + + </fo:basic-link> + </fo:inline> + <fo:footnote-body> + <fo:block xsl:use-attribute-sets="bibitem-note-fn-body-style"> + <fo:inline id="{generate-id()}" xsl:use-attribute-sets="bibitem-note-fn-number-style"> + <xsl:value-of select="$number"/> + + </fo:inline> + <xsl:apply-templates/> + </fo:block> + </fo:footnote-body> + </fo:footnote> + </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'edition']"> <!-- for iho --> + <xsl:text> edition </xsl:text> + <xsl:value-of select="."/> + </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'uri']"> <!-- for iho --> + <xsl:text> (</xsl:text> + <fo:inline xsl:use-attribute-sets="link-style"> + <fo:basic-link external-destination="." fox:alt-text="."> + <xsl:value-of select="."/> + </fo:basic-link> + </fo:inline> + <xsl:text>)</xsl:text> + </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'docidentifier']"/><xsl:template match="*[local-name() = 'formattedref']"> + + <xsl:apply-templates/> </xsl:template><xsl:template match="*[local-name() = 'form']"> <fo:block> <xsl:apply-templates/> </fo:block> </xsl:template><xsl:template match="*[local-name() = 'form']//*[local-name() = 'label']"> @@ -7209,28 +7289,11 @@ <xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[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="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml --> <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml --> <xsl:otherwise><!-- default value --> - - - - - - - 2 - - - - - - - - - - </xsl:otherwise> </xsl:choose> </xsl:variable><xsl:template match="*[local-name() = 'toc']"> <xsl:param name="colwidths"/> <xsl:variable name="colwidths_"> @@ -7324,90 +7387,107 @@ </fo:inline> </xsl:template><xsl:template match="@language"> <xsl:copy-of select="."/> </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4"> <xsl:call-template name="title"/> + </xsl:template><xsl:template match="*[local-name() = 'admonition']"> + + + + + + <!-- text in the box --> + <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style"> + + + + + + <fo:block-container xsl:use-attribute-sets="admonition-container-style"> + + + <fo:block xsl:use-attribute-sets="admonition-name-style"> + <xsl:call-template name="displayAdmonitionName"/> + </fo:block> + <fo:block xsl:use-attribute-sets="admonition-p-style"> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> + </fo:block> + + </fo:block-container> + + </fo:block-container> + + </xsl:template><xsl:template name="displayAdmonitionName"> + + <xsl:apply-templates select="*[local-name() = 'name']"/> + <xsl:if test="not(*[local-name() = 'name'])"> + <xsl:apply-templates select="@type"/> + </xsl:if> + + </xsl:template><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_"> + <xsl:call-template name="getLocalizedString"> + <xsl:with-param name="key">admonition.<xsl:value-of select="."/></xsl:with-param> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="admonition_type" select="normalize-space(java:toUpperCase(java:java.lang.String.new($admonition_type_)))"/> + <xsl:value-of select="$admonition_type"/> + <xsl:if test="$admonition_type = ''"> + <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/> + </xsl:if> + </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']"> + + <fo:block xsl:use-attribute-sets="admonition-p-style"> + + + + <xsl:apply-templates/> + </fo:block> + </xsl:template><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)"/> <xsl:variable name="monthStr"> <xsl:choose> - <xsl:when test="$month = '01'">January</xsl:when> - <xsl:when test="$month = '02'">February</xsl:when> - <xsl:when test="$month = '03'">March</xsl:when> - <xsl:when test="$month = '04'">April</xsl:when> - <xsl:when test="$month = '05'">May</xsl:when> - <xsl:when test="$month = '06'">June</xsl:when> - <xsl:when test="$month = '07'">July</xsl:when> - <xsl:when test="$month = '08'">August</xsl:when> - <xsl:when test="$month = '09'">September</xsl:when> - <xsl:when test="$month = '10'">October</xsl:when> - <xsl:when test="$month = '11'">November</xsl:when> - <xsl:when test="$month = '12'">December</xsl:when> + <xsl:when test="$month = '01'">january</xsl:when> + <xsl:when test="$month = '02'">february</xsl:when> + <xsl:when test="$month = '03'">march</xsl:when> + <xsl:when test="$month = '04'">april</xsl:when> + <xsl:when test="$month = '05'">may</xsl:when> + <xsl:when test="$month = '06'">june</xsl:when> + <xsl:when test="$month = '07'">july</xsl:when> + <xsl:when test="$month = '08'">august</xsl:when> + <xsl:when test="$month = '09'">september</xsl:when> + <xsl:when test="$month = '10'">october</xsl:when> + <xsl:when test="$month = '11'">november</xsl:when> + <xsl:when test="$month = '12'">december</xsl:when> </xsl:choose> </xsl:variable> - <xsl:variable name="result"> - <xsl:choose> - <xsl:when test="$format = 'ddMMyyyy'"> - <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if> - <xsl:text> </xsl:text> - <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/> - </xsl:when> - <xsl:when test="$format = 'ddMM'"> - <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if> - <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/> - </xsl:when> - <xsl:when test="$format = 'short' or $day = ''"> - <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/> - </xsl:otherwise> - </xsl:choose> + <xsl:variable name="monthStr_localized"> + <xsl:if test="normalize-space($monthStr) != ''"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param></xsl:call-template></xsl:if> </xsl:variable> - <xsl:value-of select="$result"/> - </xsl:template><xsl:template name="convertDateLocalized"> - <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)"/> - <xsl:variable name="monthStr"> - <xsl:choose> - <xsl:when test="$month = '01'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_january</xsl:with-param></xsl:call-template></xsl:when> - <xsl:when test="$month = '02'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_february</xsl:with-param></xsl:call-template></xsl:when> - <xsl:when test="$month = '03'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_march</xsl:with-param></xsl:call-template></xsl:when> - <xsl:when test="$month = '04'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_april</xsl:with-param></xsl:call-template></xsl:when> - <xsl:when test="$month = '05'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_may</xsl:with-param></xsl:call-template></xsl:when> - <xsl:when test="$month = '06'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_june</xsl:with-param></xsl:call-template></xsl:when> - <xsl:when test="$month = '07'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_july</xsl:with-param></xsl:call-template></xsl:when> - <xsl:when test="$month = '08'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_august</xsl:with-param></xsl:call-template></xsl:when> - <xsl:when test="$month = '09'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_september</xsl:with-param></xsl:call-template></xsl:when> - <xsl:when test="$month = '10'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_october</xsl:with-param></xsl:call-template></xsl:when> - <xsl:when test="$month = '11'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_november</xsl:with-param></xsl:call-template></xsl:when> - <xsl:when test="$month = '12'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_december</xsl:with-param></xsl:call-template></xsl:when> - </xsl:choose> - </xsl:variable> <xsl:variable name="result"> <xsl:choose> <xsl:when test="$format = 'ddMMyyyy'"> <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if> <xsl:text> </xsl:text> - <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/> + <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ' , $year))"/> </xsl:when> <xsl:when test="$format = 'ddMM'"> <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if> - <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/> + <xsl:text> </xsl:text><xsl:value-of select="$monthStr_localized"/> </xsl:when> <xsl:when test="$format = 'short' or $day = ''"> - <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/> + <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $year))"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/> + <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $day, ', ' , $year))"/> </xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:value-of select="$result"/> </xsl:template><xsl:template name="insertKeywords"> @@ -7456,17 +7536,12 @@ <!-- Dublin Core properties go here --> <dc:title> <xsl:variable name="title"> <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']"> - - - - - - <xsl:value-of select="*[local-name() = 'title'][@type='main']"/> - + <xsl:value-of select="*[local-name() = 'title'][@type='main']"/> + </xsl:for-each> </xsl:variable> <xsl:choose> <xsl:when test="normalize-space($title) != ''"> <xsl:value-of select="$title"/> @@ -7477,25 +7552,22 @@ </xsl:choose> </dc:title> <dc:creator> <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']"> - <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']"> - <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/> - <xsl:if test="position() != last()">; </xsl:if> - </xsl:for-each> - - - + <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']"> + <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/> + <xsl:if test="position() != last()">; </xsl:if> + </xsl:for-each> + </xsl:for-each> </dc:creator> <dc:description> <xsl:variable name="abstract"> - <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/> - - + <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/> + </xsl:variable> <xsl:value-of select="normalize-space($abstract)"/> </dc:description> <pdf:Keywords> <xsl:call-template name="insertKeywords"/> @@ -7511,11 +7583,10 @@ <xsl:choose> <xsl:when test="../@id"> <xsl:value-of select="../@id"/> </xsl:when> <xsl:otherwise> - <!-- <xsl:value-of select="concat(local-name(..), '_', text())"/> --> <xsl:value-of select="concat(generate-id(..), '_', text())"/> </xsl:otherwise> </xsl:choose> </xsl:template><xsl:template name="getLevel"> <xsl:param name="depth"/> @@ -7537,13 +7608,10 @@ <xsl:value-of select="$level_total - 1"/> </xsl:when> <xsl:when test="ancestor::*[local-name() = 'preface']"> <xsl:value-of select="$level_total - 2"/> </xsl:when> - <!-- <xsl:when test="parent::*[local-name() = 'sections']"> - <xsl:value-of select="$level_total - 1"/> - </xsl:when> --> <xsl:when test="ancestor::*[local-name() = 'sections']"> <xsl:value-of select="$level_total - 1"/> </xsl:when> <xsl:when test="ancestor::*[local-name() = 'bibliography']"> <xsl:value-of select="$level_total - 1"/> @@ -7729,11 +7797,10 @@ </xsl:call-template> </xsl:variable> <xsl:value-of select="$key_"/> </xsl:otherwise> </xsl:choose> - </xsl:template><xsl:template name="setTrackChangesStyles"> <xsl:param name="isAdded"/> <xsl:param name="isDeleted"/> <xsl:choose> <xsl:when test="local-name() = 'math'"> @@ -7752,11 +7819,10 @@ <xsl:if test="$isDeleted = 'true'"> <xsl:attribute name="border"><xsl:value-of select="$border-block-deleted"/></xsl:attribute> <xsl:if test="local-name() = 'table'"> <xsl:attribute name="background-color">rgb(255, 185, 185)</xsl:attribute> </xsl:if> - <!-- <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute> --> <xsl:attribute name="padding">2mm</xsl:attribute> </xsl:if> </xsl:otherwise> </xsl:choose> </xsl:template><xsl:variable name="LRM" select="'‎'"/><xsl:variable name="RLM" select="'‏'"/><xsl:template name="setWritingMode"> @@ -7772,18 +7838,21 @@ <xsl:value-of select="$align"/> </xsl:when> </xsl:choose> </xsl:template><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="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when> + <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 != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when> <xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when> <xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when> <xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise> </xsl:choose> </xsl:attribute> - <xsl:if test="@align = 'indent'"> + <xsl:if test="$align = 'indent'"> <xsl:attribute name="margin-left">7mm</xsl:attribute> </xsl:if> </xsl:template><xsl:template name="number-to-words"> <xsl:param name="number"/> <xsl:param name="first"/> \ No newline at end of file