metanorma-mpfa 0.8.5 → 0.8.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/mpfa/mpfa.circular.xsl +81 -21
- data/lib/isodoc/mpfa/mpfa.compliance-standards-for-mpf-trustees.xsl +81 -21
- data/lib/isodoc/mpfa/mpfa.guidelines.xsl +81 -21
- data/lib/isodoc/mpfa/mpfa.standards.xsl +81 -21
- data/lib/isodoc/mpfa/mpfa.supervision-of-mpf-intermediaries.xsl +81 -21
- data/lib/metanorma/mpfa/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4fd2e0c4c3c149f4ceeda19af6ac04bd71710826944af542641c16f3416024bb
|
|
4
|
+
data.tar.gz: c146a1602630948d6c1ae188ed0d065d68b975ecf1426c3f8c3c801728125c42
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8e2b91c471805de9585f8c05aa2820e662a907fa87cdb6c4e516c773f7e98eb70bf8f6f4a3f43c1deefea39993cb81c9f155093755c9b4b5ac29c806cba59dd4
|
|
7
|
+
data.tar.gz: a93d8919db0a668d1a5a1d286cb0fc89912bb5ca830a1b25a04d02584dddc75240485ab7a7dfb3a7cd812acfb0c6cea093b1b3c557d452ad0c8e941f64622c01
|
|
@@ -570,7 +570,7 @@
|
|
|
570
570
|
</xsl:template>
|
|
571
571
|
|
|
572
572
|
|
|
573
|
-
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:
|
|
573
|
+
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
|
|
574
574
|
<xsl:call-template name="getLang"/>
|
|
575
575
|
</xsl:variable><xsl:variable name="pageWidth_">
|
|
576
576
|
210
|
|
@@ -5002,7 +5002,51 @@
|
|
|
5002
5002
|
<xsl:with-param name="text" select="$text_step1"/>
|
|
5003
5003
|
</xsl:call-template>
|
|
5004
5004
|
</xsl:variable>
|
|
5005
|
-
|
|
5005
|
+
|
|
5006
|
+
<!-- <xsl:value-of select="$text_step2"/> -->
|
|
5007
|
+
|
|
5008
|
+
<!-- add zero-width space after space -->
|
|
5009
|
+
<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ')"/>
|
|
5010
|
+
|
|
5011
|
+
<!-- split text by zero-width space -->
|
|
5012
|
+
<xsl:variable name="text_step4">
|
|
5013
|
+
<xsl:call-template name="split">
|
|
5014
|
+
<xsl:with-param name="pText" select="$text_step3"/>
|
|
5015
|
+
<xsl:with-param name="sep" select="$zero_width_space"/>
|
|
5016
|
+
<xsl:with-param name="normalize-space">false</xsl:with-param>
|
|
5017
|
+
<xsl:with-param name="keep_sep">true</xsl:with-param>
|
|
5018
|
+
</xsl:call-template>
|
|
5019
|
+
</xsl:variable>
|
|
5020
|
+
|
|
5021
|
+
<xsl:for-each select="xalan:nodeset($text_step4)/item">
|
|
5022
|
+
<xsl:choose>
|
|
5023
|
+
<xsl:when test="string-length() > 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
|
|
5024
|
+
<xsl:call-template name="interspers">
|
|
5025
|
+
<xsl:with-param name="str" select="."/>
|
|
5026
|
+
</xsl:call-template>
|
|
5027
|
+
</xsl:when>
|
|
5028
|
+
<xsl:otherwise>
|
|
5029
|
+
<xsl:value-of select="."/>
|
|
5030
|
+
</xsl:otherwise>
|
|
5031
|
+
</xsl:choose>
|
|
5032
|
+
</xsl:for-each>
|
|
5033
|
+
|
|
5034
|
+
</xsl:template><xsl:template name="interspers">
|
|
5035
|
+
<xsl:param name="str"/>
|
|
5036
|
+
<xsl:param name="char" select="$zero_width_space"/>
|
|
5037
|
+
<xsl:if test="$str != ''">
|
|
5038
|
+
<xsl:value-of select="substring($str, 1, 1)"/>
|
|
5039
|
+
|
|
5040
|
+
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
|
5041
|
+
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
|
5042
|
+
<xsl:value-of select="$char"/>
|
|
5043
|
+
</xsl:if>
|
|
5044
|
+
|
|
5045
|
+
<xsl:call-template name="interspers">
|
|
5046
|
+
<xsl:with-param name="str" select="substring($str, 2)"/>
|
|
5047
|
+
<xsl:with-param name="char" select="$char"/>
|
|
5048
|
+
</xsl:call-template>
|
|
5049
|
+
</xsl:if>
|
|
5006
5050
|
</xsl:template><xsl:template match="*" mode="syntax_highlight">
|
|
5007
5051
|
<xsl:apply-templates mode="syntax_highlight"/>
|
|
5008
5052
|
</xsl:template><xsl:variable name="syntax_highlight_styles_">
|
|
@@ -5510,11 +5554,24 @@
|
|
|
5510
5554
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
5511
5555
|
<xsl:text>— </xsl:text>
|
|
5512
5556
|
<xsl:apply-templates/>
|
|
5513
|
-
</xsl:template><xsl:
|
|
5557
|
+
</xsl:template><xsl:variable name="bibitems_">
|
|
5558
|
+
<xsl:for-each select="//*[local-name() = 'bibitem']">
|
|
5559
|
+
<xsl:copy-of select="."/>
|
|
5560
|
+
</xsl:for-each>
|
|
5561
|
+
</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
|
|
5562
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
5563
|
+
<xsl:copy-of select="."/>
|
|
5564
|
+
</xsl:for-each>
|
|
5565
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
|
|
5566
|
+
<xsl:copy-of select="."/>
|
|
5567
|
+
</xsl:for-each>
|
|
5568
|
+
</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
5514
5569
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
5515
|
-
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
5570
|
+
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
|
|
5571
|
+
<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
5516
5572
|
<xsl:choose>
|
|
5517
|
-
<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5573
|
+
<!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5574
|
+
<xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5518
5575
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
|
5519
5576
|
<xsl:if test="@type = 'footnote'">
|
|
5520
5577
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
|
@@ -6622,7 +6679,7 @@
|
|
|
6622
6679
|
<xsl:copy>
|
|
6623
6680
|
<xsl:copy-of select="@*"/>
|
|
6624
6681
|
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
|
6625
|
-
<xsl:for-each select="*[not(@normative='true') and not(*[
|
|
6682
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
|
|
6626
6683
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
6627
6684
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
6628
6685
|
</xsl:for-each>
|
|
@@ -6871,22 +6928,25 @@
|
|
|
6871
6928
|
<xsl:param name="pText" select="."/>
|
|
6872
6929
|
<xsl:param name="sep" select="','"/>
|
|
6873
6930
|
<xsl:param name="normalize-space" select="'true'"/>
|
|
6931
|
+
<xsl:param name="keep_sep" select="'false'"/>
|
|
6874
6932
|
<xsl:if test="string-length($pText) >0">
|
|
6875
|
-
|
|
6876
|
-
|
|
6877
|
-
|
|
6878
|
-
|
|
6879
|
-
|
|
6880
|
-
|
|
6881
|
-
|
|
6882
|
-
|
|
6883
|
-
|
|
6884
|
-
|
|
6885
|
-
|
|
6886
|
-
<xsl:
|
|
6887
|
-
|
|
6888
|
-
|
|
6889
|
-
|
|
6933
|
+
<item>
|
|
6934
|
+
<xsl:choose>
|
|
6935
|
+
<xsl:when test="$normalize-space = 'true'">
|
|
6936
|
+
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
|
6937
|
+
</xsl:when>
|
|
6938
|
+
<xsl:otherwise>
|
|
6939
|
+
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
|
6940
|
+
</xsl:otherwise>
|
|
6941
|
+
</xsl:choose>
|
|
6942
|
+
</item>
|
|
6943
|
+
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
|
|
6944
|
+
<xsl:call-template name="split">
|
|
6945
|
+
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
|
6946
|
+
<xsl:with-param name="sep" select="$sep"/>
|
|
6947
|
+
<xsl:with-param name="normalize-space" select="$normalize-space"/>
|
|
6948
|
+
<xsl:with-param name="keep_sep" select="$keep_sep"/>
|
|
6949
|
+
</xsl:call-template>
|
|
6890
6950
|
</xsl:if>
|
|
6891
6951
|
</xsl:template><xsl:template name="getDocumentId">
|
|
6892
6952
|
<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
|
|
@@ -570,7 +570,7 @@
|
|
|
570
570
|
</xsl:template>
|
|
571
571
|
|
|
572
572
|
|
|
573
|
-
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:
|
|
573
|
+
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
|
|
574
574
|
<xsl:call-template name="getLang"/>
|
|
575
575
|
</xsl:variable><xsl:variable name="pageWidth_">
|
|
576
576
|
210
|
|
@@ -5002,7 +5002,51 @@
|
|
|
5002
5002
|
<xsl:with-param name="text" select="$text_step1"/>
|
|
5003
5003
|
</xsl:call-template>
|
|
5004
5004
|
</xsl:variable>
|
|
5005
|
-
|
|
5005
|
+
|
|
5006
|
+
<!-- <xsl:value-of select="$text_step2"/> -->
|
|
5007
|
+
|
|
5008
|
+
<!-- add zero-width space after space -->
|
|
5009
|
+
<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ')"/>
|
|
5010
|
+
|
|
5011
|
+
<!-- split text by zero-width space -->
|
|
5012
|
+
<xsl:variable name="text_step4">
|
|
5013
|
+
<xsl:call-template name="split">
|
|
5014
|
+
<xsl:with-param name="pText" select="$text_step3"/>
|
|
5015
|
+
<xsl:with-param name="sep" select="$zero_width_space"/>
|
|
5016
|
+
<xsl:with-param name="normalize-space">false</xsl:with-param>
|
|
5017
|
+
<xsl:with-param name="keep_sep">true</xsl:with-param>
|
|
5018
|
+
</xsl:call-template>
|
|
5019
|
+
</xsl:variable>
|
|
5020
|
+
|
|
5021
|
+
<xsl:for-each select="xalan:nodeset($text_step4)/item">
|
|
5022
|
+
<xsl:choose>
|
|
5023
|
+
<xsl:when test="string-length() > 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
|
|
5024
|
+
<xsl:call-template name="interspers">
|
|
5025
|
+
<xsl:with-param name="str" select="."/>
|
|
5026
|
+
</xsl:call-template>
|
|
5027
|
+
</xsl:when>
|
|
5028
|
+
<xsl:otherwise>
|
|
5029
|
+
<xsl:value-of select="."/>
|
|
5030
|
+
</xsl:otherwise>
|
|
5031
|
+
</xsl:choose>
|
|
5032
|
+
</xsl:for-each>
|
|
5033
|
+
|
|
5034
|
+
</xsl:template><xsl:template name="interspers">
|
|
5035
|
+
<xsl:param name="str"/>
|
|
5036
|
+
<xsl:param name="char" select="$zero_width_space"/>
|
|
5037
|
+
<xsl:if test="$str != ''">
|
|
5038
|
+
<xsl:value-of select="substring($str, 1, 1)"/>
|
|
5039
|
+
|
|
5040
|
+
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
|
5041
|
+
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
|
5042
|
+
<xsl:value-of select="$char"/>
|
|
5043
|
+
</xsl:if>
|
|
5044
|
+
|
|
5045
|
+
<xsl:call-template name="interspers">
|
|
5046
|
+
<xsl:with-param name="str" select="substring($str, 2)"/>
|
|
5047
|
+
<xsl:with-param name="char" select="$char"/>
|
|
5048
|
+
</xsl:call-template>
|
|
5049
|
+
</xsl:if>
|
|
5006
5050
|
</xsl:template><xsl:template match="*" mode="syntax_highlight">
|
|
5007
5051
|
<xsl:apply-templates mode="syntax_highlight"/>
|
|
5008
5052
|
</xsl:template><xsl:variable name="syntax_highlight_styles_">
|
|
@@ -5510,11 +5554,24 @@
|
|
|
5510
5554
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
5511
5555
|
<xsl:text>— </xsl:text>
|
|
5512
5556
|
<xsl:apply-templates/>
|
|
5513
|
-
</xsl:template><xsl:
|
|
5557
|
+
</xsl:template><xsl:variable name="bibitems_">
|
|
5558
|
+
<xsl:for-each select="//*[local-name() = 'bibitem']">
|
|
5559
|
+
<xsl:copy-of select="."/>
|
|
5560
|
+
</xsl:for-each>
|
|
5561
|
+
</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
|
|
5562
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
5563
|
+
<xsl:copy-of select="."/>
|
|
5564
|
+
</xsl:for-each>
|
|
5565
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
|
|
5566
|
+
<xsl:copy-of select="."/>
|
|
5567
|
+
</xsl:for-each>
|
|
5568
|
+
</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
5514
5569
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
5515
|
-
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
5570
|
+
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
|
|
5571
|
+
<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
5516
5572
|
<xsl:choose>
|
|
5517
|
-
<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5573
|
+
<!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5574
|
+
<xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5518
5575
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
|
5519
5576
|
<xsl:if test="@type = 'footnote'">
|
|
5520
5577
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
|
@@ -6622,7 +6679,7 @@
|
|
|
6622
6679
|
<xsl:copy>
|
|
6623
6680
|
<xsl:copy-of select="@*"/>
|
|
6624
6681
|
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
|
6625
|
-
<xsl:for-each select="*[not(@normative='true') and not(*[
|
|
6682
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
|
|
6626
6683
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
6627
6684
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
6628
6685
|
</xsl:for-each>
|
|
@@ -6871,22 +6928,25 @@
|
|
|
6871
6928
|
<xsl:param name="pText" select="."/>
|
|
6872
6929
|
<xsl:param name="sep" select="','"/>
|
|
6873
6930
|
<xsl:param name="normalize-space" select="'true'"/>
|
|
6931
|
+
<xsl:param name="keep_sep" select="'false'"/>
|
|
6874
6932
|
<xsl:if test="string-length($pText) >0">
|
|
6875
|
-
|
|
6876
|
-
|
|
6877
|
-
|
|
6878
|
-
|
|
6879
|
-
|
|
6880
|
-
|
|
6881
|
-
|
|
6882
|
-
|
|
6883
|
-
|
|
6884
|
-
|
|
6885
|
-
|
|
6886
|
-
<xsl:
|
|
6887
|
-
|
|
6888
|
-
|
|
6889
|
-
|
|
6933
|
+
<item>
|
|
6934
|
+
<xsl:choose>
|
|
6935
|
+
<xsl:when test="$normalize-space = 'true'">
|
|
6936
|
+
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
|
6937
|
+
</xsl:when>
|
|
6938
|
+
<xsl:otherwise>
|
|
6939
|
+
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
|
6940
|
+
</xsl:otherwise>
|
|
6941
|
+
</xsl:choose>
|
|
6942
|
+
</item>
|
|
6943
|
+
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
|
|
6944
|
+
<xsl:call-template name="split">
|
|
6945
|
+
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
|
6946
|
+
<xsl:with-param name="sep" select="$sep"/>
|
|
6947
|
+
<xsl:with-param name="normalize-space" select="$normalize-space"/>
|
|
6948
|
+
<xsl:with-param name="keep_sep" select="$keep_sep"/>
|
|
6949
|
+
</xsl:call-template>
|
|
6890
6950
|
</xsl:if>
|
|
6891
6951
|
</xsl:template><xsl:template name="getDocumentId">
|
|
6892
6952
|
<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
|
|
@@ -570,7 +570,7 @@
|
|
|
570
570
|
</xsl:template>
|
|
571
571
|
|
|
572
572
|
|
|
573
|
-
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:
|
|
573
|
+
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
|
|
574
574
|
<xsl:call-template name="getLang"/>
|
|
575
575
|
</xsl:variable><xsl:variable name="pageWidth_">
|
|
576
576
|
210
|
|
@@ -5002,7 +5002,51 @@
|
|
|
5002
5002
|
<xsl:with-param name="text" select="$text_step1"/>
|
|
5003
5003
|
</xsl:call-template>
|
|
5004
5004
|
</xsl:variable>
|
|
5005
|
-
|
|
5005
|
+
|
|
5006
|
+
<!-- <xsl:value-of select="$text_step2"/> -->
|
|
5007
|
+
|
|
5008
|
+
<!-- add zero-width space after space -->
|
|
5009
|
+
<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ')"/>
|
|
5010
|
+
|
|
5011
|
+
<!-- split text by zero-width space -->
|
|
5012
|
+
<xsl:variable name="text_step4">
|
|
5013
|
+
<xsl:call-template name="split">
|
|
5014
|
+
<xsl:with-param name="pText" select="$text_step3"/>
|
|
5015
|
+
<xsl:with-param name="sep" select="$zero_width_space"/>
|
|
5016
|
+
<xsl:with-param name="normalize-space">false</xsl:with-param>
|
|
5017
|
+
<xsl:with-param name="keep_sep">true</xsl:with-param>
|
|
5018
|
+
</xsl:call-template>
|
|
5019
|
+
</xsl:variable>
|
|
5020
|
+
|
|
5021
|
+
<xsl:for-each select="xalan:nodeset($text_step4)/item">
|
|
5022
|
+
<xsl:choose>
|
|
5023
|
+
<xsl:when test="string-length() > 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
|
|
5024
|
+
<xsl:call-template name="interspers">
|
|
5025
|
+
<xsl:with-param name="str" select="."/>
|
|
5026
|
+
</xsl:call-template>
|
|
5027
|
+
</xsl:when>
|
|
5028
|
+
<xsl:otherwise>
|
|
5029
|
+
<xsl:value-of select="."/>
|
|
5030
|
+
</xsl:otherwise>
|
|
5031
|
+
</xsl:choose>
|
|
5032
|
+
</xsl:for-each>
|
|
5033
|
+
|
|
5034
|
+
</xsl:template><xsl:template name="interspers">
|
|
5035
|
+
<xsl:param name="str"/>
|
|
5036
|
+
<xsl:param name="char" select="$zero_width_space"/>
|
|
5037
|
+
<xsl:if test="$str != ''">
|
|
5038
|
+
<xsl:value-of select="substring($str, 1, 1)"/>
|
|
5039
|
+
|
|
5040
|
+
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
|
5041
|
+
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
|
5042
|
+
<xsl:value-of select="$char"/>
|
|
5043
|
+
</xsl:if>
|
|
5044
|
+
|
|
5045
|
+
<xsl:call-template name="interspers">
|
|
5046
|
+
<xsl:with-param name="str" select="substring($str, 2)"/>
|
|
5047
|
+
<xsl:with-param name="char" select="$char"/>
|
|
5048
|
+
</xsl:call-template>
|
|
5049
|
+
</xsl:if>
|
|
5006
5050
|
</xsl:template><xsl:template match="*" mode="syntax_highlight">
|
|
5007
5051
|
<xsl:apply-templates mode="syntax_highlight"/>
|
|
5008
5052
|
</xsl:template><xsl:variable name="syntax_highlight_styles_">
|
|
@@ -5510,11 +5554,24 @@
|
|
|
5510
5554
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
5511
5555
|
<xsl:text>— </xsl:text>
|
|
5512
5556
|
<xsl:apply-templates/>
|
|
5513
|
-
</xsl:template><xsl:
|
|
5557
|
+
</xsl:template><xsl:variable name="bibitems_">
|
|
5558
|
+
<xsl:for-each select="//*[local-name() = 'bibitem']">
|
|
5559
|
+
<xsl:copy-of select="."/>
|
|
5560
|
+
</xsl:for-each>
|
|
5561
|
+
</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
|
|
5562
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
5563
|
+
<xsl:copy-of select="."/>
|
|
5564
|
+
</xsl:for-each>
|
|
5565
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
|
|
5566
|
+
<xsl:copy-of select="."/>
|
|
5567
|
+
</xsl:for-each>
|
|
5568
|
+
</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
5514
5569
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
5515
|
-
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
5570
|
+
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
|
|
5571
|
+
<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
5516
5572
|
<xsl:choose>
|
|
5517
|
-
<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5573
|
+
<!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5574
|
+
<xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5518
5575
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
|
5519
5576
|
<xsl:if test="@type = 'footnote'">
|
|
5520
5577
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
|
@@ -6622,7 +6679,7 @@
|
|
|
6622
6679
|
<xsl:copy>
|
|
6623
6680
|
<xsl:copy-of select="@*"/>
|
|
6624
6681
|
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
|
6625
|
-
<xsl:for-each select="*[not(@normative='true') and not(*[
|
|
6682
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
|
|
6626
6683
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
6627
6684
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
6628
6685
|
</xsl:for-each>
|
|
@@ -6871,22 +6928,25 @@
|
|
|
6871
6928
|
<xsl:param name="pText" select="."/>
|
|
6872
6929
|
<xsl:param name="sep" select="','"/>
|
|
6873
6930
|
<xsl:param name="normalize-space" select="'true'"/>
|
|
6931
|
+
<xsl:param name="keep_sep" select="'false'"/>
|
|
6874
6932
|
<xsl:if test="string-length($pText) >0">
|
|
6875
|
-
|
|
6876
|
-
|
|
6877
|
-
|
|
6878
|
-
|
|
6879
|
-
|
|
6880
|
-
|
|
6881
|
-
|
|
6882
|
-
|
|
6883
|
-
|
|
6884
|
-
|
|
6885
|
-
|
|
6886
|
-
<xsl:
|
|
6887
|
-
|
|
6888
|
-
|
|
6889
|
-
|
|
6933
|
+
<item>
|
|
6934
|
+
<xsl:choose>
|
|
6935
|
+
<xsl:when test="$normalize-space = 'true'">
|
|
6936
|
+
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
|
6937
|
+
</xsl:when>
|
|
6938
|
+
<xsl:otherwise>
|
|
6939
|
+
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
|
6940
|
+
</xsl:otherwise>
|
|
6941
|
+
</xsl:choose>
|
|
6942
|
+
</item>
|
|
6943
|
+
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
|
|
6944
|
+
<xsl:call-template name="split">
|
|
6945
|
+
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
|
6946
|
+
<xsl:with-param name="sep" select="$sep"/>
|
|
6947
|
+
<xsl:with-param name="normalize-space" select="$normalize-space"/>
|
|
6948
|
+
<xsl:with-param name="keep_sep" select="$keep_sep"/>
|
|
6949
|
+
</xsl:call-template>
|
|
6890
6950
|
</xsl:if>
|
|
6891
6951
|
</xsl:template><xsl:template name="getDocumentId">
|
|
6892
6952
|
<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
|
|
@@ -570,7 +570,7 @@
|
|
|
570
570
|
</xsl:template>
|
|
571
571
|
|
|
572
572
|
|
|
573
|
-
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:
|
|
573
|
+
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
|
|
574
574
|
<xsl:call-template name="getLang"/>
|
|
575
575
|
</xsl:variable><xsl:variable name="pageWidth_">
|
|
576
576
|
210
|
|
@@ -5002,7 +5002,51 @@
|
|
|
5002
5002
|
<xsl:with-param name="text" select="$text_step1"/>
|
|
5003
5003
|
</xsl:call-template>
|
|
5004
5004
|
</xsl:variable>
|
|
5005
|
-
|
|
5005
|
+
|
|
5006
|
+
<!-- <xsl:value-of select="$text_step2"/> -->
|
|
5007
|
+
|
|
5008
|
+
<!-- add zero-width space after space -->
|
|
5009
|
+
<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ')"/>
|
|
5010
|
+
|
|
5011
|
+
<!-- split text by zero-width space -->
|
|
5012
|
+
<xsl:variable name="text_step4">
|
|
5013
|
+
<xsl:call-template name="split">
|
|
5014
|
+
<xsl:with-param name="pText" select="$text_step3"/>
|
|
5015
|
+
<xsl:with-param name="sep" select="$zero_width_space"/>
|
|
5016
|
+
<xsl:with-param name="normalize-space">false</xsl:with-param>
|
|
5017
|
+
<xsl:with-param name="keep_sep">true</xsl:with-param>
|
|
5018
|
+
</xsl:call-template>
|
|
5019
|
+
</xsl:variable>
|
|
5020
|
+
|
|
5021
|
+
<xsl:for-each select="xalan:nodeset($text_step4)/item">
|
|
5022
|
+
<xsl:choose>
|
|
5023
|
+
<xsl:when test="string-length() > 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
|
|
5024
|
+
<xsl:call-template name="interspers">
|
|
5025
|
+
<xsl:with-param name="str" select="."/>
|
|
5026
|
+
</xsl:call-template>
|
|
5027
|
+
</xsl:when>
|
|
5028
|
+
<xsl:otherwise>
|
|
5029
|
+
<xsl:value-of select="."/>
|
|
5030
|
+
</xsl:otherwise>
|
|
5031
|
+
</xsl:choose>
|
|
5032
|
+
</xsl:for-each>
|
|
5033
|
+
|
|
5034
|
+
</xsl:template><xsl:template name="interspers">
|
|
5035
|
+
<xsl:param name="str"/>
|
|
5036
|
+
<xsl:param name="char" select="$zero_width_space"/>
|
|
5037
|
+
<xsl:if test="$str != ''">
|
|
5038
|
+
<xsl:value-of select="substring($str, 1, 1)"/>
|
|
5039
|
+
|
|
5040
|
+
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
|
5041
|
+
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
|
5042
|
+
<xsl:value-of select="$char"/>
|
|
5043
|
+
</xsl:if>
|
|
5044
|
+
|
|
5045
|
+
<xsl:call-template name="interspers">
|
|
5046
|
+
<xsl:with-param name="str" select="substring($str, 2)"/>
|
|
5047
|
+
<xsl:with-param name="char" select="$char"/>
|
|
5048
|
+
</xsl:call-template>
|
|
5049
|
+
</xsl:if>
|
|
5006
5050
|
</xsl:template><xsl:template match="*" mode="syntax_highlight">
|
|
5007
5051
|
<xsl:apply-templates mode="syntax_highlight"/>
|
|
5008
5052
|
</xsl:template><xsl:variable name="syntax_highlight_styles_">
|
|
@@ -5510,11 +5554,24 @@
|
|
|
5510
5554
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
5511
5555
|
<xsl:text>— </xsl:text>
|
|
5512
5556
|
<xsl:apply-templates/>
|
|
5513
|
-
</xsl:template><xsl:
|
|
5557
|
+
</xsl:template><xsl:variable name="bibitems_">
|
|
5558
|
+
<xsl:for-each select="//*[local-name() = 'bibitem']">
|
|
5559
|
+
<xsl:copy-of select="."/>
|
|
5560
|
+
</xsl:for-each>
|
|
5561
|
+
</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
|
|
5562
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
5563
|
+
<xsl:copy-of select="."/>
|
|
5564
|
+
</xsl:for-each>
|
|
5565
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
|
|
5566
|
+
<xsl:copy-of select="."/>
|
|
5567
|
+
</xsl:for-each>
|
|
5568
|
+
</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
5514
5569
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
5515
|
-
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
5570
|
+
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
|
|
5571
|
+
<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
5516
5572
|
<xsl:choose>
|
|
5517
|
-
<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5573
|
+
<!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5574
|
+
<xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5518
5575
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
|
5519
5576
|
<xsl:if test="@type = 'footnote'">
|
|
5520
5577
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
|
@@ -6622,7 +6679,7 @@
|
|
|
6622
6679
|
<xsl:copy>
|
|
6623
6680
|
<xsl:copy-of select="@*"/>
|
|
6624
6681
|
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
|
6625
|
-
<xsl:for-each select="*[not(@normative='true') and not(*[
|
|
6682
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
|
|
6626
6683
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
6627
6684
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
6628
6685
|
</xsl:for-each>
|
|
@@ -6871,22 +6928,25 @@
|
|
|
6871
6928
|
<xsl:param name="pText" select="."/>
|
|
6872
6929
|
<xsl:param name="sep" select="','"/>
|
|
6873
6930
|
<xsl:param name="normalize-space" select="'true'"/>
|
|
6931
|
+
<xsl:param name="keep_sep" select="'false'"/>
|
|
6874
6932
|
<xsl:if test="string-length($pText) >0">
|
|
6875
|
-
|
|
6876
|
-
|
|
6877
|
-
|
|
6878
|
-
|
|
6879
|
-
|
|
6880
|
-
|
|
6881
|
-
|
|
6882
|
-
|
|
6883
|
-
|
|
6884
|
-
|
|
6885
|
-
|
|
6886
|
-
<xsl:
|
|
6887
|
-
|
|
6888
|
-
|
|
6889
|
-
|
|
6933
|
+
<item>
|
|
6934
|
+
<xsl:choose>
|
|
6935
|
+
<xsl:when test="$normalize-space = 'true'">
|
|
6936
|
+
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
|
6937
|
+
</xsl:when>
|
|
6938
|
+
<xsl:otherwise>
|
|
6939
|
+
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
|
6940
|
+
</xsl:otherwise>
|
|
6941
|
+
</xsl:choose>
|
|
6942
|
+
</item>
|
|
6943
|
+
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
|
|
6944
|
+
<xsl:call-template name="split">
|
|
6945
|
+
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
|
6946
|
+
<xsl:with-param name="sep" select="$sep"/>
|
|
6947
|
+
<xsl:with-param name="normalize-space" select="$normalize-space"/>
|
|
6948
|
+
<xsl:with-param name="keep_sep" select="$keep_sep"/>
|
|
6949
|
+
</xsl:call-template>
|
|
6890
6950
|
</xsl:if>
|
|
6891
6951
|
</xsl:template><xsl:template name="getDocumentId">
|
|
6892
6952
|
<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
|
|
@@ -570,7 +570,7 @@
|
|
|
570
570
|
</xsl:template>
|
|
571
571
|
|
|
572
572
|
|
|
573
|
-
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:
|
|
573
|
+
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
|
|
574
574
|
<xsl:call-template name="getLang"/>
|
|
575
575
|
</xsl:variable><xsl:variable name="pageWidth_">
|
|
576
576
|
210
|
|
@@ -5002,7 +5002,51 @@
|
|
|
5002
5002
|
<xsl:with-param name="text" select="$text_step1"/>
|
|
5003
5003
|
</xsl:call-template>
|
|
5004
5004
|
</xsl:variable>
|
|
5005
|
-
|
|
5005
|
+
|
|
5006
|
+
<!-- <xsl:value-of select="$text_step2"/> -->
|
|
5007
|
+
|
|
5008
|
+
<!-- add zero-width space after space -->
|
|
5009
|
+
<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ')"/>
|
|
5010
|
+
|
|
5011
|
+
<!-- split text by zero-width space -->
|
|
5012
|
+
<xsl:variable name="text_step4">
|
|
5013
|
+
<xsl:call-template name="split">
|
|
5014
|
+
<xsl:with-param name="pText" select="$text_step3"/>
|
|
5015
|
+
<xsl:with-param name="sep" select="$zero_width_space"/>
|
|
5016
|
+
<xsl:with-param name="normalize-space">false</xsl:with-param>
|
|
5017
|
+
<xsl:with-param name="keep_sep">true</xsl:with-param>
|
|
5018
|
+
</xsl:call-template>
|
|
5019
|
+
</xsl:variable>
|
|
5020
|
+
|
|
5021
|
+
<xsl:for-each select="xalan:nodeset($text_step4)/item">
|
|
5022
|
+
<xsl:choose>
|
|
5023
|
+
<xsl:when test="string-length() > 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
|
|
5024
|
+
<xsl:call-template name="interspers">
|
|
5025
|
+
<xsl:with-param name="str" select="."/>
|
|
5026
|
+
</xsl:call-template>
|
|
5027
|
+
</xsl:when>
|
|
5028
|
+
<xsl:otherwise>
|
|
5029
|
+
<xsl:value-of select="."/>
|
|
5030
|
+
</xsl:otherwise>
|
|
5031
|
+
</xsl:choose>
|
|
5032
|
+
</xsl:for-each>
|
|
5033
|
+
|
|
5034
|
+
</xsl:template><xsl:template name="interspers">
|
|
5035
|
+
<xsl:param name="str"/>
|
|
5036
|
+
<xsl:param name="char" select="$zero_width_space"/>
|
|
5037
|
+
<xsl:if test="$str != ''">
|
|
5038
|
+
<xsl:value-of select="substring($str, 1, 1)"/>
|
|
5039
|
+
|
|
5040
|
+
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
|
5041
|
+
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
|
5042
|
+
<xsl:value-of select="$char"/>
|
|
5043
|
+
</xsl:if>
|
|
5044
|
+
|
|
5045
|
+
<xsl:call-template name="interspers">
|
|
5046
|
+
<xsl:with-param name="str" select="substring($str, 2)"/>
|
|
5047
|
+
<xsl:with-param name="char" select="$char"/>
|
|
5048
|
+
</xsl:call-template>
|
|
5049
|
+
</xsl:if>
|
|
5006
5050
|
</xsl:template><xsl:template match="*" mode="syntax_highlight">
|
|
5007
5051
|
<xsl:apply-templates mode="syntax_highlight"/>
|
|
5008
5052
|
</xsl:template><xsl:variable name="syntax_highlight_styles_">
|
|
@@ -5510,11 +5554,24 @@
|
|
|
5510
5554
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
5511
5555
|
<xsl:text>— </xsl:text>
|
|
5512
5556
|
<xsl:apply-templates/>
|
|
5513
|
-
</xsl:template><xsl:
|
|
5557
|
+
</xsl:template><xsl:variable name="bibitems_">
|
|
5558
|
+
<xsl:for-each select="//*[local-name() = 'bibitem']">
|
|
5559
|
+
<xsl:copy-of select="."/>
|
|
5560
|
+
</xsl:for-each>
|
|
5561
|
+
</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
|
|
5562
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
5563
|
+
<xsl:copy-of select="."/>
|
|
5564
|
+
</xsl:for-each>
|
|
5565
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
|
|
5566
|
+
<xsl:copy-of select="."/>
|
|
5567
|
+
</xsl:for-each>
|
|
5568
|
+
</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
5514
5569
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
5515
|
-
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
5570
|
+
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
|
|
5571
|
+
<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
5516
5572
|
<xsl:choose>
|
|
5517
|
-
<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5573
|
+
<!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5574
|
+
<xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
|
5518
5575
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
|
5519
5576
|
<xsl:if test="@type = 'footnote'">
|
|
5520
5577
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
|
@@ -6622,7 +6679,7 @@
|
|
|
6622
6679
|
<xsl:copy>
|
|
6623
6680
|
<xsl:copy-of select="@*"/>
|
|
6624
6681
|
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
|
6625
|
-
<xsl:for-each select="*[not(@normative='true') and not(*[
|
|
6682
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
|
|
6626
6683
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
6627
6684
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
6628
6685
|
</xsl:for-each>
|
|
@@ -6871,22 +6928,25 @@
|
|
|
6871
6928
|
<xsl:param name="pText" select="."/>
|
|
6872
6929
|
<xsl:param name="sep" select="','"/>
|
|
6873
6930
|
<xsl:param name="normalize-space" select="'true'"/>
|
|
6931
|
+
<xsl:param name="keep_sep" select="'false'"/>
|
|
6874
6932
|
<xsl:if test="string-length($pText) >0">
|
|
6875
|
-
|
|
6876
|
-
|
|
6877
|
-
|
|
6878
|
-
|
|
6879
|
-
|
|
6880
|
-
|
|
6881
|
-
|
|
6882
|
-
|
|
6883
|
-
|
|
6884
|
-
|
|
6885
|
-
|
|
6886
|
-
<xsl:
|
|
6887
|
-
|
|
6888
|
-
|
|
6889
|
-
|
|
6933
|
+
<item>
|
|
6934
|
+
<xsl:choose>
|
|
6935
|
+
<xsl:when test="$normalize-space = 'true'">
|
|
6936
|
+
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
|
6937
|
+
</xsl:when>
|
|
6938
|
+
<xsl:otherwise>
|
|
6939
|
+
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
|
6940
|
+
</xsl:otherwise>
|
|
6941
|
+
</xsl:choose>
|
|
6942
|
+
</item>
|
|
6943
|
+
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
|
|
6944
|
+
<xsl:call-template name="split">
|
|
6945
|
+
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
|
6946
|
+
<xsl:with-param name="sep" select="$sep"/>
|
|
6947
|
+
<xsl:with-param name="normalize-space" select="$normalize-space"/>
|
|
6948
|
+
<xsl:with-param name="keep_sep" select="$keep_sep"/>
|
|
6949
|
+
</xsl:call-template>
|
|
6890
6950
|
</xsl:if>
|
|
6891
6951
|
</xsl:template><xsl:template name="getDocumentId">
|
|
6892
6952
|
<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-mpfa
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.8.
|
|
4
|
+
version: 0.8.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2022-03-
|
|
11
|
+
date: 2022-03-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: htmlentities
|
|
@@ -282,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
282
282
|
- !ruby/object:Gem::Version
|
|
283
283
|
version: '0'
|
|
284
284
|
requirements: []
|
|
285
|
-
rubygems_version: 3.
|
|
285
|
+
rubygems_version: 3.3.9
|
|
286
286
|
signing_key:
|
|
287
287
|
specification_version: 4
|
|
288
288
|
summary: metanorma-mpfa lets you write MPFA documents in AsciiDoc.
|