lib/isodoc/m3aawg/m3aawg.policy.xsl in metanorma-m3aawg-2.0.0 vs lib/isodoc/m3aawg/m3aawg.policy.xsl in metanorma-m3aawg-2.0.1

- old
+ new

@@ -37,11 +37,11 @@ <xsl:call-template name="getLang"/> </xsl:variable> <xsl:template match="/"> <xsl:call-template name="namespaceCheck"/> - <fo:root font-family="EB Garamond 12" font-size="12pt" xml:lang="{$lang}"> + <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}"> <fo:layout-master-set> <!-- cover page --> <fo:simple-page-master master-name="cover" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> <fo:region-body margin-top="31mm" margin-bottom="32mm" margin-left="17.3mm" margin-right="22mm"/> @@ -344,15 +344,11 @@ </xsl:template> <!-- ============================= --> <!-- CONTENTS --> <!-- ============================= --> - <xsl:template match="node()" mode="contents"> - <xsl:apply-templates mode="contents"/> - </xsl:template> - - + <!-- element with title --> <xsl:template match="*[m3d:title]" mode="contents"> <xsl:variable name="level"> <xsl:call-template name="getLevel"> <xsl:with-param name="depth" select="m3d:title/@depth"/> @@ -533,11 +529,11 @@ </xsl:template> <!-- ====== --> <!-- ====== --> - <xsl:template match="m3d:p"> + <xsl:template match="m3d:p" name="paragraph"> <xsl:param name="inline" select="'false'"/> <xsl:variable name="previous-element" select="local-name(preceding-sibling::*[1])"/> <xsl:variable name="element-name"> <xsl:choose> <xsl:when test="$inline = 'true'">fo:inline</xsl:when> @@ -591,40 +587,10 @@ <xsl:template match="m3d:p/m3d:fn/m3d:p"> <xsl:apply-templates/> </xsl:template> - <xsl:template match="m3d:bibitem"> - <fo:block id="{@id}" margin-bottom="12pt" text-indent="-11.7mm" margin-left="11.7mm"> <!-- 12 pt --> - <xsl:call-template name="processBibitem"/> - </fo:block> - </xsl:template> - - - <xsl:template match="m3d:bibitem/m3d:note" priority="2"> - <fo:footnote> - <xsl:variable name="number"> - <xsl:number level="any" count="m3d:bibitem/m3d:note"/> - </xsl:variable> - <fo:inline font-size="7pt" keep-with-previous.within-line="always" baseline-shift="30%"> - <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 font-size="9pt" margin-bottom="4pt" start-indent="0pt"> - <fo:inline font-size="6pt" id="{generate-id()}" keep-with-next.within-line="always" baseline-shift="30%" padding-right="1mm"><!-- alignment-baseline="hanging" font-size="60%" --> - <xsl:value-of select="$number"/> - </fo:inline> - <xsl:apply-templates/> - </fo:block> - </fo:footnote-body> - </fo:footnote> - </xsl:template> - - - <xsl:template match="m3d:ul | m3d:ol" mode="ul_ol"> <fo:block-container margin-left="6mm"> <fo:block-container margin-left="0mm"> <fo:list-block margin-bottom="12pt" provisional-distance-between-starts="6mm"> <!-- margin-bottom="8pt" --> <xsl:if test="local-name() = 'ol'"> @@ -678,13 +644,13 @@ <xsl:template match="m3d:termnote" priority="2"> <fo:block-container margin-left="0mm" margin-top="4pt" line-height="125%"> <fo:block> <fo:inline padding-right="1mm"> - <xsl:apply-templates select="m3d:name" mode="presentation"/> + <xsl:apply-templates select="m3d:name"/> </fo:inline> - <xsl:apply-templates/> + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> </fo:block> </fo:block-container> </xsl:template> <xsl:template match="m3d:example/m3d:p" priority="2"> @@ -693,57 +659,10 @@ </fo:inline> </xsl:template> - <!-- <xsl:template match="m3d:references[@id = '_bibliography']"> --> - <xsl:template match="m3d:references[not(@normative='true')]"> - <fo:block break-after="page"/> - <fo:block id="{@id}"> - <xsl:apply-templates/> - </fo:block> - <fo:block-container text-align="center"> - <fo:block-container margin-left="63mm" width="42mm" border-bottom="2pt solid black"> - <fo:block> </fo:block> - </fo:block-container> - </fo:block-container> - </xsl:template> - - - <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages --> - <!-- <xsl:template match="m3d:references[@id = '_bibliography']/m3d:bibitem"> --> - <xsl:template match="m3d:references[not(@normative='true')]/m3d:bibitem"> - <fo:list-block margin-bottom="12pt" provisional-distance-between-starts="12mm"> - <fo:list-item> - <fo:list-item-label end-indent="label-end()"> - <fo:block> - <fo:inline id="{@id}"> - <xsl:value-of select="m3d:docidentifier[@type = 'metanorma-ordinal']"/> - <xsl:if test="not(m3d:docidentifier[@type = 'metanorma-ordinal'])"> - <xsl:number format="[1]"/> - </xsl:if> - </fo:inline> - </fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <fo:block text-align="justify"> - <xsl:call-template name="processBibitem"/> - </fo:block> - </fo:list-item-body> - </fo:list-item> - </fo:list-block> - </xsl:template> - - - <!-- <xsl:template match="m3d:references[@id = '_bibliography']/m3d:bibitem/m3d:title"> --> - <xsl:template match="m3d:references/m3d:bibitem/m3d:title"> - <fo:inline font-style="italic"> - <xsl:apply-templates/> - </fo:inline> - </xsl:template> - - <xsl:template match="mathml:math" priority="2"> <fo:inline font-family="Cambria Math"> <xsl:variable name="mathml"> <xsl:apply-templates select="." mode="mathml"/> </xsl:variable> @@ -751,37 +670,13 @@ <!-- <xsl:copy-of select="."/> --> <xsl:copy-of select="xalan:nodeset($mathml)"/> </fo:instream-foreign-object> </fo:inline> </xsl:template> - - -<!-- <xsl:template match="m3d:note/m3d:p" name="note"> - <fo:block-container margin-left="0mm" margin-top="4pt" line-height="125%"> - <fo:block> - <fo:inline > - <xsl:apply-templates select="../m3d:name" mode="presentation"> - <xsl:with-param name="sfx" select="':'"/> - </xsl:apply-templates> - </fo:inline> - <xsl:apply-templates /> - </fo:block> - </fo:block-container> - </xsl:template> --> - - <xsl:template match="m3d:admonition"> - <fo:block text-align="center" margin-bottom="12pt" font-weight="bold"> - <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@type))"/> - </fo:block> - <fo:block font-weight="bold"> - <xsl:apply-templates/> - </fo:block> - </xsl:template> - <xsl:template match="m3d:formula/m3d:stem"> <fo:block margin-top="14pt" margin-bottom="14pt"> <fo:table table-layout="fixed" width="100%"> <!-- 170mm --> <fo:table-column column-width="95%"/> <!-- 165mm --> <fo:table-column column-width="5%"/> <!-- 5mm --> @@ -792,11 +687,11 @@ <xsl:apply-templates/> </fo:block> </fo:table-cell> <fo:table-cell display-align="center"> <fo:block text-align="left"> - <xsl:apply-templates select="../m3d:name" mode="presentation"/> + <xsl:apply-templates select="../m3d:name" mode="formula_number"/> </fo:block> </fo:table-cell> </fo:table-row> </fo:table-body> </fo:table> @@ -806,43 +701,38 @@ <xsl:variable name="Image-M3AAWG-Logo"> <xsl:text>iVBORw0KGgoAAAANSUhEUgAAAjUAAAA8CAYAAACehUt5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA99pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ1dWlkOmZhZjViZGQ1LWJhM2QtMTFkYS1hZDMxLWQzM2Q3NTE4MmYxYiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1QjFGQUNFRDVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1QjFGQUNFQzVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkMwOEQ1MzE4OTE1NUU0MTE4ODdFRjlCOTFBMkJDOUNFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjg1QjAy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</xsl:text> </xsl:variable> -<xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="titles_"> +<xsl:variable name="titles_"> <title-edition lang="en"> - - <xsl:text>Version</xsl:text> - + <xsl:text>Version</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"> <xsl:text>Table of Contents</xsl:text> </title-toc> <title-toc lang="fr"> + <xsl:text>Sommaire</xsl:text> + </title-toc> + <title-toc lang="zh"> - <xsl:text>Sommaire</xsl:text> - + <xsl:text>Contents</xsl:text> + </title-toc> - - <title-toc lang="zh">Contents</title-toc> - - <title-descriptors lang="en">Descriptors</title-descriptors> <title-part lang="en"> @@ -854,16 +744,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> @@ -874,11 +760,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"/> @@ -903,35 +789,62 @@ </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">EB Garamond 12</xsl:attribute> + <xsl:attribute name="font-size">12pt</xsl:attribute> + + + + + + + </xsl:attribute-set><xsl:attribute-set name="link-style"> <xsl:attribute name="color">blue</xsl:attribute> <xsl:attribute name="text-decoration">underline</xsl:attribute> + </xsl:attribute-set><xsl: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-bottom">12pt</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"> @@ -1041,11 +954,64 @@ <xsl:attribute name="font-weight">bold</xsl:attribute> </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-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> @@ -1061,12 +1027,151 @@ + </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-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-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-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 name="font-size">12pt</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="margin-top">12pt</xsl:attribute> @@ -1133,10 +1238,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"> @@ -1194,17 +1300,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"> @@ -1299,10 +1410,21 @@ </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-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> @@ -1371,34 +1493,202 @@ - </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 name="text-align">center</xsl:attribute> + <xsl:attribute name="margin-bottom">12pt</xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> + + + + + + + + + </xsl:attribute-set><xsl:attribute-set name="admonition-p-style"> + + + + + + <xsl:attribute name="font-weight">bold</xsl:attribute> + + + + + + + + </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style"> + + + + + + + + + + + + <xsl:attribute name="margin-bottom">12pt</xsl:attribute> + <xsl:attribute name="text-indent">-11.7mm</xsl:attribute> + <xsl:attribute name="margin-left">11.7mm</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-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-set><xsl:attribute-set name="bibitem-non-normative-list-body-style"> + + + </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">7pt</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="font-size">6pt</xsl:attribute> + <xsl:attribute name="baseline-shift">30%</xsl:attribute> + <xsl:attribute name="padding-right">1mm</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="font-size">9pt</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"/> @@ -1411,37 +1701,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']"/> - - <xsl:if test="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"> - <fo:block break-after="page"/> - </xsl:if> - - <!-- 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="."/> @@ -1480,143 +1748,113 @@ <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="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute> + <xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute> + - - - + + - + + <!-- end table block-container attributes --> - - - <!-- 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> - - - - - - - - - - - - - - + + <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:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute> + <xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute> + + + + + + + + + + + + + + </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> @@ -1638,11 +1876,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> @@ -1653,29 +1891,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>--> @@ -1732,22 +1951,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> @@ -1806,17 +2024,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"/> @@ -1849,11 +2060,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"> @@ -1885,11 +2095,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> @@ -1897,17 +2106,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/> @@ -1919,68 +2127,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}"> - - - - <!-- 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"/> @@ -2002,21 +2152,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> @@ -2041,54 +2192,38 @@ </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}"> + <!-- fn will be processed inside 'note' processing --> - - - <!-- 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> @@ -2125,105 +2260,88 @@ <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> - <xsl:if test="$parent-name = 'tfoot'"> - - - - </xsl:if> - - - - - - - - - - - <!-- <xsl:if test="$namespace = 'bipm'"> - <xsl:attribute name="height">8mm</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:call-template name="setTableRowAttributes"/> + <xsl:apply-templates/> </fo:table-row> - </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> + </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:template><xsl:template match="*[local-name()='th']"> + <fo:table-cell xsl:use-attribute-sets="table-header-cell-style"> <!-- text-align="{@align}" --> + <xsl:call-template name="setTextAlignment"> + <xsl:with-param name="default">center</xsl:with-param> + </xsl:call-template> + - <xsl: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> @@ -2232,86 +2350,75 @@ <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=".//*[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"> @@ -2387,13 +2494,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"> <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style"> @@ -2407,48 +2513,41 @@ </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"> - - - - - <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:value-of select="@reference"/> </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> @@ -2456,81 +2555,73 @@ <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}"> <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> @@ -2553,24 +2644,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> @@ -2579,22 +2668,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"> + - - - - - - <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"/> @@ -2610,15 +2693,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> @@ -2630,39 +2713,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"> @@ -2705,13 +2787,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> @@ -2728,16 +2808,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"/> @@ -2813,12 +2890,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']"> @@ -2829,16 +2904,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> @@ -2860,96 +2929,57 @@ <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> - <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: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: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/> @@ -2974,10 +3004,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"> @@ -3015,19 +3046,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> @@ -3066,12 +3103,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"> @@ -3285,18 +3320,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"> @@ -3411,23 +3438,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> @@ -3451,10 +3474,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> @@ -3482,11 +3506,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> --> @@ -3541,10 +3565,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> @@ -3598,11 +3626,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']"> @@ -3626,53 +3653,68 @@ </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> + + - - - - - - <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> - - + + + + <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> @@ -3683,16 +3725,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"/> @@ -3707,11 +3753,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"/> @@ -3732,33 +3778,31 @@ <!-- <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"> <fo:block keep-with-next="always" margin-top="10pt" margin-bottom="8pt" line-height="1.1"> - <xsl:apply-templates select="m3d:name" mode="presentation"/> + <xsl:apply-templates select="m3d:name"/> </fo:block> + + <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"/> @@ -3767,28 +3811,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']"> @@ -3891,13 +3937,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"/> @@ -4163,11 +4207,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> @@ -4316,12 +4360,10 @@ - - </fo:bookmark-tree> </xsl:if> </xsl:template><xsl:template name="insertFigureBookmarks"> <xsl:param name="contents"/> <xsl:if test="xalan:nodeset($contents)/figure"> @@ -4388,11 +4430,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/> @@ -4404,16 +4446,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> @@ -4478,20 +4514,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> @@ -4524,10 +4565,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> @@ -4540,15 +4582,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> @@ -4558,22 +4600,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> @@ -4582,52 +4624,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']"> @@ -4667,22 +4709,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> @@ -4695,11 +4735,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> @@ -4708,38 +4747,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> @@ -4747,41 +4763,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> @@ -4789,19 +4783,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> @@ -4823,13 +4817,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> - inline - </xsl:variable> <!-- display 'EXAMPLE' --> <xsl:apply-templates select="*[local-name()='name']"> <xsl:with-param name="fo_element" select="$fo_element"/> @@ -4898,10 +4890,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"/> @@ -4935,13 +4929,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) = ''"> @@ -4980,11 +4972,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"> @@ -5023,19 +5014,19 @@ <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">50%</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()"/> @@ -5048,11 +5039,10 @@ </xsl:if> <xsl:if test="@type = 'inline'"> - </xsl:if> <xsl:apply-templates/> @@ -5109,12 +5099,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'"> @@ -5166,11 +5154,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 break-after="page"/> @@ -5212,15 +5199,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> @@ -5481,58 +5463,111 @@ </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> + <!-- horizontal line --> + <fo:block-container text-align="center"> + <fo:block-container margin-left="63mm" width="42mm" border-bottom="2pt solid black"> + <fo:block> </fo:block> + </fo:block-container> + </fo:block-container> + </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"> - + <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or + $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' --> + <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages --> + <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style"> + <fo:list-item> + <fo:list-item-label end-indent="label-end()"> + <fo:block> + <fo:inline> + + <xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/> + <xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])"> + <xsl:number format="[1]"/> + </xsl:if> + + </fo:inline> + </fo:block> + </fo:list-item-label> + <fo:list-item-body start-indent="body-start()"> + <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style"> + <xsl:call-template name="processBibitem"/> + </fo:block> + </fo:list-item-body> + </fo:list-item> + </fo:list-block> + - <!-- end MPFD bibitem processing --> + </xsl:template><xsl:template name="processBibitem"> - <!-- start M3D bibitem processing --> - <xsl:variable name="docidentifier"> - <xsl:if test="m3d:docidentifier"> + <!-- start bibitem processing --> + <xsl:if test=".//*[local-name() = 'fn']"> + <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute> + </xsl:if> + <xsl:variable name="docidentifier"> <xsl:choose> - <xsl:when test="m3d:docidentifier/@type = 'metanorma'"/> - <xsl:otherwise><xsl:value-of select="m3d:docidentifier[not(@type = 'metanorma-ordinal')]"/></xsl:otherwise> + <xsl:when test="*[local-name() = 'docidentifier']/@type = 'metanorma'"/> + <xsl:otherwise><xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma-ordinal')]"/></xsl:otherwise> </xsl:choose> - </xsl:if> - </xsl:variable> - <fo:inline><xsl:value-of select="$docidentifier"/></fo:inline> - <xsl:apply-templates select="m3d:note"/> - <xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if> - <xsl:choose> - <xsl:when test="m3d:title[@type = 'main' and @language = 'en']"> - <xsl:apply-templates select="m3d:title[@type = 'main' and @language = 'en']"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="m3d:title"/> - </xsl:otherwise> - </xsl:choose> - <xsl:apply-templates select="m3d:formattedref"/> - <!-- end MPFD bibitem processing --> - - - - + </xsl:variable> + <fo:inline><xsl:value-of select="$docidentifier"/></fo:inline> + <xsl:apply-templates select="*[local-name() = 'note']"/> + <xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if> + <xsl:choose> + <xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = $lang]"> + <xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = $lang]"/> + </xsl:when> + <xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = 'en']"> + <xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = 'en']"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="*[local-name() = 'title']"/> + </xsl:otherwise> + </xsl:choose> + <xsl:apply-templates select="*[local-name() = 'formattedref']"/> + <!-- end bibitem processing --> + </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"/> @@ -5585,10 +5620,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']"> @@ -5657,28 +5734,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 --> - - - - - - - - - 3 - - - - - - - - </xsl:otherwise> </xsl:choose> </xsl:variable><xsl:template match="*[local-name() = 'toc']"> <xsl:param name="colwidths"/> <xsl:variable name="colwidths_"> @@ -5772,90 +5832,102 @@ </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']"> + <!-- processing for admonition/p found in the template for 'p' --> + <xsl:call-template name="paragraph"/> + </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"> @@ -5904,17 +5976,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']"/> - - + <xsl:value-of select="*[local-name() = 'title']"/> + </xsl:for-each> </xsl:variable> <xsl:choose> <xsl:when test="normalize-space($title) != ''"> <xsl:value-of select="$title"/> @@ -5925,25 +5992,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"/> @@ -5959,11 +6023,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"/> @@ -5985,13 +6048,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"/> @@ -6177,11 +6237,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'"> @@ -6200,11 +6259,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"> @@ -6220,18 +6278,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