lib/isodoc/itu/itu.resolution.xsl in metanorma-itu-2.2.9 vs lib/isodoc/itu/itu.resolution.xsl in metanorma-itu-2.2.10

- old
+ new

@@ -1642,23 +1642,27 @@ <xsl:text>: </xsl:text> <xsl:variable name="citeas" select="../itu:termsource/itu:origin/@citeas"/> <xsl:variable name="bibitemid" select="../itu:termsource/itu:origin/@bibitemid"/> <xsl:variable name="origin_text" select="normalize-space(../itu:termsource/itu:origin/text())"/> - <fo:basic-link internal-destination="{$bibitemid}" fox:alt-text="{$citeas}"> - <xsl:choose> - <xsl:when test="$origin_text != ''"> - <xsl:text> </xsl:text><xsl:apply-templates select="../itu:termsource/itu:origin/node()"/> - </xsl:when> - <xsl:when test="contains($citeas, '[')"> - <xsl:text> </xsl:text><xsl:value-of select="$citeas"/> <!-- disable-output-escaping="yes" --> - </xsl:when> - <xsl:otherwise> - <xsl:text> [</xsl:text><xsl:value-of select="$citeas"/><xsl:text>]</xsl:text> - </xsl:otherwise> - </xsl:choose> - </fo:basic-link> + <xsl:call-template name="insert_basic_link"> + <xsl:with-param name="element"> + <fo:basic-link internal-destination="{$bibitemid}" fox:alt-text="{$citeas}"> + <xsl:choose> + <xsl:when test="$origin_text != ''"> + <xsl:text> </xsl:text><xsl:apply-templates select="../itu:termsource/itu:origin/node()"/> + </xsl:when> + <xsl:when test="contains($citeas, '[')"> + <xsl:text> </xsl:text><xsl:value-of select="$citeas"/> <!-- disable-output-escaping="yes" --> + </xsl:when> + <xsl:otherwise> + <xsl:text> [</xsl:text><xsl:value-of select="$citeas"/><xsl:text>]</xsl:text> + </xsl:otherwise> + </xsl:choose> + </fo:basic-link> + </xsl:with-param> + </xsl:call-template> </xsl:if> <xsl:if test="following-sibling::itu:definition/node()"> <xsl:text>: </xsl:text> <!-- <xsl:apply-templates select="following-sibling::itu:definition/node()" mode="process"/> --> <xsl:apply-templates select="following-sibling::itu:definition"> @@ -2807,10 +2811,11 @@ <xsl:attribute-set name="appendix-example-style"> </xsl:attribute-set> <xsl:attribute-set name="xref-style"> + <xsl:attribute name="keep-together.within-line">always</xsl:attribute> <xsl:attribute name="color">blue</xsl:attribute> <xsl:attribute name="text-decoration">underline</xsl:attribute> </xsl:attribute-set> @@ -4858,13 +4863,17 @@ <xsl:if test="following-sibling::*[1][local-name() = 'fn']"> <xsl:attribute name="padding-right">0.5mm</xsl:attribute> </xsl:if> - <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> - <xsl:value-of select="$current_fn_number_text"/> - </fo:basic-link> + <xsl:call-template name="insert_basic_link"> + <xsl:with-param name="element"> + <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> + <xsl:value-of select="$current_fn_number_text"/> + </fo:basic-link> + </xsl:with-param> + </xsl:call-template> </fo:inline> </xsl:variable> <xsl:choose> <xsl:when test="normalize-space(@skip_footnote_body) = 'true'"> @@ -5203,12 +5212,14 @@ </xsl:variable> <xsl:value-of select="$title-where"/> --> <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/> <xsl:text> </xsl:text> <xsl:apply-templates select="*[local-name()='dt']/*"/> - <xsl:text/> - <xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/> + <xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]"> + <xsl:text> </xsl:text> + </xsl:if> + <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/> </fo:block> </xsl:when> <!-- END: only one component --> <xsl:when test="$parent = 'formula'"> <!-- a few components --> <fo:block margin-bottom="12pt" text-align="left"> @@ -5707,12 +5718,22 @@ <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/> </xsl:apply-templates> </xsl:if> </xsl:template> - <xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline"> - <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline> + <xsl:template match="*[local-name()='dd']/*" mode="inline"> + <xsl:variable name="is_inline_element_after_where"> + <xsl:if test="(local-name() = 'p') and not(preceding-sibling::node()[normalize-space() != ''])">true</xsl:if> + </xsl:variable> + <xsl:choose> + <xsl:when test="$is_inline_element_after_where = 'true'"> + <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="."/> + </xsl:otherwise> + </xsl:choose> </xsl:template> <!-- virtual html table for dl/[dt and dd] for IF (Intermediate Format) --> <xsl:template match="*[local-name()='dt']" mode="dl_if"> <xsl:param name="id"/> @@ -7136,10 +7157,83 @@ <!-- patch: slash in the mtd wrong rendering --> <xsl:template match="mathml:mtd/mathml:mo/text()[. = '/']" mode="mathml"> <xsl:value-of select="."/><xsl:value-of select="$zero_width_space"/> </xsl:template> + <!-- special case for: + <math xmlns="http://www.w3.org/1998/Math/MathML"> + <mstyle displaystyle="true"> + <msup> + <mi color="#00000000">C</mi> + <mtext>R</mtext> + </msup> + <msubsup> + <mtext>C</mtext> + <mi>n</mi> + <mi>k</mi> + </msubsup> + </mstyle> + </math> + --> + <xsl:template match="mathml:msup/mathml:mi[. = '‌' or . = ''][not(preceding-sibling::*)][following-sibling::mathml:mtext]" mode="mathml"> + <xsl:copy> + <xsl:copy-of select="@*"/> + <xsl:variable name="next_mtext" select="ancestor::mathml:msup/following-sibling::*[1][self::mathml:msubsup or self::mathml:msub or self::mathml:msup]/mathml:mtext"/> + <xsl:if test="string-length($next_mtext) != ''"> + <xsl:attribute name="color">#00000000</xsl:attribute> + </xsl:if> + <xsl:apply-templates/> + <xsl:value-of select="$next_mtext"/> + </xsl:copy> + </xsl:template> + + <!-- special case for: + <msup> + <mtext/> + <mn>1</mn> + </msup> + convert to (add mspace after mtext and enclose them into mrow): + <msup> + <mrow> + <mtext/> + <mspace height="1.47ex"/> + </mrow> + <mn>1</mn> + </msup> + --> + <xsl:template match="mathml:msup/mathml:mtext[not(preceding-sibling::*)]" mode="mathml"> + <mathml:mrow> + <xsl:copy-of select="."/> + <mathml:mspace height="1.47ex"/> + </mathml:mrow> + </xsl:template> + + <!-- add space around vertical line --> + <xsl:template match="mathml:mo[normalize-space(text()) = '|']" mode="mathml"> + <xsl:copy> + <xsl:apply-templates select="@*" mode="mathml"/> + <xsl:if test="not(@lspace)"> + <xsl:attribute name="lspace">0.4em</xsl:attribute> + </xsl:if> + <xsl:if test="not(@rspace)"> + <xsl:attribute name="rspace">0.4em</xsl:attribute> + </xsl:if> + <xsl:apply-templates mode="mathml"/> + </xsl:copy> + </xsl:template> + + <!-- decrease fontsize for 'Circled Times' char --> + <xsl:template match="mathml:mo[normalize-space(text()) = '⊗']" mode="mathml"> + <xsl:copy> + <xsl:apply-templates select="@*" mode="mathml"/> + <xsl:if test="not(@fontsize)"> + <xsl:attribute name="fontsize">55%</xsl:attribute> + </xsl:if> + <xsl:apply-templates mode="mathml"/> + </xsl:copy> + </xsl:template> + <!-- Examples: <stem type="AsciiMath">x = 1</stem> <stem type="AsciiMath"><asciimath>x = 1</asciimath></stem> <stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem> --> @@ -7193,23 +7287,27 @@ <xsl:choose> <xsl:when test="$target_text = ''"> <xsl:apply-templates/> </xsl:when> <xsl:otherwise> - <fo:basic-link external-destination="{$target}" fox:alt-text="{$target}"> - <xsl:choose> - <xsl:when test="normalize-space(.) = ''"> - <xsl:call-template name="add-zero-spaces-link-java"> - <xsl:with-param name="text" select="$target_text"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <!-- output text from <link>text</link> --> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </fo:basic-link> + <xsl:call-template name="insert_basic_link"> + <xsl:with-param name="element"> + <fo:basic-link external-destination="{$target}" fox:alt-text="{$target}"> + <xsl:choose> + <xsl:when test="normalize-space(.) = ''"> + <xsl:call-template name="add-zero-spaces-link-java"> + <xsl:with-param name="text" select="$target_text"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <!-- output text from <link>text</link> --> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> + </fo:basic-link> + </xsl:with-param> + </xsl:call-template> </xsl:otherwise> </xsl:choose> </fo:inline> </xsl:template> <!-- link --> @@ -7268,16 +7366,20 @@ <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:if test="parent::*[local-name() = 'add']"> - <xsl:call-template name="append_add-style"/> - </xsl:if> - <xsl:apply-templates/> - </fo:basic-link> + <xsl:call-template name="insert_basic_link"> + <xsl:with-param name="element"> + <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style"> + <xsl:if test="parent::*[local-name() = 'add']"> + <xsl:call-template name="append_add-style"/> + </xsl:if> + <xsl:apply-templates/> + </fo:basic-link> + </xsl:with-param> + </xsl:call-template> </xsl:template> <!-- ====== --> <!-- formula --> <!-- ====== --> @@ -7662,11 +7764,11 @@ <xsl:choose> <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]"> <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/> </xsl:when> <xsl:when test="not(starts-with(@src, 'data:'))"> - <xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/> + <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="@src"/> </xsl:otherwise> </xsl:choose> @@ -7684,11 +7786,11 @@ <image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{$src}" style="overflow:visible;"/> </svg> </xsl:when> <xsl:when test="not(starts-with(@src, 'data:'))"> <xsl:variable name="src"> - <xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/> + <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/> </xsl:variable> <xsl:variable name="file" select="java:java.io.File.new(@src)"/> <xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/> <xsl:variable name="width" select="java:getWidth($bufferedImage)"/> <xsl:variable name="height" select="java:getHeight($bufferedImage)"/> @@ -8070,19 +8172,23 @@ <xsl:param name="width"/> <xsl:param name="height"/> <xsl:param name="dest"/> <fo:block-container position="absolute" left="{$left}px" top="{$top}px" width="{$width}px" height="{$height}px"> <fo:block font-size="1pt"> - <fo:basic-link internal-destination="{$dest}" fox:alt-text="svg link"> - <fo:inline-container inline-progression-dimension="100%"> - <fo:block-container height="{$height - 1}px" width="100%"> - <!-- DEBUG <xsl:if test="local-name()='polygon'"> - <xsl:attribute name="background-color">magenta</xsl:attribute> - </xsl:if> --> - <fo:block> </fo:block></fo:block-container> - </fo:inline-container> - </fo:basic-link> + <xsl:call-template name="insert_basic_link"> + <xsl:with-param name="element"> + <fo:basic-link internal-destination="{$dest}" fox:alt-text="svg link"> + <fo:inline-container inline-progression-dimension="100%"> + <fo:block-container height="{$height - 1}px" width="100%"> + <!-- DEBUG <xsl:if test="local-name()='polygon'"> + <xsl:attribute name="background-color">magenta</xsl:attribute> + </xsl:if> --> + <fo:block> </fo:block></fo:block-container> + </fo:inline-container> + </fo:basic-link> + </xsl:with-param> + </xsl:call-template> </fo:block> </fo:block-container> </xsl:template> <!-- =================== --> <!-- End SVG images processing --> @@ -9624,18 +9730,22 @@ <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) = ''"> - <xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute> - </xsl:if> - <fo:inline xsl:use-attribute-sets="origin-style"> - <xsl:apply-templates/> - </fo:inline> - </fo:basic-link> + <xsl:call-template name="insert_basic_link"> + <xsl:with-param name="element"> + <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}"> + <xsl:if test="normalize-space(@citeas) = ''"> + <xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute> + </xsl:if> + <fo:inline xsl:use-attribute-sets="origin-style"> + <xsl:apply-templates/> + </fo:inline> + </fo:basic-link> + </xsl:with-param> + </xsl:call-template> </xsl:template> <!-- not using, see https://github.com/glossarist/iev-document/issues/23 --> <xsl:template match="*[local-name() = 'modification']"> <xsl:variable name="title-modified"> @@ -9705,13 +9815,17 @@ <xsl:template match="*[local-name() = 'source']"> <xsl:if test="../*[local-name() = 'author']"> <xsl:text>, </xsl:text> </xsl:if> - <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}"> - <xsl:apply-templates/> - </fo:basic-link> + <xsl:call-template name="insert_basic_link"> + <xsl:with-param name="element"> + <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}"> + <xsl:apply-templates/> + </fo:basic-link> + </xsl:with-param> + </xsl:call-template> </xsl:template> <xsl:template match="*[local-name() = 'author']"> <xsl:text>— </xsl:text> <xsl:apply-templates/> @@ -9756,29 +9870,33 @@ </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()"/> - <fo:basic-link fox:alt-text="{@citeas}"> - <xsl:if test="normalize-space(@citeas) = ''"> - <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute> - </xsl:if> - <xsl:if test="@type = 'inline'"> + <xsl:call-template name="insert_basic_link"> + <xsl:with-param name="element"> + <fo:basic-link fox:alt-text="{@citeas}"> + <xsl:if test="normalize-space(@citeas) = ''"> + <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute> + </xsl:if> + <xsl:if test="@type = 'inline'"> - </xsl:if> + </xsl:if> - <xsl:choose> - <xsl:when test="$external-destination != ''"> <!-- external hyperlink --> - <xsl:attribute name="external-destination"><xsl:value-of select="$external-destination"/></xsl:attribute> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="internal-destination"><xsl:value-of select="@bibitemid"/></xsl:attribute> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="$external-destination != ''"> <!-- external hyperlink --> + <xsl:attribute name="external-destination"><xsl:value-of select="$external-destination"/></xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="internal-destination"><xsl:value-of select="@bibitemid"/></xsl:attribute> + </xsl:otherwise> + </xsl:choose> - <xsl:apply-templates/> - </fo:basic-link> + <xsl:apply-templates/> + </fo:basic-link> + </xsl:with-param> + </xsl:call-template> </fo:inline> </xsl:when> <xsl:otherwise> <!-- if there is key('bibitems_hidden', $current_bibitemid) --> @@ -10025,11 +10143,14 @@ </xsl:variable> <xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/> <xsl:template name="setULLabel"> - <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/> + <xsl:variable name="list_level__"> + <xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/> + </xsl:variable> + <xsl:variable name="list_level_" select="number($list_level__)"/> <xsl:variable name="list_level"> <xsl:choose> <xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when> <xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise> </xsl:choose> @@ -10158,13 +10279,15 @@ </fo:block> </fo:block-container> </fo:block-container> </xsl:when> <xsl:otherwise> - <fo:block> - <xsl:apply-templates select="." mode="list"/> - </fo:block> + + <fo:block> + <xsl:apply-templates select="." mode="list"/> + </fo:block> + </xsl:otherwise> </xsl:choose> </xsl:template> <xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list"> @@ -10872,28 +10995,36 @@ <!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> --> <xsl:variable name="target" select="@target"/> <xsl:for-each select="*[local-name() = 'tab']"> <xsl:variable name="current_id" select="generate-id()"/> <fo:table-cell> - <fo:block> - <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}"> - <xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]"> - <xsl:choose> - <xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when> - <xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise> - </xsl:choose> - </xsl:for-each> - </fo:basic-link> + <fo:block line-height-shift-adjustment="disregard-shifts"> + <xsl:call-template name="insert_basic_link"> + <xsl:with-param name="element"> + <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}"> + <xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]"> + <xsl:choose> + <xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when> + <xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </fo:basic-link> + </xsl:with-param> + </xsl:call-template> </fo:block> </fo:table-cell> </xsl:for-each> <!-- last column - for page numbers --> <fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial"> <fo:block> - <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}"> - <fo:page-number-citation ref-id="{$target}"/> - </fo:basic-link> + <xsl:call-template name="insert_basic_link"> + <xsl:with-param name="element"> + <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}"> + <fo:page-number-citation ref-id="{$target}"/> + </fo:basic-link> + </xsl:with-param> + </xsl:call-template> </fo:block> </fo:table-cell> </xsl:template> <!-- ================================== --> @@ -10930,9 +11061,30 @@ <!-- ================================== --> <!-- =================== --> <!-- End Table of Contents (ToC) processing --> <!-- =================== --> + + <!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline --> + <xsl:template name="insert_basic_link"> + <xsl:param name="element"/> + <xsl:variable name="element_node" select="xalan:nodeset($element)"/> + <xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/> + <xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/> + <xsl:choose> + <xsl:when test="$external-destination = 'true' or $internal-destination = 'true'"> + <xsl:copy-of select="$element_node"/> + </xsl:when> + <xsl:otherwise> + <fo:inline> + <xsl:for-each select="$element_node/fo:basic-link/@*[local-name() != 'external-destination' and local-name() != 'internal-destination' and local-name() != 'alt-text']"> + <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute> + </xsl:for-each> + <xsl:copy-of select="$element_node/fo:basic-link/node()"/> + </fo:inline> + </xsl:otherwise> + </xsl:choose> + </xsl:template> <xsl:template match="*[local-name() = 'variant-title']"/> <!-- [@type = 'sub'] --> <xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"> <fo:inline padding-right="5mm"> </fo:inline> <fo:inline><xsl:apply-templates/></fo:inline> \ No newline at end of file