lib/isodoc/iho/iho.specification.xsl in metanorma-iho-0.6.12 vs lib/isodoc/iho/iho.specification.xsl in metanorma-iho-0.6.13

- old
+ new

@@ -4,13 +4,21 @@ <xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" use="@reference"/> <xsl:variable name="debug">false</xsl:variable> - <xsl:variable name="title-en" select="/iho:iho-standard/iho:bibdata/iho:title[@language = 'en']"/> + <xsl:variable name="title-en"> + <xsl:apply-templates select="/iho:iho-standard/iho:bibdata/iho:title[@language = 'en']/node()"/> + </xsl:variable> <xsl:variable name="docidentifier" select="/iho:iho-standard/iho:bibdata/iho:docidentifier[@type = 'IHO']"/> <xsl:variable name="copyrightText" select="concat('© International Hydrographic Association ', /iho:iho-standard/iho:bibdata/iho:copyright/iho:from ,' – All rights reserved')"/> + <xsl:variable name="edition"> + <xsl:apply-templates select="/iho:iho-standard/iho:bibdata/iho:edition[normalize-space(@language) = '']"/> + </xsl:variable> + <xsl:variable name="month_year"> + <xsl:apply-templates select="/iho:iho-standard/iho:bibdata/iho:date[@type = 'published']"/> + </xsl:variable> <!-- Example: <item level="1" id="Foreword" display="true">Foreword</item> <item id="term-script" display="false">3.2</item> --> @@ -41,65 +49,76 @@ </fo:simple-page-master> <fo:simple-page-master master-name="first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/> <fo:region-before region-name="header" extent="{$marginTop}mm"/> - <fo:region-after region-name="footer-even" extent="{$marginBottom}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/> <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> </fo:simple-page-master> <fo:simple-page-master master-name="odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/> <fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> - <fo:region-after region-name="footer-odd" extent="{$marginBottom}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/> <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> </fo:simple-page-master> <fo:simple-page-master master-name="odd-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm"> <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/> <fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> - <fo:region-after region-name="footer-odd" extent="{$marginBottom}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/> <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> </fo:simple-page-master> <fo:simple-page-master master-name="even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/> <fo:region-before region-name="header-even" extent="{$marginTop}mm"/> - <fo:region-after region-name="footer-even" extent="{$marginBottom}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/> <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/> </fo:simple-page-master> <fo:simple-page-master master-name="even-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm"> <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/> <fo:region-before region-name="header-even" extent="{$marginTop}mm"/> - <fo:region-after region-name="footer-even" extent="{$marginBottom}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/> <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/> </fo:simple-page-master> + <fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm"> + <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/> + <fo:region-before region-name="header-blank" extent="{$marginTop}mm"/> + <fo:region-after region-name="footer" extent="{$marginBottom}mm"/> + <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/> + <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/> + </fo:simple-page-master> <!-- Preface pages --> <fo:page-sequence-master master-name="preface"> <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-reference="first" page-position="first"/> + <!-- <fo:conditional-page-master-reference master-reference="first" page-position="first"/> --> + <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/> <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> <!-- Document pages --> <fo:page-sequence-master master-name="document"> <fo:repeatable-page-master-alternatives> + <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/> <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> <fo:page-sequence-master master-name="document-portrait"> <fo:repeatable-page-master-alternatives> + <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/> <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> <fo:page-sequence-master master-name="document-landscape"> <fo:repeatable-page-master-alternatives> + <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/> <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/> <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> </fo:layout-master-set> @@ -114,24 +133,22 @@ <!-- =========================== --> <!-- Cover Page --> <fo:page-sequence master-reference="cover"> <fo:flow flow-name="xsl-region-body"> - <fo:block-container position="absolute" left="14.25mm" top="28.20mm"> + <fo:block-container position="absolute" left="14.25mm" top="12mm" id="__internal_layout__coverpage_{generate-id()}"> <fo:table table-layout="fixed" width="181.1mm"> <fo:table-column column-width="26mm"/> - <fo:table-column column-width="45.3mm"/> - <fo:table-column column-width="109.8mm"/> + <fo:table-column column-width="19.4mm"/> + <fo:table-column column-width="135.7mm"/> <fo:table-body> <fo:table-row> <fo:table-cell><fo:block> </fo:block></fo:table-cell> <fo:table-cell> - <fo:block-container width="45.3mm" height="19.3mm" background-color="rgb(241, 234, 202)" text-align="center" display-align="center" font-weight="bold"> + <fo:block-container width="19.4mm" height="21mm" background-color="rgb(241, 234, 202)" border-bottom="0.05pt solid rgb(0, 21, 50)" text-align="center" display-align="center" font-size="10pt" font-weight="bold"> <fo:block> <xsl:value-of select="$docidentifier"/> - <xsl:text> </xsl:text> - <xsl:apply-templates select="/iho:iho-standard/iho:bibdata/iho:edition[normalize-space(@language) = '']"/> </fo:block> </fo:block-container> </fo:table-cell> <fo:table-cell><fo:block> </fo:block></fo:table-cell> </fo:table-row> @@ -139,15 +156,28 @@ <fo:table-cell display-align="after" text-align="right"> <fo:block font-size="1"> <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IHO))}" width="25.9mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IHO"/> </fo:block> </fo:table-cell> - <fo:table-cell number-columns-spanned="2" border="0.5pt solid rgb(0, 21, 50)"> - <fo:block-container height="154.4mm" text-align="center" display-align="center"> - <fo:block font-size="28pt" font-weight="bold" color="rgb(0, 0, 76)" role="H1"> - <xsl:value-of select="$title-en"/> - </fo:block> + <fo:table-cell number-columns-spanned="2" border="0.5pt solid rgb(0, 21, 50)" font-weight="bold" color="rgb(0, 0, 76)" padding-top="3mm"> + <fo:block-container height="165mm" width="115mm"> + <fo:block-container margin-left="10mm"> + <fo:block-container margin-left="0mm"> + <fo:block-container display-align="center" height="90mm"> + <fo:block font-size="28pt" role="H1" line-height="115%"> + <xsl:copy-of select="$title-en"/> + </fo:block> + </fo:block-container> + <fo:block font-size="14pt"> + <xsl:value-of select="$edition"/> + <xsl:if test="normalize-space($month_year) != ''"> + <xsl:text> – </xsl:text> + <xsl:value-of select="$month_year"/> + </xsl:if> + </fo:block> + </fo:block-container> + </fo:block-container> </fo:block-container> </fo:table-cell> </fo:table-row> <fo:table-row> <fo:table-cell> @@ -159,14 +189,16 @@ <fo:block font-size="1"> <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Text-IHO))}" width="25.8mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Text IHO"/> </fo:block> </fo:table-cell> <fo:table-cell> - <fo:block-container width="79.2mm" height="66.3mm" margin-left="30.6mm" background-color="rgb(0, 172, 158)" text-align="right" display-align="after"> - <fo:block font-size="8pt" color="white" margin-left="-30mm" margin-right="5mm" margin-bottom="9mm"> - <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/iho:feedback-statement"/> - </fo:block> + <fo:block-container width="79mm" height="72mm" margin-left="56.8mm" background-color="rgb(0, 172, 158)" text-align="right" display-align="after"> + <fo:block-container margin-left="0mm"> + <fo:block font-size="8pt" color="white" margin-right="5mm" margin-bottom="5mm" line-height-shift-adjustment="disregard-shifts"> + <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/iho:feedback-statement"/> + </fo:block> + </fo:block-container> </fo:block-container> </fo:table-cell> </fo:table-row> </fo:table-body> </fo:table> @@ -186,106 +218,114 @@ </fo:static-content> <xsl:call-template name="insertHeaderFooter"> <xsl:with-param name="font-weight">normal</xsl:with-param> </xsl:call-template> <fo:flow flow-name="xsl-region-body"> - <fo:block> </fo:block> - <fo:block break-after="page"/> - <fo:block-container margin-left="7.5mm" margin-right="-2mm"> - <fo:block-container margin-left="0mm" margin-right="0mm" border="0.5pt solid black" padding-top="1mm" padding-left="1.8mm" padding-right="1mm"> - <fo:block> - <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/*[local-name() != 'feedback-statement']"/> - </fo:block> + + <fo:block-container margin-left="-1.5mm" margin-right="-1mm"> + <fo:block-container margin-left="0mm" margin-right="0mm" border="0.5pt solid black"> + <fo:block-container margin-top="6.5mm" margin-left="7.5mm" margin-right="8.5mm" margin-bottom="7.5mm"> + <fo:block-container margin="0"> + <fo:block text-align="justify"> + <xsl:apply-templates select="/iho:iho-standard/iho:boilerplate/*[local-name() != 'feedback-statement']"/> + </fo:block> + </fo:block-container> + </fo:block-container> </fo:block-container> </fo:block-container> <fo:block break-after="page"/> <!-- Table of Contents --> - <fo:block-container margin-right="-12.7mm"> - <fo:block-container margin-right="0mm"> - <fo:block role="TOC"> - <fo:block color="rgb(14, 36, 133)" margin-bottom="15.5pt" role="H1"> - <xsl:variable name="title-toc"> - <xsl:call-template name="getTitle"> - <xsl:with-param name="name" select="'title-toc'"/> - </xsl:call-template> - </xsl:variable> - <xsl:value-of select="$title-toc"/> + <fo:block role="TOC"> + <fo:block font-weight="bold" margin-bottom="7.5pt" role="H1" font-size="12pt" margin-top="4pt"> + <fo:block-container width="18.3mm" border-bottom="1.25pt solid black"> + <fo:block line-height="75%"> + <xsl:call-template name="getLocalizedString"> + <xsl:with-param name="key">table_of_contents</xsl:with-param> + </xsl:call-template> </fo:block> - <xsl:if test="$debug = 'true'"> - <xsl:text disable-output-escaping="yes">&lt;!--</xsl:text> - DEBUG - contents=<xsl:copy-of select="$contents"/> - <xsl:text disable-output-escaping="yes">--&gt;</xsl:text> - </xsl:if> + </fo:block-container> + </fo:block> + <xsl:if test="$debug = 'true'"> + <xsl:text disable-output-escaping="yes">&lt;!--</xsl:text> + DEBUG + contents=<xsl:copy-of select="$contents"/> + <xsl:text disable-output-escaping="yes">--&gt;</xsl:text> + </xsl:if> - <xsl:for-each select="$contents//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface --> - <fo:block role="TOCI"> - <xsl:if test="@level = 1"> - <xsl:attribute name="margin-top">6pt</xsl:attribute> - </xsl:if> + <fo:block line-height="115%"> - <fo:list-block> + <xsl:for-each select="$contents//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface --> + <fo:block role="TOCI"> + <!-- <xsl:if test="@level = 1"> + <xsl:attribute name="margin-top">6pt</xsl:attribute> + </xsl:if> --> - <xsl:attribute name="provisional-distance-between-starts"> - <xsl:choose> - <xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when> - <xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when> - <xsl:when test="@level &gt;= 1 and not(@type = 'annex')">10mm</xsl:when> - <xsl:otherwise>0mm</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <fo:list-item> - <fo:list-item-label end-indent="label-end()"> - <fo:block> - <xsl:if test="@section != '' and not(@type = 'annex')"> <!-- output below --> - <xsl:value-of select="@section"/> - </xsl:if> + <fo:list-block> + + <xsl:attribute name="provisional-distance-between-starts"> + <xsl:choose> + <xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when> + <xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when> + <xsl:when test="@level &gt;= 1 and not(@type = 'annex')"> + <xsl:choose> + <xsl:when test="$toc_level = 3">12.9mm</xsl:when> + <xsl:when test="$toc_level &gt; 3">15mm</xsl:when> + <xsl:otherwise>10mm</xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise>0mm</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <fo:list-item> + <fo:list-item-label end-indent="label-end()"> + <fo:block> + <xsl:if test="@section != '' and not(@type = 'annex')"> <!-- output below --> + <xsl:value-of select="@section"/> + </xsl:if> + </fo:block> + </fo:list-item-label> + <fo:list-item-body start-indent="body-start()"> + <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm"> + <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}"> + <xsl:apply-templates select="title"/> + <fo:inline keep-together.within-line="always"> + <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/> + <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline> + </fo:inline> + </fo:basic-link> </fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm"> - <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}"> - <xsl:apply-templates select="title"/> - <fo:inline keep-together.within-line="always"> - <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/> - <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline> - </fo:inline> - </fo:basic-link> - </fo:block> - </fo:list-item-body> - </fo:list-item> - </fo:list-block> - </fo:block> + </fo:list-item-body> + </fo:list-item> + </fo:list-block> + </fo:block> + </xsl:for-each> + + <!-- List of Tables --> + <xsl:if test="$contents//tables/table"> + <xsl:call-template name="insertListOf_Title"> + <xsl:with-param name="title" select="$title-list-tables"/> + </xsl:call-template> + <xsl:for-each select="$contents//tables/table"> + <xsl:call-template name="insertListOf_Item"/> </xsl:for-each> + </xsl:if> - <!-- List of Tables --> - <xsl:if test="$contents//tables/table"> - <xsl:call-template name="insertListOf_Title"> - <xsl:with-param name="title" select="$title-list-tables"/> - </xsl:call-template> - <xsl:for-each select="$contents//tables/table"> - <xsl:call-template name="insertListOf_Item"/> - </xsl:for-each> - </xsl:if> + <!-- List of Figures --> + <xsl:if test="$contents//figures/figure"> + <xsl:call-template name="insertListOf_Title"> + <xsl:with-param name="title" select="$title-list-figures"/> + </xsl:call-template> + <xsl:for-each select="$contents//figures/figure"> + <xsl:call-template name="insertListOf_Item"/> + </xsl:for-each> + </xsl:if> + </fo:block> + </fo:block> - <!-- List of Figures --> - <xsl:if test="$contents//figures/figure"> - <xsl:call-template name="insertListOf_Title"> - <xsl:with-param name="title" select="$title-list-figures"/> - </xsl:call-template> - <xsl:for-each select="$contents//figures/figure"> - <xsl:call-template name="insertListOf_Item"/> - </xsl:for-each> - </xsl:if> - - </fo:block> - </fo:block-container> - </fo:block-container> - <!-- Foreword, Introduction --> <xsl:call-template name="processPrefaceSectionsDefault"/> </fo:flow> </fo:page-sequence> @@ -303,11 +343,11 @@ </fo:static-content> <xsl:call-template name="insertHeaderFooter"/> <fo:flow flow-name="xsl-region-body"> <fo:block-container> - <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1"><xsl:value-of select="$title-en"/></fo:block> + <!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1"><xsl:value-of select="$title-en"/></fo:block> --> <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/> <!-- Normative references --> <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/> <!-- Terms and definitions --> @@ -358,11 +398,11 @@ <!-- =========================== --> </fo:root> </xsl:variable> - <xsl:apply-templates select="xalan:nodeset($xslfo)" mode="step2"/> + <xsl:apply-templates select="xalan:nodeset($xslfo)" mode="landscape_portrait"/> </xsl:template> <xsl:template name="insertListOf_Title"> <xsl:param name="title"/> @@ -398,10 +438,11 @@ </xsl:call-template> </xsl:variable> <xsl:variable name="display"> <xsl:choose> + <xsl:when test="@id = '_document_history' or iho:title = 'Document History'">false</xsl:when> <xsl:when test="$level &lt;= $toc_level">true</xsl:when> <xsl:otherwise>false</xsl:otherwise> </xsl:choose> </xsl:variable> @@ -458,24 +499,37 @@ </xsl:call-template> <xsl:text> </xsl:text> <xsl:apply-templates/> </xsl:template> + <xsl:template match="/iho:iho-standard/iho:bibdata/iho:date[@type = 'published']"> + <xsl:call-template name="convertDate"> + <xsl:with-param name="date" select="."/> + <xsl:with-param name="format" select="'short'"/> + </xsl:call-template> + </xsl:template> + <xsl:template match="iho:feedback-statement//iho:br" priority="2"> <fo:block/> </xsl:template> + <xsl:template match="iho:feedback-statement//iho:sup" priority="2"> + <fo:inline font-size="62%" baseline-shift="35%"> + <xsl:apply-templates/> + </fo:inline> + </xsl:template> + <xsl:template match="node()"> <xsl:apply-templates/> </xsl:template> <!-- ====== --> <!-- title --> <!-- ====== --> <xsl:template match="iho:annex/iho:title"> - <fo:block font-size="13pt" font-weight="bold" text-align="center" margin-bottom="12pt" keep-with-next="always" role="H1"> + <fo:block font-size="12pt" font-weight="bold" text-align="center" margin-bottom="12pt" keep-with-next="always" role="H1"> <xsl:apply-templates/> <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/> </fo:block> </xsl:template> @@ -483,21 +537,38 @@ <fo:block font-size="16pt" font-weight="bold" text-align="center" margin-top="6pt" margin-bottom="36pt" keep-with-next="always" role="H1"> <xsl:apply-templates/> </fo:block> </xsl:template> + <xsl:template match="*[local-name() = 'clause']" priority="3"> + <xsl:if test="parent::iho:preface"> + <fo:block break-after="page"/> + </xsl:if> + <xsl:choose> + <xsl:when test="iho:title"> + <xsl:apply-templates/> + </xsl:when> + <xsl:otherwise> + <fo:block> + <xsl:call-template name="setId"/> + <xsl:apply-templates/> + </fo:block> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + <xsl:template match="iho:title" name="title"> <xsl:variable name="level"> <xsl:call-template name="getLevel"/> </xsl:variable> <xsl:variable name="font-size"> <xsl:choose> - <xsl:when test="$level = 1">13pt</xsl:when> - <xsl:when test="$level = 2">12pt</xsl:when> - <xsl:when test="$level &gt;= 3">11pt</xsl:when> + <xsl:when test="$level = 1">12pt</xsl:when> + <xsl:when test="$level = 2">11pt</xsl:when> + <xsl:when test="$level &gt;= 3">10pt</xsl:when> <xsl:otherwise>12pt</xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:variable name="element-name"> @@ -506,28 +577,42 @@ <xsl:otherwise>fo:block</xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:element name="{$element-name}"> + <xsl:for-each select="parent::*[local-name() = 'clause']"> + <xsl:call-template name="setId"/> + </xsl:for-each> <xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="space-before"> <xsl:choose> - <xsl:when test="$level = 1">13.5pt</xsl:when> - <xsl:when test="$level &gt;= 2">3pt</xsl:when> + <xsl:when test="$level = 1">24pt</xsl:when> + <xsl:when test="$level = 2 and ../preceding-sibling::*[1][self::iho:title]">10pt</xsl:when> + <xsl:when test="$level = 2">24pt</xsl:when> + <xsl:when test="$level &gt;= 3">6pt</xsl:when> <xsl:when test="ancestor::iho:preface">8pt</xsl:when> - <xsl:when test="$level = 2 and ancestor::iho:annex">18pt</xsl:when> - <xsl:when test="$level = 1">18pt</xsl:when> <xsl:when test="$level = ''">6pt</xsl:when><!-- 13.5pt --> <xsl:otherwise>12pt</xsl:otherwise> </xsl:choose> </xsl:attribute> - <xsl:attribute name="margin-bottom">12pt</xsl:attribute> + <xsl:attribute name="space-after"> + <xsl:choose> + <xsl:when test="$level &gt;= 3">6pt</xsl:when> + <xsl:otherwise>10pt</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <!-- <xsl:attribute name="margin-bottom">10pt</xsl:attribute> --> <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute> + <xsl:if test="../@id = '_document_history' or . = 'Document History'"> + <xsl:attribute name="text-align">center</xsl:attribute> + </xsl:if> + <xsl:apply-templates/> <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/> </xsl:element> <xsl:if test="$element-name = 'fo:inline' and not(following-sibling::iho:p)"> @@ -555,25 +640,40 @@ <xsl:element name="{$element-name}"> <xsl:attribute name="text-align"> <xsl:choose> <xsl:when test="ancestor::iho:quote">justify</xsl:when> <xsl:when test="ancestor::iho:feedback-statement">right</xsl:when> + <xsl:when test="ancestor::iho:boilerplate and not(@align)">justify</xsl:when> <xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when> <xsl:when test="ancestor::iho:td/@align"><xsl:value-of select="ancestor::iho:td/@align"/></xsl:when> <xsl:when test="ancestor::iho:th/@align"><xsl:value-of select="ancestor::iho:th/@align"/></xsl:when> - <xsl:otherwise>left</xsl:otherwise> + <xsl:otherwise>justify</xsl:otherwise> </xsl:choose> </xsl:attribute> - <xsl:attribute name="space-after">12pt</xsl:attribute> + <xsl:attribute name="space-after">6pt</xsl:attribute> <xsl:if test="parent::iho:dd"> - <xsl:attribute name="margin-bottom">12pt</xsl:attribute> + <xsl:attribute name="margin-bottom">6pt</xsl:attribute> </xsl:if> <xsl:if test="ancestor::*[2][local-name() = 'license-statement'] and not(following-sibling::iho:p)"> <xsl:attribute name="space-after">0pt</xsl:attribute> </xsl:if> <xsl:attribute name="line-height">115%</xsl:attribute> <!-- <xsl:attribute name="border">1pt solid red</xsl:attribute> --> + <xsl:if test="ancestor::iho:boilerplate and not(ancestor::iho:feedback-statement)"> + <xsl:attribute name="line-height">125%</xsl:attribute> + <xsl:attribute name="space-after">14pt</xsl:attribute> + </xsl:if> + <xsl:if test="following-sibling::*[1][self::iho:ol or self::iho:ul or self::iho:note or self::iho:termnote or self::iho:example or self::iho:dl]"> + <xsl:attribute name="space-after">3pt</xsl:attribute> + </xsl:if> + <xsl:if test="following-sibling::*[1][self::iho:dl]"> + <xsl:attribute name="space-after">6pt</xsl:attribute> + </xsl:if> + <xsl:if test="ancestor::iho:quote"> + <xsl:attribute name="line-height">130%</xsl:attribute> + <!-- <xsl:attribute name="margin-bottom">12pt</xsl:attribute> --> + </xsl:if> <xsl:if test=".//iho:fn"> <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute> </xsl:if> @@ -597,15 +697,15 @@ <xsl:template match="iho:p/iho:fn/iho:p"> <xsl:apply-templates/> </xsl:template> <!-- note in list item --> - <xsl:template match="iho:ul//iho:note | iho:ol//iho:note" priority="2"> + <!-- <xsl:template match="iho:ul//iho:note | iho:ol//iho:note" priority="2"> <fo:block id="{@id}"> - <xsl:apply-templates/> + <xsl:apply-templates /> </fo:block> - </xsl:template> + </xsl:template> --> <xsl:template match="iho:li//iho:p//text()"> <xsl:choose> <xsl:when test="contains(., '&#9;')"> <fo:inline white-space="pre"><xsl:value-of select="."/></fo:inline> @@ -614,19 +714,19 @@ <xsl:value-of select="."/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template match="iho:example/iho:p" priority="2"> + <!-- <xsl:template match="iho:example/iho:p" priority="2"> <fo:block-container xsl:use-attribute-sets="example-p-style"> <fo:block-container margin-left="0mm"> <fo:block> - <xsl:apply-templates/> + <xsl:apply-templates /> </fo:block> </fo:block-container> </fo:block-container> - </xsl:template> + </xsl:template> --> <xsl:template match="iho:pagebreak" priority="2"> <xsl:copy-of select="."/> </xsl:template> @@ -634,114 +734,83 @@ <xsl:template match="iho:index"/> <xsl:template name="insertHeaderFooter"> <xsl:param name="font-weight" select="'bold'"/> <fo:static-content flow-name="header-odd" role="artifact"> - <fo:block-container height="100%"> - <fo:block padding-top="12.5mm" text-align="right"> - <xsl:value-of select="$docidentifier"/> + <fo:block-container height="100%" font-size="8pt"> + <fo:block padding-top="12.5mm"> + <fo:table table-layout="fixed" width="100%"> + <fo:table-column column-width="proportional-column-width(1)"/> + <fo:table-column column-width="proportional-column-width(10)"/> + <fo:table-column column-width="proportional-column-width(1)"/> + <fo:table-body> + <fo:table-row> + <fo:table-cell><fo:block> </fo:block></fo:table-cell> + <fo:table-cell text-align="center"><fo:block><xsl:copy-of select="$title-en"/></fo:block></fo:table-cell> + <fo:table-cell text-align="right"><fo:block><fo:page-number/></fo:block></fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> </fo:block> </fo:block-container> </fo:static-content> - <fo:static-content flow-name="footer-odd" role="artifact"> - <fo:block-container height="100%" margin-right="-10mm" display-align="after"> - <fo:block-container margin-right="0mm"> - <fo:block padding-bottom="17mm" font-size="10pt" text-align-last="justify"> - <fo:inline><xsl:value-of select="$copyrightText"/></fo:inline> - <fo:inline keep-together.within-line="always"> - <fo:leader leader-pattern="space"/> - <fo:inline font-weight="{$font-weight}"><fo:page-number/></fo:inline> - </fo:inline> - </fo:block> - </fo:block-container> + <fo:static-content flow-name="header-even" role="artifact"> + <fo:block-container height="100%" font-size="8pt"> + <fo:block padding-top="12.5mm"> + <fo:table table-layout="fixed" width="100%"> + <fo:table-column column-width="proportional-column-width(1)"/> + <fo:table-column column-width="proportional-column-width(10)"/> + <fo:table-column column-width="proportional-column-width(1)"/> + <fo:table-body> + <fo:table-row> + <fo:table-cell><fo:block><fo:page-number/></fo:block></fo:table-cell> + <fo:table-cell text-align="center"><fo:block><xsl:copy-of select="$title-en"/></fo:block></fo:table-cell> + <fo:table-cell><fo:block> </fo:block></fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> + </fo:block> </fo:block-container> </fo:static-content> - <fo:static-content flow-name="header-even" role="artifact"> - <fo:block-container height="100%"> + <fo:static-content flow-name="header-blank" role="artifact"> + <fo:block-container height="100%" font-size="8pt"> <fo:block padding-top="12.5mm"> - <xsl:value-of select="$docidentifier"/> + <fo:table table-layout="fixed" width="100%"> + <fo:table-column column-width="proportional-column-width(1)"/> + <fo:table-column column-width="proportional-column-width(10)"/> + <fo:table-column column-width="proportional-column-width(1)"/> + <fo:table-body> + <fo:table-row> + <fo:table-cell><fo:block><fo:page-number/></fo:block></fo:table-cell> + <fo:table-cell text-align="center"><fo:block><xsl:copy-of select="$title-en"/></fo:block></fo:table-cell> + <fo:table-cell><fo:block> </fo:block></fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> </fo:block> </fo:block-container> + <fo:block-container position="absolute" left="40.5mm" top="130mm" height="4mm" width="79mm" border="0.75pt solid black" text-align="center" display-align="center" line-height="100%"> + <fo:block>Page intentionally left blank</fo:block> + </fo:block-container> </fo:static-content> - <fo:static-content flow-name="footer-even" role="artifact"> - <fo:block-container height="100%" margin-right="-10mm" display-align="after"> - <fo:block-container margin-right="0mm"> - <fo:block padding-bottom="17mm" font-size="10pt" text-align-last="justify"> - <fo:inline font-weight="{$font-weight}"><fo:page-number/></fo:inline> - <fo:inline keep-together.within-line="always"> - <fo:leader leader-pattern="space"/> - <xsl:value-of select="$copyrightText"/> - </fo:inline> - </fo:block> - </fo:block-container> + <fo:static-content flow-name="footer" role="artifact"> + <fo:block-container height="100%" display-align="after"> + <fo:block padding-bottom="12.5mm" font-size="8pt" text-align-last="justify"> + <fo:inline><xsl:value-of select="$docidentifier"/></fo:inline> + <fo:inline keep-together.within-line="always"> + <fo:leader leader-pattern="space"/> + <fo:inline>       <xsl:value-of select="$month_year"/></fo:inline> + </fo:inline> + <fo:inline keep-together.within-line="always"> + <fo:leader leader-pattern="space"/> + <fo:inline><xsl:value-of select="$edition"/></fo:inline> + </fo:inline> + </fo:block> </fo:block-container> </fo:static-content> </xsl:template> - <xsl:template match="@*|node()" mode="step2"> - <xsl:copy> - <xsl:apply-templates select="@*|node()" mode="step2"/> - </xsl:copy> - </xsl:template> - - <xsl:template match="iho:pagebreak" mode="step2"> - - <!-- determine pagebreak is last element before </fo:flow> or not --> - <xsl:variable name="isLast"> - <xsl:for-each select="ancestor-or-self::*[ancestor::fo:flow]"> - <xsl:if test="following-sibling::*">false</xsl:if> - </xsl:for-each> - </xsl:variable> - - <xsl:if test="contains($isLast, 'false')"> - - <xsl:variable name="orientation" select="normalize-space(@orientation)"/> - <xsl:variable name="tree"> - <xsl:for-each select="ancestor::*[ancestor::fo:flow]"> - <element pos="{position()}"> - <xsl:value-of select="name()"/> - </element> - </xsl:for-each> - </xsl:variable> - - <!-- close fo:page-sequence (closing preceding fo elements) --> - <xsl:for-each select="xalan:nodeset($tree)//element"> - <xsl:sort data-type="number" order="descending" select="@pos"/> - <xsl:text disable-output-escaping="yes">&lt;/</xsl:text> - <xsl:value-of select="."/> - <xsl:text disable-output-escaping="yes">&gt;</xsl:text> - </xsl:for-each> - <xsl:text disable-output-escaping="yes">&lt;/fo:flow&gt;</xsl:text> - <xsl:text disable-output-escaping="yes">&lt;/fo:page-sequence&gt;</xsl:text> - - <!-- <pagebreak/> --> - <!-- create a new fo:page-sequence (opening fo elements) --> - - <xsl:text disable-output-escaping="yes">&lt;fo:page-sequence master-reference="document</xsl:text><xsl:if test="$orientation != ''">-<xsl:value-of select="$orientation"/></xsl:if><xsl:text disable-output-escaping="yes">"&gt;</xsl:text> - <fo:static-content flow-name="xsl-footnote-separator"> - <fo:block> - <fo:leader leader-pattern="rule" leader-length="30%"/> - </fo:block> - </fo:static-content> - <xsl:call-template name="insertHeaderFooter"/> - <xsl:text disable-output-escaping="yes">&lt;fo:flow flow-name="xsl-region-body"&gt;</xsl:text> - - <xsl:for-each select="xalan:nodeset($tree)//element"> - <xsl:text disable-output-escaping="yes">&lt;</xsl:text> - <xsl:value-of select="."/> - <xsl:for-each select="@*[local-name() != 'pos']"> - <xsl:text> </xsl:text> - <xsl:value-of select="local-name()"/> - <xsl:text>="</xsl:text> - <xsl:value-of select="."/> - <xsl:text>"</xsl:text> - </xsl:for-each> - <xsl:text disable-output-escaping="yes">&gt;</xsl:text> - </xsl:for-each> - </xsl:if> - </xsl:template> - <xsl:variable name="Image-IHO"> <xsl:text>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</xsl:text> </xsl:variable> <xsl:variable name="Image-Logo-IHO"> @@ -750,10 +819,12 @@ <xsl:variable name="Image-Text-IHO"> <xsl:text>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</xsl:text> </xsl:variable> + <xsl:strip-space elements="iho:xref"/> + <!-- external parameters --> <xsl:param name="svg_images"/> <!-- svg images array --> <xsl:variable name="images" select="document($svg_images)"/> <xsl:param name="basepath"/> <!-- base path for images --> @@ -861,16 +932,16 @@ <!-- Page margins in mm (just digits, without 'mm')--> <!-- marginLeftRight1 and marginLeftRight2 - is left or right margin depends on odd/even page, for example, left margin on odd page and right margin on even page --> <xsl:variable name="marginLeftRight1_"> - 25.4 + 24.5 </xsl:variable> <xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/> <xsl:variable name="marginLeftRight2_"> - 25.4 + 25 </xsl:variable> <xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/> <xsl:variable name="marginTop_"> 25.4 @@ -1019,11 +1090,11 @@ <xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable> <xsl:attribute-set name="root-style"> <xsl:attribute name="font-family">Arial, Cambria Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute> <xsl:attribute name="font-family-generic">Sans</xsl:attribute> - <xsl:attribute name="font-size">12pt</xsl:attribute> + <xsl:attribute name="font-size">10pt</xsl:attribute> </xsl:attribute-set> <!-- root-style --> <xsl:template name="insertRootStyle"> <xsl:param name="root-style"/> @@ -1249,25 +1320,26 @@ </xsl:attribute-set> <xsl:attribute-set name="example-style"> - <xsl:attribute name="font-size">11pt</xsl:attribute> - <xsl:attribute name="margin-top">8pt</xsl:attribute> - <xsl:attribute name="margin-bottom">12pt</xsl:attribute> + <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> --> + <xsl:attribute name="margin-top">4pt</xsl:attribute> + <xsl:attribute name="margin-bottom">6pt</xsl:attribute> + <xsl:attribute name="text-align">justify</xsl:attribute> </xsl:attribute-set> <!-- example-style --> <xsl:attribute-set name="example-body-style"> </xsl:attribute-set> <!-- example-body-style --> <xsl:attribute-set name="example-name-style"> - <xsl:attribute name="keep-with-next">always</xsl:attribute> + <!-- <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> --> </xsl:attribute-set> <!-- example-name-style --> <xsl:attribute-set name="example-p-style"> @@ -1285,10 +1357,12 @@ <!-- ========================== --> <!-- Table styles --> <!-- ========================== --> <xsl:variable name="table-border_"> + 0.5pt solid black + </xsl:variable> <xsl:variable name="table-border" select="normalize-space($table-border_)"/> <xsl:variable name="table-cell-border_"> @@ -1297,38 +1371,45 @@ <xsl:attribute-set name="table-container-style"> <xsl:attribute name="margin-left">0mm</xsl:attribute> <xsl:attribute name="margin-right">0mm</xsl:attribute> + <xsl:attribute name="font-size">9pt</xsl:attribute> <xsl:attribute name="space-after">18pt</xsl:attribute> </xsl:attribute-set> <!-- table-container-style --> <xsl:attribute-set name="table-style"> <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute> <xsl:attribute name="table-layout">fixed</xsl:attribute> + <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute> + </xsl:attribute-set><!-- table-style --> <xsl:attribute-set name="table-name-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> <xsl:attribute name="text-align">center</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> - <xsl:attribute name="font-weight">normal</xsl:attribute> - <xsl:attribute name="font-size">11pt</xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="font-size">10pt</xsl:attribute> </xsl:attribute-set> <!-- table-name-style --> <xsl:attribute-set name="table-row-style"> <xsl:attribute name="min-height">4mm</xsl:attribute> + <xsl:attribute name="min-height">3mm</xsl:attribute> <!-- + padding-top + padding-bottom --> + </xsl:attribute-set> <xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style"> <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="background-color">rgb(217, 217, 217)</xsl:attribute> + </xsl:attribute-set> <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style"> </xsl:attribute-set> @@ -1342,35 +1423,49 @@ <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="display-align">center</xsl:attribute> + <xsl:attribute name="padding-top">1.5mm</xsl:attribute> + <xsl:attribute name="padding-left">2mm</xsl:attribute> + <xsl:attribute name="padding-bottom">1.5mm</xsl:attribute> + <xsl:attribute name="padding-right">1.5mm</xsl:attribute> + <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute> + </xsl:attribute-set> <!-- table-header-cell-style --> <xsl:attribute-set name="table-cell-style"> <xsl:attribute name="display-align">center</xsl:attribute> <xsl:attribute name="border">solid black 1pt</xsl:attribute> <xsl:attribute name="padding-left">1mm</xsl:attribute> <xsl:attribute name="padding-right">1mm</xsl:attribute> - <xsl:attribute name="padding-top">0.5mm</xsl:attribute> + <xsl:attribute name="padding-top">1.5mm</xsl:attribute> + <xsl:attribute name="padding-left">2mm</xsl:attribute> + <xsl:attribute name="padding-bottom">1.5mm</xsl:attribute> + <xsl:attribute name="padding-right">1.5mm</xsl:attribute> + <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute> </xsl:attribute-set> <!-- table-cell-style --> <xsl:attribute-set name="table-footer-cell-style"> <xsl:attribute name="border">solid black 1pt</xsl:attribute> <xsl:attribute name="padding-left">1mm</xsl:attribute> <xsl:attribute name="padding-right">1mm</xsl:attribute> <xsl:attribute name="padding-top">1mm</xsl:attribute> + <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute> + </xsl:attribute-set> <!-- table-footer-cell-style --> <xsl:attribute-set name="table-note-style"> <xsl:attribute name="font-size">10pt</xsl:attribute> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> - <xsl:attribute name="font-size">12pt</xsl:attribute> + <xsl:attribute name="font-size">inherit</xsl:attribute> + <xsl:attribute name="margin-bottom">0pt</xsl:attribute> + <xsl:attribute name="space-after">6pt</xsl:attribute> </xsl:attribute-set><!-- table-note-style --> <xsl:attribute-set name="table-fn-style"> <xsl:attribute name="margin-bottom">12pt</xsl:attribute> @@ -1422,11 +1517,11 @@ </xsl:attribute-set> <xsl:attribute-set name="dt-block-style"> <xsl:attribute name="margin-top">0pt</xsl:attribute> - <xsl:attribute name="margin-bottom">12pt</xsl:attribute> + <xsl:attribute name="margin-bottom">6pt</xsl:attribute> </xsl:attribute-set> <xsl:attribute-set name="dl-name-style"> <xsl:attribute name="keep-with-next">always</xsl:attribute> @@ -1463,31 +1558,31 @@ </xsl:attribute-set> <xsl:attribute-set name="note-style"> - <xsl:attribute name="font-size">11pt</xsl:attribute> - <xsl:attribute name="margin-top">8pt</xsl:attribute> - <xsl:attribute name="margin-bottom">12pt</xsl:attribute> + <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> --> + <xsl:attribute name="margin-top">4pt</xsl:attribute> + <xsl:attribute name="margin-bottom">6pt</xsl:attribute> <xsl:attribute name="text-align">justify</xsl:attribute> </xsl:attribute-set> <xsl:variable name="note-body-indent">10mm</xsl:variable> <xsl:variable name="note-body-indent-table">5mm</xsl:variable> <xsl:attribute-set name="note-name-style"> - <xsl:attribute name="font-size">11pt</xsl:attribute> + <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> --> <xsl:attribute name="padding-right">2mm</xsl:attribute> </xsl:attribute-set> <xsl:attribute-set name="table-note-name-style"> <xsl:attribute name="padding-right">2mm</xsl:attribute> - <xsl:attribute name="font-size">11pt</xsl:attribute> + <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> --> </xsl:attribute-set> <xsl:attribute-set name="note-p-style"> @@ -1515,12 +1610,13 @@ <xsl:attribute-set name="quote-style"> <xsl:attribute name="margin-left">12mm</xsl:attribute> <xsl:attribute name="margin-right">12mm</xsl:attribute> - <xsl:attribute name="margin-left">12.5mm</xsl:attribute> - <xsl:attribute name="margin-right">14mm</xsl:attribute> + <xsl:attribute name="font-family">Calibri</xsl:attribute> + <xsl:attribute name="margin-left">4.5mm</xsl:attribute> + <xsl:attribute name="margin-right">9mm</xsl:attribute> </xsl:attribute-set> <xsl:attribute-set name="quote-source-style"> <xsl:attribute name="text-align">right</xsl:attribute> @@ -1559,14 +1655,14 @@ </xsl:attribute-set> <xsl:attribute-set name="figure-name-style"> - <xsl:attribute name="font-size">11pt</xsl:attribute> + <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> --> <xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="text-align">center</xsl:attribute> - <xsl:attribute name="margin-top">6pt</xsl:attribute> + <xsl:attribute name="margin-top">2pt</xsl:attribute> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> <xsl:attribute name="keep-with-previous">always</xsl:attribute> </xsl:attribute-set> @@ -1698,11 +1794,11 @@ </xsl:attribute-set> <!-- list-name-style --> <xsl:attribute-set name="list-item-style"> - <xsl:attribute name="margin-bottom">12pt</xsl:attribute> + <xsl:attribute name="margin-bottom">3pt</xsl:attribute> </xsl:attribute-set> <xsl:attribute-set name="list-item-label-style"> @@ -1807,11 +1903,12 @@ <!-- <xsl:if test="$namespace = 'ieee'"> <xsl:attribute name="margin-bottom">6pt</xsl:attribute> <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute> </xsl:if> --> - <xsl:attribute name="line-height">115%</xsl:attribute> + <!-- <xsl:attribute name="line-height">115%</xsl:attribute> --> + <xsl:attribute name="margin-bottom">6pt</xsl:attribute> </xsl:attribute-set> <!-- bibitem-normative-list-style --> <xsl:attribute-set name="bibitem-non-normative-style"> @@ -2149,21 +2246,26 @@ <xsl:sort select="@displayorder" data-type="number"/> <xsl:apply-templates select="."/> </xsl:for-each> </xsl:template> + <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable> <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable> <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable> <xsl:template match="text()" name="text"> - <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable> - <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/> - <xsl:call-template name="replace_fo_inline_tags"> - <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/> - <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/> - <xsl:with-param name="text" select="$text"/> - </xsl:call-template> + <xsl:choose> + <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when> + <xsl:otherwise> + <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/> + <xsl:call-template name="replace_fo_inline_tags"> + <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/> + <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/> + <xsl:with-param name="text" select="$text"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template name="replace_fo_inline_tags"> <xsl:param name="tag_open"/> @@ -2524,11 +2626,11 @@ <xsl:choose> <xsl:when test="@width"> <!-- centered table when table name is centered (see table-name-style) --> - <fo:table table-layout="fixed" width="100%"> + <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style"> <fo:table-column column-width="proportional-column-width(1)"/> <fo:table-column column-width="{@width}"/> <fo:table-column column-width="proportional-column-width(1)"/> <fo:table-body> <fo:table-row> @@ -3177,11 +3279,11 @@ <!-- row in table's body (tbody) --> <xsl:template match="*[local-name()='tr']"> <fo:table-row xsl:use-attribute-sets="table-body-row-style"> - <xsl:if test="*[local-name() = 'th']"> + <xsl:if test="count(*) = count(*[local-name() = 'th'])"> <!-- row contains 'th' only --> <xsl:attribute name="keep-with-next">always</xsl:attribute> </xsl:if> <xsl:call-template name="setTableRowAttributes"/> <xsl:apply-templates/> @@ -3676,19 +3778,19 @@ <!-- a few components --> <xsl:if test="$onlyOneComponent = 'false'"> <fo:block> - <xsl:attribute name="margin-left">7mm</xsl:attribute> + <!-- <xsl:attribute name="margin-left">7mm</xsl:attribute> --> <xsl:if test="ancestor::*[local-name() = 'dd' or local-name() = 'td']"> <xsl:attribute name="margin-top">0</xsl:attribute> </xsl:if> <fo:block> - <xsl:attribute name="margin-left">-3.5mm</xsl:attribute> + <!-- <xsl:attribute name="margin-left">-3.5mm</xsl:attribute> --> <xsl:apply-templates select="*[local-name() = 'name']"> <xsl:with-param name="process">true</xsl:with-param> </xsl:apply-templates> @@ -3709,10 +3811,12 @@ <xsl:attribute name="font-size">10pt</xsl:attribute> </xsl:when> </xsl:choose> + <xsl:attribute name="width">100%</xsl:attribute> + <xsl:choose> <xsl:when test="$isGenerateTableIF = 'true'"> <!-- generate IF for table widths --> <!-- example: <tr> @@ -4140,18 +4244,66 @@ <tr> <td> <xsl:copy-of select="node()"/> </td> <td> - <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/> + <!-- <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/> --> + <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]" mode="dl_if"/> <!-- get paragraphs from nested 'dl' --> <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/> </td> </tr> </xsl:template> <xsl:template match="*[local-name()='dd']" mode="dl_if"/> + <xsl:template match="*" mode="dl_if"> + <xsl:copy-of select="."/> + </xsl:template> + + <xsl:template match="*[local-name() = 'p']" mode="dl_if"> + <xsl:param name="indent"/> + <p> + <xsl:copy-of select="@*"/> + <xsl:value-of select="$indent"/> + <xsl:copy-of select="node()"/> + </p> + + </xsl:template> + + <xsl:template match="*[local-name() = 'ul' or local-name() = 'ol']" mode="dl_if"> + <xsl:variable name="list_rendered_"> + <xsl:apply-templates select="."/> + </xsl:variable> + <xsl:variable name="list_rendered" select="xalan:nodeset($list_rendered_)"/> + + <xsl:variable name="indent"> + <xsl:for-each select="($list_rendered//fo:block[not(.//fo:block)])[1]"> + <xsl:apply-templates select="ancestor::*[@provisional-distance-between-starts]/@provisional-distance-between-starts" mode="dl_if"/> + </xsl:for-each> + </xsl:variable> + + <xsl:apply-templates mode="dl_if"> + <xsl:with-param name="indent" select="$indent"/> + </xsl:apply-templates> + </xsl:template> + + <xsl:template match="*[local-name() = 'li']" mode="dl_if"> + <xsl:param name="indent"/> + <xsl:apply-templates mode="dl_if"> + <xsl:with-param name="indent" select="$indent"/> + </xsl:apply-templates> + </xsl:template> + + <xsl:template match="@provisional-distance-between-starts" mode="dl_if"> + <xsl:variable name="value" select="round(substring-before(.,'mm'))"/> + <!-- emulate left indent for list item --> + <xsl:call-template name="repeat"> + <xsl:with-param name="char" select="'x'"/> + <xsl:with-param name="count" select="$value"/> + </xsl:call-template> + </xsl:template> + <xsl:template match="*[local-name()='dl']" mode="dl_if_nested"> <xsl:for-each select="*[local-name() = 'dt']"> <p> <xsl:copy-of select="node()"/> <xsl:text> </xsl:text> @@ -4202,11 +4354,11 @@ <xsl:template match="*[local-name()='tt']"> <fo:inline xsl:use-attribute-sets="tt-style"> <xsl:variable name="_font-size"> - 10 + 9.5 <!-- 10 --> </xsl:variable> <xsl:variable name="font-size" select="normalize-space($_font-size)"/> <xsl:if test="$font-size != ''"> @@ -4404,10 +4556,79 @@ <fo:block break-after="page"/> <fo:block> </fo:block> <fo:block break-after="page"/> </xsl:template> + <!-- ================================================================ --> + <!-- landscape/portrait orientation processing (post-processing step) --> + <!-- ================================================================ --> + <xsl:template match="@*|node()" mode="landscape_portrait"> + <xsl:copy> + <xsl:apply-templates select="@*|node()" mode="landscape_portrait"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="*[local-name() = 'pagebreak']" mode="landscape_portrait"> + + <!-- determine pagebreak is last element before </fo:flow> or not --> + <xsl:variable name="isLast"> + <xsl:for-each select="ancestor-or-self::*[ancestor::fo:flow]"> + <xsl:if test="following-sibling::*">false</xsl:if> + </xsl:for-each> + </xsl:variable> + + <xsl:if test="contains($isLast, 'false')"> + + <xsl:variable name="orientation" select="normalize-space(@orientation)"/> + <xsl:variable name="tree"> + <xsl:for-each select="ancestor::*[ancestor::fo:flow]"> + <element pos="{position()}"> + <xsl:value-of select="name()"/> + </element> + </xsl:for-each> + </xsl:variable> + + <!-- close fo:page-sequence (closing preceding fo elements) --> + <xsl:for-each select="xalan:nodeset($tree)//element"> + <xsl:sort data-type="number" order="descending" select="@pos"/> + <xsl:text disable-output-escaping="yes">&lt;/</xsl:text> + <xsl:value-of select="."/> + <xsl:text disable-output-escaping="yes">&gt;</xsl:text> + </xsl:for-each> + <xsl:text disable-output-escaping="yes">&lt;/fo:flow&gt;</xsl:text> + <xsl:text disable-output-escaping="yes">&lt;/fo:page-sequence&gt;</xsl:text> + + <!-- <pagebreak/> --> + <!-- create a new fo:page-sequence (opening fo elements) --> + + <xsl:text disable-output-escaping="yes">&lt;fo:page-sequence master-reference="document</xsl:text><xsl:if test="$orientation != ''">-<xsl:value-of select="$orientation"/></xsl:if><xsl:text disable-output-escaping="yes">"&gt;</xsl:text> + <fo:static-content flow-name="xsl-footnote-separator"> + <fo:block> + <fo:leader leader-pattern="rule" leader-length="30%"/> + </fo:block> + </fo:static-content> + <xsl:call-template name="insertHeaderFooter"/> + <xsl:text disable-output-escaping="yes">&lt;fo:flow flow-name="xsl-region-body"&gt;</xsl:text> + + <xsl:for-each select="xalan:nodeset($tree)//element"> + <xsl:text disable-output-escaping="yes">&lt;</xsl:text> + <xsl:value-of select="."/> + <xsl:for-each select="@*[local-name() != 'pos']"> + <xsl:text> </xsl:text> + <xsl:value-of select="local-name()"/> + <xsl:text>="</xsl:text> + <xsl:value-of select="."/> + <xsl:text>"</xsl:text> + </xsl:for-each> + <xsl:text disable-output-escaping="yes">&gt;</xsl:text> + </xsl:for-each> + </xsl:if> + </xsl:template> + <!-- ================================================================ --> + <!-- END: landscape/portrait orientation processing (post-processing step) --> + <!-- ================================================================ --> + <!-- Example: <span style="font-family:&quot;Noto Sans JP&quot;">styled text</span> --> <xsl:template match="*[local-name() = 'span'][@style]" priority="2"> <xsl:variable name="styles__"> <xsl:call-template name="split"> <xsl:with-param name="pText" select="concat(@style,';')"/> @@ -4542,10 +4763,11 @@ <xsl:with-param name="tags" select="$tags"/> </xsl:call-template> </word> <xsl:call-template name="tokenize_with_tags"> <xsl:with-param name="text" select="substring-after($text, $separator)"/> + <xsl:with-param name="tags" select="$tags"/> </xsl:call-template> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -4581,12 +4803,22 @@ </xsl:for-each> </xsl:template> <xsl:template name="add-zero-spaces-java"> <xsl:param name="text" select="."/> - <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space --> - <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| )','$1​')"/> + <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, arrow right --> + <xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |→)','$1​')"/> + <!-- add zero-width space (#x200B) after characters: 'great than' --> + <xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1), '(\u003e)(?!\u003e)', '$1​')"/><!-- negative lookahead: 'great than' not followed by 'great than' --> + <!-- add zero-width space (#x200B) before characters: 'less than' --> + <xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2), '(?&lt;!\u003c)(\u003c)', '​$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' --> + <!-- add zero-width space (#x200B) before character: { --> + <xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(?&lt;!\W)(\{)', '​$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' --> + <!-- add zero-width space (#x200B) after character: , --> + <xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(\,)(?!\d)', '$1​')"/> <!-- negative lookahead: ',' not followed by digit --> + + <xsl:value-of select="$text5"/> </xsl:template> <xsl:template name="add-zero-spaces-link-java"> <xsl:param name="text" select="."/> @@ -4728,11 +4960,11 @@ <xsl:copy> <xsl:apply-templates select="@*|node()" mode="table-without-br"/> </xsl:copy> </xsl:template> - <xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p'])]" mode="table-without-br"> + <xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode'])]" mode="table-without-br"> <xsl:copy> <xsl:copy-of select="@*"/> <p> <xsl:copy-of select="node()"/> </p> @@ -4776,10 +5008,32 @@ </p> </xsl:if> </xsl:for-each> </xsl:template> + <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']" mode="table-without-br"> + <xsl:apply-templates mode="table-without-br"/> + </xsl:template> + + <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']/text()[contains(., '&#13;') or contains(., '&#10;')]" mode="table-without-br"> + + <xsl:variable name="sep">###SOURCECODE_NEWLINE###</xsl:variable> + <xsl:variable name="sourcecode_text" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', $sep)"/> + <xsl:variable name="items"> + <xsl:call-template name="split"> + <xsl:with-param name="pText" select="$sourcecode_text"/> + <xsl:with-param name="sep" select="$sep"/> + <xsl:with-param name="normalize-space">false</xsl:with-param> + </xsl:call-template> + </xsl:variable> + <xsl:for-each select="xalan:nodeset($items)/*"> + <p> + <sourcecode><xsl:copy-of select="node()"/></sourcecode> + </p> + </xsl:for-each> + </xsl:template> + <!-- remove redundant white spaces --> <xsl:template match="text()[not(ancestor::*[local-name() = 'sourcecode'])]" mode="table-without-br"> <xsl:variable name="text" select="translate(.,'&#9;&#10;&#13;','')"/> <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),' {2,}',' ')"/> </xsl:template> @@ -5086,10 +5340,11 @@ <xsl:if test="ancestor::*[local-name() = 'strong']"><tag>strong</tag></xsl:if> <xsl:if test="ancestor::*[local-name() = 'em']"><tag>em</tag></xsl:if> <xsl:if test="ancestor::*[local-name() = 'sub']"><tag>sub</tag></xsl:if> <xsl:if test="ancestor::*[local-name() = 'sup']"><tag>sup</tag></xsl:if> <xsl:if test="ancestor::*[local-name() = 'tt']"><tag>tt</tag></xsl:if> + <xsl:if test="ancestor::*[local-name() = 'sourcecode']"><tag>sourcecode</tag></xsl:if> <xsl:if test="ancestor::*[local-name() = 'keep-together_within-line']"><tag>keep-together_within-line</tag></xsl:if> </tags> </xsl:template> <!-- =============================== --> <!-- END mode="td_text_with_formatting" --> @@ -5569,13 +5824,15 @@ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style"> <fo:block-container margin-left="0mm"> + <!-- <xsl:if test="$namespace = 'iho'"> <xsl:if test="ancestor::iho:td"> <xsl:attribute name="font-size">12pt</xsl:attribute> </xsl:if> + </xsl:if> --> <fo:block> <fo:inline xsl:use-attribute-sets="note-name-style"> @@ -5650,10 +5907,12 @@ <xsl:when test="$sfx != ''"> <xsl:value-of select="$sfx"/> </xsl:when> <xsl:otherwise> + <xsl:text>:</xsl:text> + </xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:if test="normalize-space() != ''"> <xsl:apply-templates/> @@ -6712,43 +6971,21 @@ <!-- =============== --> <!-- sourcecode --> <!-- =============== --> <xsl:template match="*[local-name()='sourcecode']" name="sourcecode"> - <fo:block-container xsl:use-attribute-sets="sourcecode-container-style"> + <xsl:variable name="sourcecode_attributes"> + <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style"> + <xsl:variable name="_font-size"> - <xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']"> - <xsl:attribute name="margin-left">0mm</xsl:attribute> - </xsl:if> + 10 + <!-- 9 --> - <xsl:if test="ancestor::*[local-name() = 'example']"> - <xsl:attribute name="margin-right">0mm</xsl:attribute> - </xsl:if> + <!-- <xsl:if test="$namespace = 'ieee'"> + <xsl:if test="$current_template = 'standard'">8</xsl:if> + </xsl:if> --> - <xsl:copy-of select="@id"/> - - <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> - </xsl:choose> - </xsl:attribute> - - </xsl:if> - <fo:block-container margin-left="0mm"> - - <fo:block xsl:use-attribute-sets="sourcecode-style"> - <xsl:variable name="_font-size"> - - 10 - <!-- 9 --> - - <!-- <xsl:if test="$namespace = 'ieee'"> - <xsl:if test="$current_template = 'standard'">8</xsl:if> - </xsl:if> --> - </xsl:variable> <xsl:variable name="font-size" select="normalize-space($_font-size)"/> <xsl:if test="$font-size != ''"> <xsl:attribute name="font-size"> @@ -6758,18 +6995,64 @@ <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when> <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise> </xsl:choose> </xsl:attribute> </xsl:if> + </xsl:element> + </xsl:variable> + <xsl:choose> + <xsl:when test="$isGenerateTableIF = 'true' and (ancestor::*[local-name() = 'td'] or ancestor::*[local-name() = 'th'])"> + <xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*"> + <xsl:attribute name="{local-name()}"> + <xsl:value-of select="."/> + </xsl:attribute> + </xsl:for-each> <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> - </fo:block> + </xsl:when> - <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content --> + <xsl:otherwise> + <fo:block-container xsl:use-attribute-sets="sourcecode-container-style"> - </fo:block-container> - </fo:block-container> + <xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']"> + <xsl:attribute name="margin-left">0mm</xsl:attribute> + </xsl:if> + + <xsl:if test="ancestor::*[local-name() = 'example']"> + <xsl:attribute name="margin-right">0mm</xsl:attribute> + </xsl:if> + + <xsl:copy-of select="@id"/> + + <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> + </xsl:choose> + </xsl:attribute> + + </xsl:if> + <fo:block-container margin-left="0mm"> + + <fo:block xsl:use-attribute-sets="sourcecode-style"> + + <xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*"> + <xsl:attribute name="{local-name()}"> + <xsl:value-of select="."/> + </xsl:attribute> + </xsl:for-each> + + <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> + </fo:block> + + <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content --> + + </fo:block-container> + </fo:block-container> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="*[local-name()='sourcecode']/text()" priority="2"> <xsl:choose> <xsl:when test="normalize-space($syntax-highlight) = 'true' and normalize-space(../@lang) != ''"> <!-- condition for turn on of highlighting --> @@ -7348,11 +7631,11 @@ <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style"> <xsl:variable name="fo_element"> <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if> - block + inline </xsl:variable> <fo:block-container margin-left="0mm"> <xsl:choose> @@ -7420,11 +7703,11 @@ <xsl:apply-templates/> </fo:block> </xsl:when> <xsl:otherwise> <fo:inline xsl:use-attribute-sets="example-name-style"> - <xsl:apply-templates/> + <xsl:apply-templates/>: </fo:inline> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -7899,11 +8182,14 @@ <!-- ===================================== --> <!-- Lists processing --> <!-- ===================================== --> <xsl:variable name="ul_labels_"> - <label>—</label> <!-- em dash --> + <!-- <label>&#x2014;</label> --> <!-- em dash --> + <label level="1" font-size="150%" line-height="80%">•</label> + <label level="2">—</label><!-- em dash --> + <label level="3" font-size="75%">o</label> <!-- white circle --> </xsl:variable> <xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/> <xsl:template name="setULLabel"> @@ -8439,19 +8725,27 @@ <!-- Normative references --> <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2"> <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-normative-list-style"> + <xsl:variable name="docidentifier" select="normalize-space(iho:docidentifier[@type != 'metanorma'][1])"/> + + <xsl:attribute name="provisional-distance-between-starts"> + <xsl:choose> + <xsl:when test="string-length($docidentifier) = 0">0mm</xsl:when> + <xsl:when test="string-length($docidentifier) &gt; 19">46.5mm</xsl:when> + <xsl:when test="string-length($docidentifier) &gt; 10">37mm</xsl:when> + <xsl:otherwise>24.5mm</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <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]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/> - </xsl:if> + <xsl:value-of select="$docidentifier"/> </fo:inline> </fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> @@ -8950,11 +9244,13 @@ <!-- ================ --> <!-- ===================================== --> <!-- Update xml --> <!-- ===================================== --> + <!-- =========================================================================== --> <!-- STEP1: Re-order elements in 'preface', 'sections' based on @displayorder --> + <!-- =========================================================================== --> <xsl:template match="@*|node()" mode="update_xml_step1"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/> </xsl:copy> </xsl:template> @@ -9042,14 +9338,19 @@ </xsl:template> <!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output --> <xsl:template match="*[local-name() = 'span']" mode="update_xml_step1"> <xsl:apply-templates mode="update_xml_step1"/> </xsl:template> - + <!-- =========================================================================== --> <!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder --> + <!-- =========================================================================== --> + <!-- =========================================================================== --> <!-- XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line' --> + <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b --> + <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY --> + <!-- =========================================================================== --> <!-- Example: <keep-together_within-line>ISO 10303-51</keep-together_within-line> --> <xsl:template match="@*|node()" mode="update_xml_enclose_keep-together_within-line"> <xsl:copy> <xsl:apply-templates select="@*|node()" mode="update_xml_enclose_keep-together_within-line"/> </xsl:copy> @@ -9061,14 +9362,19 @@ <xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable> <xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'link'][not(contains(.,' '))] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'] or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line"> <!-- enclose standard's number into tag 'keep-together_within-line' --> - <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable> <xsl:variable name="tag_keep-together_within-line_open">###<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable> <xsl:variable name="tag_keep-together_within-line_close">###/<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable> - <xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/> + <xsl:variable name="text__" select="java:replaceAll(java:java.lang.String.new(.), $regex_standard_reference, concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/> + <xsl:variable name="text_"> + <xsl:choose> + <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells --> + <xsl:otherwise><xsl:value-of select="$text__"/></xsl:otherwise> + </xsl:choose> + </xsl:variable> <xsl:variable name="text"><text><xsl:call-template name="replace_text_tags"> <xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/> <xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/> <xsl:with-param name="text" select="$text_"/> </xsl:call-template></text></xsl:variable> @@ -9080,11 +9386,15 @@ <xsl:copy-of select="."/> </xsl:for-each></text> </xsl:variable> <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b --> - <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable> + <!-- \S matches any non-whitespace character (equivalent to [^\r\n\t\f\v ]) --> + <!-- <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable> --> + <!-- add &lt; and &gt; to \S --> + <xsl:variable name="regex_S">[^\r\n\t\f\v \&lt;&gt;]</xsl:variable> + <xsl:variable name="regex_solidus_units">((\b((<xsl:value-of select="$regex_S"/>{1,3}\/<xsl:value-of select="$regex_S"/>+)|(<xsl:value-of select="$regex_S"/>+\/<xsl:value-of select="$regex_S"/>{1,3}))\b)|(\/<xsl:value-of select="$regex_S"/>{1,3})\b)</xsl:variable> <xsl:variable name="text3"> <text><xsl:for-each select="xalan:nodeset($text2)/text/node()"> <xsl:choose> <xsl:when test="self::text()"> <xsl:variable name="text_units_" select="java:replaceAll(java:java.lang.String.new(.),$regex_solidus_units,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/> @@ -9144,12 +9454,11 @@ </xsl:call-template> </xsl:when> <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise> </xsl:choose> </xsl:template> - <!-- ===================================== --> - <!-- End Update xml --> + <!-- END XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line' --> <!-- ===================================== --> <!-- for correct rendering combining chars --> <xsl:template match="*[local-name() = 'lang_none']"> <fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline> \ No newline at end of file