metanorma-bipm 2.0.5 → 2.0.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/bipm/bipm.brochure.xsl +81 -21
- data/lib/isodoc/bipm/bipm.guide.xsl +81 -21
- data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +81 -21
- data/lib/isodoc/bipm/bipm.rapport.xsl +81 -21
- data/lib/isodoc/bipm/jcgm.standard.xsl +82 -22
- data/lib/metanorma/bipm/version.rb +1 -1
- data/metanorma-bipm.gemspec +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5c1cda232376044f26ca0752d361382aaadbf7b1e8989434a03cbd11e7201221
|
|
4
|
+
data.tar.gz: 44e2167a44382df941023c94cdc31bceb3b3b18debc0024767226d6fdfca365e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e68c38aec2249e23c2b1c0c6d2cbaecb9c4caf7e7d9bbdb5f47252c10500a22872d6f640934905739b9a8896ef1115590c5958d491edd5d83425ff24bab7e297
|
|
7
|
+
data.tar.gz: 8e4019292a726ccd28ade7747eeac7bb722200309d48167e771f605b463871dbba98641825582f435fffade446f5009e44ec1f525cd0066bb417c010a366a517
|
|
@@ -3916,7 +3916,7 @@
|
|
|
3916
3916
|
</xsl:template>
|
|
3917
3917
|
|
|
3918
3918
|
|
|
3919
|
-
<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:
|
|
3919
|
+
<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">
|
|
3920
3920
|
<xsl:call-template name="getLang"/>
|
|
3921
3921
|
</xsl:variable><xsl:variable name="pageWidth_">
|
|
3922
3922
|
210
|
|
@@ -8568,7 +8568,51 @@
|
|
|
8568
8568
|
<xsl:with-param name="text" select="$text_step1"/>
|
|
8569
8569
|
</xsl:call-template>
|
|
8570
8570
|
</xsl:variable>
|
|
8571
|
-
|
|
8571
|
+
|
|
8572
|
+
<!-- <xsl:value-of select="$text_step2"/> -->
|
|
8573
|
+
|
|
8574
|
+
<!-- add zero-width space after space -->
|
|
8575
|
+
<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ')"/>
|
|
8576
|
+
|
|
8577
|
+
<!-- split text by zero-width space -->
|
|
8578
|
+
<xsl:variable name="text_step4">
|
|
8579
|
+
<xsl:call-template name="split">
|
|
8580
|
+
<xsl:with-param name="pText" select="$text_step3"/>
|
|
8581
|
+
<xsl:with-param name="sep" select="$zero_width_space"/>
|
|
8582
|
+
<xsl:with-param name="normalize-space">false</xsl:with-param>
|
|
8583
|
+
<xsl:with-param name="keep_sep">true</xsl:with-param>
|
|
8584
|
+
</xsl:call-template>
|
|
8585
|
+
</xsl:variable>
|
|
8586
|
+
|
|
8587
|
+
<xsl:for-each select="xalan:nodeset($text_step4)/item">
|
|
8588
|
+
<xsl:choose>
|
|
8589
|
+
<xsl:when test="string-length() > 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
|
|
8590
|
+
<xsl:call-template name="interspers">
|
|
8591
|
+
<xsl:with-param name="str" select="."/>
|
|
8592
|
+
</xsl:call-template>
|
|
8593
|
+
</xsl:when>
|
|
8594
|
+
<xsl:otherwise>
|
|
8595
|
+
<xsl:value-of select="."/>
|
|
8596
|
+
</xsl:otherwise>
|
|
8597
|
+
</xsl:choose>
|
|
8598
|
+
</xsl:for-each>
|
|
8599
|
+
|
|
8600
|
+
</xsl:template><xsl:template name="interspers">
|
|
8601
|
+
<xsl:param name="str"/>
|
|
8602
|
+
<xsl:param name="char" select="$zero_width_space"/>
|
|
8603
|
+
<xsl:if test="$str != ''">
|
|
8604
|
+
<xsl:value-of select="substring($str, 1, 1)"/>
|
|
8605
|
+
|
|
8606
|
+
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
|
8607
|
+
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
|
8608
|
+
<xsl:value-of select="$char"/>
|
|
8609
|
+
</xsl:if>
|
|
8610
|
+
|
|
8611
|
+
<xsl:call-template name="interspers">
|
|
8612
|
+
<xsl:with-param name="str" select="substring($str, 2)"/>
|
|
8613
|
+
<xsl:with-param name="char" select="$char"/>
|
|
8614
|
+
</xsl:call-template>
|
|
8615
|
+
</xsl:if>
|
|
8572
8616
|
</xsl:template><xsl:template match="*" mode="syntax_highlight">
|
|
8573
8617
|
<xsl:apply-templates mode="syntax_highlight"/>
|
|
8574
8618
|
</xsl:template><xsl:variable name="syntax_highlight_styles_">
|
|
@@ -9076,11 +9120,24 @@
|
|
|
9076
9120
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
9077
9121
|
<xsl:text>— </xsl:text>
|
|
9078
9122
|
<xsl:apply-templates/>
|
|
9079
|
-
</xsl:template><xsl:
|
|
9123
|
+
</xsl:template><xsl:variable name="bibitems_">
|
|
9124
|
+
<xsl:for-each select="//*[local-name() = 'bibitem']">
|
|
9125
|
+
<xsl:copy-of select="."/>
|
|
9126
|
+
</xsl:for-each>
|
|
9127
|
+
</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
|
|
9128
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
9129
|
+
<xsl:copy-of select="."/>
|
|
9130
|
+
</xsl:for-each>
|
|
9131
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
|
|
9132
|
+
<xsl:copy-of select="."/>
|
|
9133
|
+
</xsl:for-each>
|
|
9134
|
+
</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
9080
9135
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
9081
|
-
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
9136
|
+
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
|
|
9137
|
+
<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
9082
9138
|
<xsl:choose>
|
|
9083
|
-
<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) -->
|
|
9139
|
+
<!-- <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) -->
|
|
9140
|
+
<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) -->
|
|
9084
9141
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
|
9085
9142
|
<xsl:if test="@type = 'footnote'">
|
|
9086
9143
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
|
@@ -10221,7 +10278,7 @@
|
|
|
10221
10278
|
<xsl:copy>
|
|
10222
10279
|
<xsl:copy-of select="@*"/>
|
|
10223
10280
|
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
|
10224
|
-
<xsl:for-each select="*[not(@normative='true') and not(*[
|
|
10281
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
|
|
10225
10282
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
10226
10283
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
10227
10284
|
</xsl:for-each>
|
|
@@ -10470,22 +10527,25 @@
|
|
|
10470
10527
|
<xsl:param name="pText" select="."/>
|
|
10471
10528
|
<xsl:param name="sep" select="','"/>
|
|
10472
10529
|
<xsl:param name="normalize-space" select="'true'"/>
|
|
10530
|
+
<xsl:param name="keep_sep" select="'false'"/>
|
|
10473
10531
|
<xsl:if test="string-length($pText) >0">
|
|
10474
|
-
|
|
10475
|
-
|
|
10476
|
-
|
|
10477
|
-
|
|
10478
|
-
|
|
10479
|
-
|
|
10480
|
-
|
|
10481
|
-
|
|
10482
|
-
|
|
10483
|
-
|
|
10484
|
-
|
|
10485
|
-
<xsl:
|
|
10486
|
-
|
|
10487
|
-
|
|
10488
|
-
|
|
10532
|
+
<item>
|
|
10533
|
+
<xsl:choose>
|
|
10534
|
+
<xsl:when test="$normalize-space = 'true'">
|
|
10535
|
+
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
|
10536
|
+
</xsl:when>
|
|
10537
|
+
<xsl:otherwise>
|
|
10538
|
+
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
|
10539
|
+
</xsl:otherwise>
|
|
10540
|
+
</xsl:choose>
|
|
10541
|
+
</item>
|
|
10542
|
+
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
|
|
10543
|
+
<xsl:call-template name="split">
|
|
10544
|
+
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
|
10545
|
+
<xsl:with-param name="sep" select="$sep"/>
|
|
10546
|
+
<xsl:with-param name="normalize-space" select="$normalize-space"/>
|
|
10547
|
+
<xsl:with-param name="keep_sep" select="$keep_sep"/>
|
|
10548
|
+
</xsl:call-template>
|
|
10489
10549
|
</xsl:if>
|
|
10490
10550
|
</xsl:template><xsl:template name="getDocumentId">
|
|
10491
10551
|
<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
|
|
@@ -3916,7 +3916,7 @@
|
|
|
3916
3916
|
</xsl:template>
|
|
3917
3917
|
|
|
3918
3918
|
|
|
3919
|
-
<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:
|
|
3919
|
+
<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">
|
|
3920
3920
|
<xsl:call-template name="getLang"/>
|
|
3921
3921
|
</xsl:variable><xsl:variable name="pageWidth_">
|
|
3922
3922
|
210
|
|
@@ -8568,7 +8568,51 @@
|
|
|
8568
8568
|
<xsl:with-param name="text" select="$text_step1"/>
|
|
8569
8569
|
</xsl:call-template>
|
|
8570
8570
|
</xsl:variable>
|
|
8571
|
-
|
|
8571
|
+
|
|
8572
|
+
<!-- <xsl:value-of select="$text_step2"/> -->
|
|
8573
|
+
|
|
8574
|
+
<!-- add zero-width space after space -->
|
|
8575
|
+
<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ')"/>
|
|
8576
|
+
|
|
8577
|
+
<!-- split text by zero-width space -->
|
|
8578
|
+
<xsl:variable name="text_step4">
|
|
8579
|
+
<xsl:call-template name="split">
|
|
8580
|
+
<xsl:with-param name="pText" select="$text_step3"/>
|
|
8581
|
+
<xsl:with-param name="sep" select="$zero_width_space"/>
|
|
8582
|
+
<xsl:with-param name="normalize-space">false</xsl:with-param>
|
|
8583
|
+
<xsl:with-param name="keep_sep">true</xsl:with-param>
|
|
8584
|
+
</xsl:call-template>
|
|
8585
|
+
</xsl:variable>
|
|
8586
|
+
|
|
8587
|
+
<xsl:for-each select="xalan:nodeset($text_step4)/item">
|
|
8588
|
+
<xsl:choose>
|
|
8589
|
+
<xsl:when test="string-length() > 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
|
|
8590
|
+
<xsl:call-template name="interspers">
|
|
8591
|
+
<xsl:with-param name="str" select="."/>
|
|
8592
|
+
</xsl:call-template>
|
|
8593
|
+
</xsl:when>
|
|
8594
|
+
<xsl:otherwise>
|
|
8595
|
+
<xsl:value-of select="."/>
|
|
8596
|
+
</xsl:otherwise>
|
|
8597
|
+
</xsl:choose>
|
|
8598
|
+
</xsl:for-each>
|
|
8599
|
+
|
|
8600
|
+
</xsl:template><xsl:template name="interspers">
|
|
8601
|
+
<xsl:param name="str"/>
|
|
8602
|
+
<xsl:param name="char" select="$zero_width_space"/>
|
|
8603
|
+
<xsl:if test="$str != ''">
|
|
8604
|
+
<xsl:value-of select="substring($str, 1, 1)"/>
|
|
8605
|
+
|
|
8606
|
+
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
|
8607
|
+
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
|
8608
|
+
<xsl:value-of select="$char"/>
|
|
8609
|
+
</xsl:if>
|
|
8610
|
+
|
|
8611
|
+
<xsl:call-template name="interspers">
|
|
8612
|
+
<xsl:with-param name="str" select="substring($str, 2)"/>
|
|
8613
|
+
<xsl:with-param name="char" select="$char"/>
|
|
8614
|
+
</xsl:call-template>
|
|
8615
|
+
</xsl:if>
|
|
8572
8616
|
</xsl:template><xsl:template match="*" mode="syntax_highlight">
|
|
8573
8617
|
<xsl:apply-templates mode="syntax_highlight"/>
|
|
8574
8618
|
</xsl:template><xsl:variable name="syntax_highlight_styles_">
|
|
@@ -9076,11 +9120,24 @@
|
|
|
9076
9120
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
9077
9121
|
<xsl:text>— </xsl:text>
|
|
9078
9122
|
<xsl:apply-templates/>
|
|
9079
|
-
</xsl:template><xsl:
|
|
9123
|
+
</xsl:template><xsl:variable name="bibitems_">
|
|
9124
|
+
<xsl:for-each select="//*[local-name() = 'bibitem']">
|
|
9125
|
+
<xsl:copy-of select="."/>
|
|
9126
|
+
</xsl:for-each>
|
|
9127
|
+
</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
|
|
9128
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
9129
|
+
<xsl:copy-of select="."/>
|
|
9130
|
+
</xsl:for-each>
|
|
9131
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
|
|
9132
|
+
<xsl:copy-of select="."/>
|
|
9133
|
+
</xsl:for-each>
|
|
9134
|
+
</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
9080
9135
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
9081
|
-
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
9136
|
+
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
|
|
9137
|
+
<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
9082
9138
|
<xsl:choose>
|
|
9083
|
-
<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) -->
|
|
9139
|
+
<!-- <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) -->
|
|
9140
|
+
<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) -->
|
|
9084
9141
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
|
9085
9142
|
<xsl:if test="@type = 'footnote'">
|
|
9086
9143
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
|
@@ -10221,7 +10278,7 @@
|
|
|
10221
10278
|
<xsl:copy>
|
|
10222
10279
|
<xsl:copy-of select="@*"/>
|
|
10223
10280
|
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
|
10224
|
-
<xsl:for-each select="*[not(@normative='true') and not(*[
|
|
10281
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
|
|
10225
10282
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
10226
10283
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
10227
10284
|
</xsl:for-each>
|
|
@@ -10470,22 +10527,25 @@
|
|
|
10470
10527
|
<xsl:param name="pText" select="."/>
|
|
10471
10528
|
<xsl:param name="sep" select="','"/>
|
|
10472
10529
|
<xsl:param name="normalize-space" select="'true'"/>
|
|
10530
|
+
<xsl:param name="keep_sep" select="'false'"/>
|
|
10473
10531
|
<xsl:if test="string-length($pText) >0">
|
|
10474
|
-
|
|
10475
|
-
|
|
10476
|
-
|
|
10477
|
-
|
|
10478
|
-
|
|
10479
|
-
|
|
10480
|
-
|
|
10481
|
-
|
|
10482
|
-
|
|
10483
|
-
|
|
10484
|
-
|
|
10485
|
-
<xsl:
|
|
10486
|
-
|
|
10487
|
-
|
|
10488
|
-
|
|
10532
|
+
<item>
|
|
10533
|
+
<xsl:choose>
|
|
10534
|
+
<xsl:when test="$normalize-space = 'true'">
|
|
10535
|
+
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
|
10536
|
+
</xsl:when>
|
|
10537
|
+
<xsl:otherwise>
|
|
10538
|
+
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
|
10539
|
+
</xsl:otherwise>
|
|
10540
|
+
</xsl:choose>
|
|
10541
|
+
</item>
|
|
10542
|
+
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
|
|
10543
|
+
<xsl:call-template name="split">
|
|
10544
|
+
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
|
10545
|
+
<xsl:with-param name="sep" select="$sep"/>
|
|
10546
|
+
<xsl:with-param name="normalize-space" select="$normalize-space"/>
|
|
10547
|
+
<xsl:with-param name="keep_sep" select="$keep_sep"/>
|
|
10548
|
+
</xsl:call-template>
|
|
10489
10549
|
</xsl:if>
|
|
10490
10550
|
</xsl:template><xsl:template name="getDocumentId">
|
|
10491
10551
|
<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
|
|
@@ -3916,7 +3916,7 @@
|
|
|
3916
3916
|
</xsl:template>
|
|
3917
3917
|
|
|
3918
3918
|
|
|
3919
|
-
<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:
|
|
3919
|
+
<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">
|
|
3920
3920
|
<xsl:call-template name="getLang"/>
|
|
3921
3921
|
</xsl:variable><xsl:variable name="pageWidth_">
|
|
3922
3922
|
210
|
|
@@ -8568,7 +8568,51 @@
|
|
|
8568
8568
|
<xsl:with-param name="text" select="$text_step1"/>
|
|
8569
8569
|
</xsl:call-template>
|
|
8570
8570
|
</xsl:variable>
|
|
8571
|
-
|
|
8571
|
+
|
|
8572
|
+
<!-- <xsl:value-of select="$text_step2"/> -->
|
|
8573
|
+
|
|
8574
|
+
<!-- add zero-width space after space -->
|
|
8575
|
+
<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ')"/>
|
|
8576
|
+
|
|
8577
|
+
<!-- split text by zero-width space -->
|
|
8578
|
+
<xsl:variable name="text_step4">
|
|
8579
|
+
<xsl:call-template name="split">
|
|
8580
|
+
<xsl:with-param name="pText" select="$text_step3"/>
|
|
8581
|
+
<xsl:with-param name="sep" select="$zero_width_space"/>
|
|
8582
|
+
<xsl:with-param name="normalize-space">false</xsl:with-param>
|
|
8583
|
+
<xsl:with-param name="keep_sep">true</xsl:with-param>
|
|
8584
|
+
</xsl:call-template>
|
|
8585
|
+
</xsl:variable>
|
|
8586
|
+
|
|
8587
|
+
<xsl:for-each select="xalan:nodeset($text_step4)/item">
|
|
8588
|
+
<xsl:choose>
|
|
8589
|
+
<xsl:when test="string-length() > 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
|
|
8590
|
+
<xsl:call-template name="interspers">
|
|
8591
|
+
<xsl:with-param name="str" select="."/>
|
|
8592
|
+
</xsl:call-template>
|
|
8593
|
+
</xsl:when>
|
|
8594
|
+
<xsl:otherwise>
|
|
8595
|
+
<xsl:value-of select="."/>
|
|
8596
|
+
</xsl:otherwise>
|
|
8597
|
+
</xsl:choose>
|
|
8598
|
+
</xsl:for-each>
|
|
8599
|
+
|
|
8600
|
+
</xsl:template><xsl:template name="interspers">
|
|
8601
|
+
<xsl:param name="str"/>
|
|
8602
|
+
<xsl:param name="char" select="$zero_width_space"/>
|
|
8603
|
+
<xsl:if test="$str != ''">
|
|
8604
|
+
<xsl:value-of select="substring($str, 1, 1)"/>
|
|
8605
|
+
|
|
8606
|
+
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
|
8607
|
+
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
|
8608
|
+
<xsl:value-of select="$char"/>
|
|
8609
|
+
</xsl:if>
|
|
8610
|
+
|
|
8611
|
+
<xsl:call-template name="interspers">
|
|
8612
|
+
<xsl:with-param name="str" select="substring($str, 2)"/>
|
|
8613
|
+
<xsl:with-param name="char" select="$char"/>
|
|
8614
|
+
</xsl:call-template>
|
|
8615
|
+
</xsl:if>
|
|
8572
8616
|
</xsl:template><xsl:template match="*" mode="syntax_highlight">
|
|
8573
8617
|
<xsl:apply-templates mode="syntax_highlight"/>
|
|
8574
8618
|
</xsl:template><xsl:variable name="syntax_highlight_styles_">
|
|
@@ -9076,11 +9120,24 @@
|
|
|
9076
9120
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
9077
9121
|
<xsl:text>— </xsl:text>
|
|
9078
9122
|
<xsl:apply-templates/>
|
|
9079
|
-
</xsl:template><xsl:
|
|
9123
|
+
</xsl:template><xsl:variable name="bibitems_">
|
|
9124
|
+
<xsl:for-each select="//*[local-name() = 'bibitem']">
|
|
9125
|
+
<xsl:copy-of select="."/>
|
|
9126
|
+
</xsl:for-each>
|
|
9127
|
+
</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
|
|
9128
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
9129
|
+
<xsl:copy-of select="."/>
|
|
9130
|
+
</xsl:for-each>
|
|
9131
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
|
|
9132
|
+
<xsl:copy-of select="."/>
|
|
9133
|
+
</xsl:for-each>
|
|
9134
|
+
</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
9080
9135
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
9081
|
-
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
9136
|
+
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
|
|
9137
|
+
<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
9082
9138
|
<xsl:choose>
|
|
9083
|
-
<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) -->
|
|
9139
|
+
<!-- <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) -->
|
|
9140
|
+
<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) -->
|
|
9084
9141
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
|
9085
9142
|
<xsl:if test="@type = 'footnote'">
|
|
9086
9143
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
|
@@ -10221,7 +10278,7 @@
|
|
|
10221
10278
|
<xsl:copy>
|
|
10222
10279
|
<xsl:copy-of select="@*"/>
|
|
10223
10280
|
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
|
10224
|
-
<xsl:for-each select="*[not(@normative='true') and not(*[
|
|
10281
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
|
|
10225
10282
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
10226
10283
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
10227
10284
|
</xsl:for-each>
|
|
@@ -10470,22 +10527,25 @@
|
|
|
10470
10527
|
<xsl:param name="pText" select="."/>
|
|
10471
10528
|
<xsl:param name="sep" select="','"/>
|
|
10472
10529
|
<xsl:param name="normalize-space" select="'true'"/>
|
|
10530
|
+
<xsl:param name="keep_sep" select="'false'"/>
|
|
10473
10531
|
<xsl:if test="string-length($pText) >0">
|
|
10474
|
-
|
|
10475
|
-
|
|
10476
|
-
|
|
10477
|
-
|
|
10478
|
-
|
|
10479
|
-
|
|
10480
|
-
|
|
10481
|
-
|
|
10482
|
-
|
|
10483
|
-
|
|
10484
|
-
|
|
10485
|
-
<xsl:
|
|
10486
|
-
|
|
10487
|
-
|
|
10488
|
-
|
|
10532
|
+
<item>
|
|
10533
|
+
<xsl:choose>
|
|
10534
|
+
<xsl:when test="$normalize-space = 'true'">
|
|
10535
|
+
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
|
10536
|
+
</xsl:when>
|
|
10537
|
+
<xsl:otherwise>
|
|
10538
|
+
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
|
10539
|
+
</xsl:otherwise>
|
|
10540
|
+
</xsl:choose>
|
|
10541
|
+
</item>
|
|
10542
|
+
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
|
|
10543
|
+
<xsl:call-template name="split">
|
|
10544
|
+
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
|
10545
|
+
<xsl:with-param name="sep" select="$sep"/>
|
|
10546
|
+
<xsl:with-param name="normalize-space" select="$normalize-space"/>
|
|
10547
|
+
<xsl:with-param name="keep_sep" select="$keep_sep"/>
|
|
10548
|
+
</xsl:call-template>
|
|
10489
10549
|
</xsl:if>
|
|
10490
10550
|
</xsl:template><xsl:template name="getDocumentId">
|
|
10491
10551
|
<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
|
|
@@ -3916,7 +3916,7 @@
|
|
|
3916
3916
|
</xsl:template>
|
|
3917
3917
|
|
|
3918
3918
|
|
|
3919
|
-
<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:
|
|
3919
|
+
<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">
|
|
3920
3920
|
<xsl:call-template name="getLang"/>
|
|
3921
3921
|
</xsl:variable><xsl:variable name="pageWidth_">
|
|
3922
3922
|
210
|
|
@@ -8568,7 +8568,51 @@
|
|
|
8568
8568
|
<xsl:with-param name="text" select="$text_step1"/>
|
|
8569
8569
|
</xsl:call-template>
|
|
8570
8570
|
</xsl:variable>
|
|
8571
|
-
|
|
8571
|
+
|
|
8572
|
+
<!-- <xsl:value-of select="$text_step2"/> -->
|
|
8573
|
+
|
|
8574
|
+
<!-- add zero-width space after space -->
|
|
8575
|
+
<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ')"/>
|
|
8576
|
+
|
|
8577
|
+
<!-- split text by zero-width space -->
|
|
8578
|
+
<xsl:variable name="text_step4">
|
|
8579
|
+
<xsl:call-template name="split">
|
|
8580
|
+
<xsl:with-param name="pText" select="$text_step3"/>
|
|
8581
|
+
<xsl:with-param name="sep" select="$zero_width_space"/>
|
|
8582
|
+
<xsl:with-param name="normalize-space">false</xsl:with-param>
|
|
8583
|
+
<xsl:with-param name="keep_sep">true</xsl:with-param>
|
|
8584
|
+
</xsl:call-template>
|
|
8585
|
+
</xsl:variable>
|
|
8586
|
+
|
|
8587
|
+
<xsl:for-each select="xalan:nodeset($text_step4)/item">
|
|
8588
|
+
<xsl:choose>
|
|
8589
|
+
<xsl:when test="string-length() > 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
|
|
8590
|
+
<xsl:call-template name="interspers">
|
|
8591
|
+
<xsl:with-param name="str" select="."/>
|
|
8592
|
+
</xsl:call-template>
|
|
8593
|
+
</xsl:when>
|
|
8594
|
+
<xsl:otherwise>
|
|
8595
|
+
<xsl:value-of select="."/>
|
|
8596
|
+
</xsl:otherwise>
|
|
8597
|
+
</xsl:choose>
|
|
8598
|
+
</xsl:for-each>
|
|
8599
|
+
|
|
8600
|
+
</xsl:template><xsl:template name="interspers">
|
|
8601
|
+
<xsl:param name="str"/>
|
|
8602
|
+
<xsl:param name="char" select="$zero_width_space"/>
|
|
8603
|
+
<xsl:if test="$str != ''">
|
|
8604
|
+
<xsl:value-of select="substring($str, 1, 1)"/>
|
|
8605
|
+
|
|
8606
|
+
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
|
8607
|
+
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
|
8608
|
+
<xsl:value-of select="$char"/>
|
|
8609
|
+
</xsl:if>
|
|
8610
|
+
|
|
8611
|
+
<xsl:call-template name="interspers">
|
|
8612
|
+
<xsl:with-param name="str" select="substring($str, 2)"/>
|
|
8613
|
+
<xsl:with-param name="char" select="$char"/>
|
|
8614
|
+
</xsl:call-template>
|
|
8615
|
+
</xsl:if>
|
|
8572
8616
|
</xsl:template><xsl:template match="*" mode="syntax_highlight">
|
|
8573
8617
|
<xsl:apply-templates mode="syntax_highlight"/>
|
|
8574
8618
|
</xsl:template><xsl:variable name="syntax_highlight_styles_">
|
|
@@ -9076,11 +9120,24 @@
|
|
|
9076
9120
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
9077
9121
|
<xsl:text>— </xsl:text>
|
|
9078
9122
|
<xsl:apply-templates/>
|
|
9079
|
-
</xsl:template><xsl:
|
|
9123
|
+
</xsl:template><xsl:variable name="bibitems_">
|
|
9124
|
+
<xsl:for-each select="//*[local-name() = 'bibitem']">
|
|
9125
|
+
<xsl:copy-of select="."/>
|
|
9126
|
+
</xsl:for-each>
|
|
9127
|
+
</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
|
|
9128
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
9129
|
+
<xsl:copy-of select="."/>
|
|
9130
|
+
</xsl:for-each>
|
|
9131
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
|
|
9132
|
+
<xsl:copy-of select="."/>
|
|
9133
|
+
</xsl:for-each>
|
|
9134
|
+
</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
9080
9135
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
9081
|
-
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
9136
|
+
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
|
|
9137
|
+
<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
9082
9138
|
<xsl:choose>
|
|
9083
|
-
<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) -->
|
|
9139
|
+
<!-- <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) -->
|
|
9140
|
+
<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) -->
|
|
9084
9141
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
|
9085
9142
|
<xsl:if test="@type = 'footnote'">
|
|
9086
9143
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
|
@@ -10221,7 +10278,7 @@
|
|
|
10221
10278
|
<xsl:copy>
|
|
10222
10279
|
<xsl:copy-of select="@*"/>
|
|
10223
10280
|
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
|
10224
|
-
<xsl:for-each select="*[not(@normative='true') and not(*[
|
|
10281
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
|
|
10225
10282
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
10226
10283
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
10227
10284
|
</xsl:for-each>
|
|
@@ -10470,22 +10527,25 @@
|
|
|
10470
10527
|
<xsl:param name="pText" select="."/>
|
|
10471
10528
|
<xsl:param name="sep" select="','"/>
|
|
10472
10529
|
<xsl:param name="normalize-space" select="'true'"/>
|
|
10530
|
+
<xsl:param name="keep_sep" select="'false'"/>
|
|
10473
10531
|
<xsl:if test="string-length($pText) >0">
|
|
10474
|
-
|
|
10475
|
-
|
|
10476
|
-
|
|
10477
|
-
|
|
10478
|
-
|
|
10479
|
-
|
|
10480
|
-
|
|
10481
|
-
|
|
10482
|
-
|
|
10483
|
-
|
|
10484
|
-
|
|
10485
|
-
<xsl:
|
|
10486
|
-
|
|
10487
|
-
|
|
10488
|
-
|
|
10532
|
+
<item>
|
|
10533
|
+
<xsl:choose>
|
|
10534
|
+
<xsl:when test="$normalize-space = 'true'">
|
|
10535
|
+
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
|
10536
|
+
</xsl:when>
|
|
10537
|
+
<xsl:otherwise>
|
|
10538
|
+
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
|
10539
|
+
</xsl:otherwise>
|
|
10540
|
+
</xsl:choose>
|
|
10541
|
+
</item>
|
|
10542
|
+
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
|
|
10543
|
+
<xsl:call-template name="split">
|
|
10544
|
+
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
|
10545
|
+
<xsl:with-param name="sep" select="$sep"/>
|
|
10546
|
+
<xsl:with-param name="normalize-space" select="$normalize-space"/>
|
|
10547
|
+
<xsl:with-param name="keep_sep" select="$keep_sep"/>
|
|
10548
|
+
</xsl:call-template>
|
|
10489
10549
|
</xsl:if>
|
|
10490
10550
|
</xsl:template><xsl:template name="getDocumentId">
|
|
10491
10551
|
<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
|
|
@@ -1760,7 +1760,7 @@
|
|
|
1760
1760
|
</fo:block-container>
|
|
1761
1761
|
</xsl:template>
|
|
1762
1762
|
|
|
1763
|
-
<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:
|
|
1763
|
+
<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">
|
|
1764
1764
|
<xsl:call-template name="getLang"/>
|
|
1765
1765
|
</xsl:variable><xsl:variable name="pageWidth_">
|
|
1766
1766
|
210
|
|
@@ -6362,7 +6362,51 @@
|
|
|
6362
6362
|
<xsl:with-param name="text" select="$text_step1"/>
|
|
6363
6363
|
</xsl:call-template>
|
|
6364
6364
|
</xsl:variable>
|
|
6365
|
-
|
|
6365
|
+
|
|
6366
|
+
<!-- <xsl:value-of select="$text_step2"/> -->
|
|
6367
|
+
|
|
6368
|
+
<!-- add zero-width space after space -->
|
|
6369
|
+
<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ')"/>
|
|
6370
|
+
|
|
6371
|
+
<!-- split text by zero-width space -->
|
|
6372
|
+
<xsl:variable name="text_step4">
|
|
6373
|
+
<xsl:call-template name="split">
|
|
6374
|
+
<xsl:with-param name="pText" select="$text_step3"/>
|
|
6375
|
+
<xsl:with-param name="sep" select="$zero_width_space"/>
|
|
6376
|
+
<xsl:with-param name="normalize-space">false</xsl:with-param>
|
|
6377
|
+
<xsl:with-param name="keep_sep">true</xsl:with-param>
|
|
6378
|
+
</xsl:call-template>
|
|
6379
|
+
</xsl:variable>
|
|
6380
|
+
|
|
6381
|
+
<xsl:for-each select="xalan:nodeset($text_step4)/item">
|
|
6382
|
+
<xsl:choose>
|
|
6383
|
+
<xsl:when test="string-length() > 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
|
|
6384
|
+
<xsl:call-template name="interspers">
|
|
6385
|
+
<xsl:with-param name="str" select="."/>
|
|
6386
|
+
</xsl:call-template>
|
|
6387
|
+
</xsl:when>
|
|
6388
|
+
<xsl:otherwise>
|
|
6389
|
+
<xsl:value-of select="."/>
|
|
6390
|
+
</xsl:otherwise>
|
|
6391
|
+
</xsl:choose>
|
|
6392
|
+
</xsl:for-each>
|
|
6393
|
+
|
|
6394
|
+
</xsl:template><xsl:template name="interspers">
|
|
6395
|
+
<xsl:param name="str"/>
|
|
6396
|
+
<xsl:param name="char" select="$zero_width_space"/>
|
|
6397
|
+
<xsl:if test="$str != ''">
|
|
6398
|
+
<xsl:value-of select="substring($str, 1, 1)"/>
|
|
6399
|
+
|
|
6400
|
+
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
|
6401
|
+
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
|
6402
|
+
<xsl:value-of select="$char"/>
|
|
6403
|
+
</xsl:if>
|
|
6404
|
+
|
|
6405
|
+
<xsl:call-template name="interspers">
|
|
6406
|
+
<xsl:with-param name="str" select="substring($str, 2)"/>
|
|
6407
|
+
<xsl:with-param name="char" select="$char"/>
|
|
6408
|
+
</xsl:call-template>
|
|
6409
|
+
</xsl:if>
|
|
6366
6410
|
</xsl:template><xsl:template match="*" mode="syntax_highlight">
|
|
6367
6411
|
<xsl:apply-templates mode="syntax_highlight"/>
|
|
6368
6412
|
</xsl:template><xsl:variable name="syntax_highlight_styles_">
|
|
@@ -6743,7 +6787,7 @@
|
|
|
6743
6787
|
<xsl:variable name="element">
|
|
6744
6788
|
|
|
6745
6789
|
<xsl:choose>
|
|
6746
|
-
<xsl:when test="$num = 1">inline</xsl:when>
|
|
6790
|
+
<xsl:when test="$num = 1 and not(contains($fo_element, 'block'))">inline</xsl:when>
|
|
6747
6791
|
<xsl:otherwise>block</xsl:otherwise>
|
|
6748
6792
|
</xsl:choose>
|
|
6749
6793
|
|
|
@@ -6885,11 +6929,24 @@
|
|
|
6885
6929
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
6886
6930
|
<xsl:text>— </xsl:text>
|
|
6887
6931
|
<xsl:apply-templates/>
|
|
6888
|
-
</xsl:template><xsl:
|
|
6932
|
+
</xsl:template><xsl:variable name="bibitems_">
|
|
6933
|
+
<xsl:for-each select="//*[local-name() = 'bibitem']">
|
|
6934
|
+
<xsl:copy-of select="."/>
|
|
6935
|
+
</xsl:for-each>
|
|
6936
|
+
</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
|
|
6937
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
6938
|
+
<xsl:copy-of select="."/>
|
|
6939
|
+
</xsl:for-each>
|
|
6940
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
|
|
6941
|
+
<xsl:copy-of select="."/>
|
|
6942
|
+
</xsl:for-each>
|
|
6943
|
+
</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
6889
6944
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
6890
|
-
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
6945
|
+
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
|
|
6946
|
+
<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
|
|
6891
6947
|
<xsl:choose>
|
|
6892
|
-
<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) -->
|
|
6948
|
+
<!-- <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) -->
|
|
6949
|
+
<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) -->
|
|
6893
6950
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
|
6894
6951
|
<xsl:if test="@type = 'footnote'">
|
|
6895
6952
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
|
@@ -8012,7 +8069,7 @@
|
|
|
8012
8069
|
<xsl:copy>
|
|
8013
8070
|
<xsl:copy-of select="@*"/>
|
|
8014
8071
|
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
|
8015
|
-
<xsl:for-each select="*[not(@normative='true') and not(*[
|
|
8072
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
|
|
8016
8073
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
8017
8074
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
8018
8075
|
</xsl:for-each>
|
|
@@ -8258,22 +8315,25 @@
|
|
|
8258
8315
|
<xsl:param name="pText" select="."/>
|
|
8259
8316
|
<xsl:param name="sep" select="','"/>
|
|
8260
8317
|
<xsl:param name="normalize-space" select="'true'"/>
|
|
8318
|
+
<xsl:param name="keep_sep" select="'false'"/>
|
|
8261
8319
|
<xsl:if test="string-length($pText) >0">
|
|
8262
|
-
|
|
8263
|
-
|
|
8264
|
-
|
|
8265
|
-
|
|
8266
|
-
|
|
8267
|
-
|
|
8268
|
-
|
|
8269
|
-
|
|
8270
|
-
|
|
8271
|
-
|
|
8272
|
-
|
|
8273
|
-
<xsl:
|
|
8274
|
-
|
|
8275
|
-
|
|
8276
|
-
|
|
8320
|
+
<item>
|
|
8321
|
+
<xsl:choose>
|
|
8322
|
+
<xsl:when test="$normalize-space = 'true'">
|
|
8323
|
+
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
|
8324
|
+
</xsl:when>
|
|
8325
|
+
<xsl:otherwise>
|
|
8326
|
+
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
|
8327
|
+
</xsl:otherwise>
|
|
8328
|
+
</xsl:choose>
|
|
8329
|
+
</item>
|
|
8330
|
+
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
|
|
8331
|
+
<xsl:call-template name="split">
|
|
8332
|
+
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
|
8333
|
+
<xsl:with-param name="sep" select="$sep"/>
|
|
8334
|
+
<xsl:with-param name="normalize-space" select="$normalize-space"/>
|
|
8335
|
+
<xsl:with-param name="keep_sep" select="$keep_sep"/>
|
|
8336
|
+
</xsl:call-template>
|
|
8277
8337
|
</xsl:if>
|
|
8278
8338
|
</xsl:template><xsl:template name="getDocumentId">
|
|
8279
8339
|
<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
|
data/metanorma-bipm.gemspec
CHANGED
|
@@ -39,6 +39,6 @@ Gem::Specification.new do |spec|
|
|
|
39
39
|
spec.add_development_dependency "sassc", "2.4.0"
|
|
40
40
|
spec.add_development_dependency "simplecov", "~> 0.15"
|
|
41
41
|
spec.add_development_dependency "timecop", "~> 0.9"
|
|
42
|
-
spec.add_development_dependency "vcr", "~>
|
|
42
|
+
spec.add_development_dependency "vcr", "~> 6.1.0"
|
|
43
43
|
spec.add_development_dependency "webmock"
|
|
44
44
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-bipm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0.
|
|
4
|
+
version: 2.0.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-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-generic
|
|
@@ -184,14 +184,14 @@ dependencies:
|
|
|
184
184
|
requirements:
|
|
185
185
|
- - "~>"
|
|
186
186
|
- !ruby/object:Gem::Version
|
|
187
|
-
version:
|
|
187
|
+
version: 6.1.0
|
|
188
188
|
type: :development
|
|
189
189
|
prerelease: false
|
|
190
190
|
version_requirements: !ruby/object:Gem::Requirement
|
|
191
191
|
requirements:
|
|
192
192
|
- - "~>"
|
|
193
193
|
- !ruby/object:Gem::Version
|
|
194
|
-
version:
|
|
194
|
+
version: 6.1.0
|
|
195
195
|
- !ruby/object:Gem::Dependency
|
|
196
196
|
name: webmock
|
|
197
197
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
298
298
|
- !ruby/object:Gem::Version
|
|
299
299
|
version: '0'
|
|
300
300
|
requirements: []
|
|
301
|
-
rubygems_version: 3.
|
|
301
|
+
rubygems_version: 3.3.9
|
|
302
302
|
signing_key:
|
|
303
303
|
specification_version: 4
|
|
304
304
|
summary: metanorma-bipm lets you write BIPM standards in Metanorma.
|