metanorma-bipm 2.2.13 → 2.2.14

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.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/bipm/bipm.brochure.xsl +44 -38
  3. data/lib/isodoc/bipm/bipm.guide.xsl +44 -38
  4. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +44 -38
  5. data/lib/isodoc/bipm/bipm.rapport.xsl +44 -38
  6. data/lib/isodoc/bipm/html/htmlstyle.css +7 -3
  7. data/lib/isodoc/bipm/jcgm.standard.xsl +48 -42
  8. data/lib/metanorma/bipm/version.rb +1 -1
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d51662c5bd5119a4ac8a1e1f289b5d713e65ceaf9bdbe9d870d6363838719727
4
- data.tar.gz: ba913e8a28ed139b406155bebdc99bbcf013875f76b8bcc9cbd006655993e88f
3
+ metadata.gz: 562ebdd8e3b0d6bb6345c05c8944919c9e91a0b0a22fe0fd81d38de77ebe279e
4
+ data.tar.gz: 3fbda2a4fa426942a2208388e1ce9aebd64f4a496e266aff7f1f7d94cd81a04b
5
5
  SHA512:
6
- metadata.gz: d22d21e9523931d1e0872fe339d5f76fb51c5e2ac6e04c9c3ca1fcdf8a94d44097dd2810b5ef24d225945c4ea96882db10e12b037e218a12ddd65b2c34d8715d
7
- data.tar.gz: 81a50f67292600ced23fe851d5baf3e3fe9d128c1f57ac56c051c9b60ac3560d557c8d7352e38e62daadbcf5cf5561864fab136e3d3fcda311f9f36c35372148
6
+ metadata.gz: 2b7bfa7a1fc50aa8befcff9364e7c9f3f22096d7fac415404fefb591df8d093ccaa0407ab5903336d61def56a9524fdb91c8a57e1a89126465690a5041ce370a
7
+ data.tar.gz: 419395d1172f4b2d6e4f3eedf9a5e2078d1cf038d16c54832ae307ae58fda357d8288524de1b28cc6c308acd1512c62fd6d203f9e2d5a2c8873ac9a36546f547
data/lib/isodoc/bipm/bipm.brochure.xsl CHANGED
@@ -4009,19 +4009,32 @@
4009
4009
  <xsl:variable name="titles_">
4010
4010
 
4011
4011
  <!-- These titles of Table of contents renders different than determined in localized-strings -->
4012
- <title-toc lang="en">
4013
-
4014
- </title-toc>
4015
- <title-toc lang="fr">
4012
+ <!-- <title-toc lang="en">
4013
+ <xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
4014
+ <xsl:text>Contents</xsl:text>
4015
+ </xsl:if>
4016
+ <xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
4017
+ <xsl:text>Table of Contents</xsl:text>
4018
+ </xsl:if>
4019
+ <xsl:if test="$namespace = 'gb'">
4020
+ <xsl:text>Table of contents</xsl:text>
4021
+ </xsl:if>
4022
+ </title-toc> -->
4023
+ <title-toc lang="en">Table of contents</title-toc>
4024
+ <!-- <title-toc lang="fr">
4016
4025
  <xsl:text>Sommaire</xsl:text>
4017
- </title-toc>
4018
- <title-toc lang="zh">
4019
-
4026
+ </title-toc> -->
4027
+ <!-- <title-toc lang="zh">
4028
+ <xsl:choose>
4029
+ <xsl:when test="$namespace = 'gb'">
4030
+ <xsl:text>目次</xsl:text>
4031
+ </xsl:when>
4032
+ <xsl:otherwise>
4020
4033
  <xsl:text>Contents</xsl:text>
4021
-
4022
- </title-toc>
4023
-
4024
- <title-descriptors lang="en">Descriptors</title-descriptors>
4034
+ </xsl:otherwise>
4035
+ </xsl:choose>
4036
+ </title-toc> -->
4037
+ <title-toc lang="zh">目次</title-toc>
4025
4038
 
4026
4039
  <title-part lang="en">
4027
4040
 
@@ -4041,20 +4054,6 @@
4041
4054
  <title-subpart lang="en">Sub-part #</title-subpart>
4042
4055
  <title-subpart lang="fr">Partie de sub #</title-subpart>
4043
4056
 
4044
- <title-list-tables lang="en">List of Tables</title-list-tables>
4045
-
4046
- <title-list-figures lang="en">List of Figures</title-list-figures>
4047
-
4048
- <title-table-figures lang="en">Table of Figures</title-table-figures>
4049
-
4050
- <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
4051
-
4052
- <title-summary lang="en">Summary</title-summary>
4053
-
4054
- <title-continued lang="ru">(продолжение)</title-continued>
4055
- <title-continued lang="en">(continued)</title-continued>
4056
- <title-continued lang="fr">(continué)</title-continued>
4057
-
4058
4057
  </xsl:variable>
4059
4058
  <xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
4060
4059
 
@@ -4062,8 +4061,8 @@
4062
4061
  <xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
4063
4062
  <xsl:value-of select="$toc_table_title"/>
4064
4063
  <xsl:if test="normalize-space($toc_table_title) = ''">
4065
- <xsl:call-template name="getTitle">
4066
- <xsl:with-param name="name" select="'title-list-tables'"/>
4064
+ <xsl:call-template name="getLocalizedString">
4065
+ <xsl:with-param name="key">toc_tables</xsl:with-param>
4067
4066
  </xsl:call-template>
4068
4067
  </xsl:if>
4069
4068
  </xsl:variable>
@@ -4072,8 +4071,8 @@
4072
4071
  <xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
4073
4072
  <xsl:value-of select="$toc_figure_title"/>
4074
4073
  <xsl:if test="normalize-space($toc_figure_title) = ''">
4075
- <xsl:call-template name="getTitle">
4076
- <xsl:with-param name="name" select="'title-list-figures'"/>
4074
+ <xsl:call-template name="getLocalizedString">
4075
+ <xsl:with-param name="key">toc_figures</xsl:with-param>
4077
4076
  </xsl:call-template>
4078
4077
  </xsl:if>
4079
4078
  </xsl:variable>
@@ -4082,8 +4081,8 @@
4082
4081
  <xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
4083
4082
  <xsl:value-of select="$toc_requirement_title"/>
4084
4083
  <xsl:if test="normalize-space($toc_requirement_title) = ''">
4085
- <xsl:call-template name="getTitle">
4086
- <xsl:with-param name="name" select="'title-list-recommendations'"/>
4084
+ <xsl:call-template name="getLocalizedString">
4085
+ <xsl:with-param name="key">toc_recommendations</xsl:with-param>
4087
4086
  </xsl:call-template>
4088
4087
  </xsl:if>
4089
4088
  </xsl:variable>
@@ -7954,7 +7953,7 @@
7954
7953
  <xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
7955
7954
  <xsl:template match="*[local-name()='tt']/text()" priority="2">
7956
7955
  <xsl:choose>
7957
- <xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
7956
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
7958
7957
  <!-- url -->
7959
7958
  <xsl:call-template name="add-zero-spaces-link-java"/>
7960
7959
  </xsl:when>
@@ -8416,10 +8415,13 @@
8416
8415
  </xsl:choose>
8417
8416
  </xsl:variable>
8418
8417
 
8418
+ <!-- replace sequence #x200B to one &#x200B -->
8419
+ <xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '​')"/>
8420
+
8419
8421
  <!-- replace sequence #x200B and space TO space -->
8420
- <xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
8422
+ <xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
8421
8423
 
8422
- <xsl:value-of select="$text10"/>
8424
+ <xsl:value-of select="$text11"/>
8423
8425
  </xsl:template>
8424
8426
 
8425
8427
  <xsl:template name="add-zero-spaces-link-java">
@@ -8429,8 +8431,12 @@
8429
8431
  <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
8430
8432
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @ -->
8431
8433
  <xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1​')"/>
8434
+
8435
+ <!-- replace sequence #x200B to one &#x200B -->
8436
+ <xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '​')"/>
8437
+
8432
8438
  <!-- remove zero-width space at the end -->
8433
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
8439
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '​$', '')"/>
8434
8440
  </xsl:template>
8435
8441
 
8436
8442
  <!-- add zero space after dash character (for table's entries) -->
@@ -9725,7 +9731,7 @@
9725
9731
 
9726
9732
  <xsl:call-template name="refine_note_block_style"/>
9727
9733
 
9728
- <fo:inline xsl:use-attribute-sets="note-name-style">
9734
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
9729
9735
 
9730
9736
  <xsl:call-template name="refine_note-name-style"/>
9731
9737
 
@@ -9769,12 +9775,12 @@
9769
9775
  <xsl:variable name="num"><xsl:number/></xsl:variable>
9770
9776
  <xsl:choose>
9771
9777
  <xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
9772
- <fo:inline xsl:use-attribute-sets="note-p-style">
9778
+ <fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
9773
9779
  <xsl:apply-templates/>
9774
9780
  </fo:inline>
9775
9781
  </xsl:when>
9776
9782
  <xsl:otherwise>
9777
- <fo:block xsl:use-attribute-sets="note-p-style">
9783
+ <fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
9778
9784
  <xsl:apply-templates/>
9779
9785
  </fo:block>
9780
9786
  </xsl:otherwise>
data/lib/isodoc/bipm/bipm.guide.xsl CHANGED
@@ -4009,19 +4009,32 @@
4009
4009
  <xsl:variable name="titles_">
4010
4010
 
4011
4011
  <!-- These titles of Table of contents renders different than determined in localized-strings -->
4012
- <title-toc lang="en">
4013
-
4014
- </title-toc>
4015
- <title-toc lang="fr">
4012
+ <!-- <title-toc lang="en">
4013
+ <xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
4014
+ <xsl:text>Contents</xsl:text>
4015
+ </xsl:if>
4016
+ <xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
4017
+ <xsl:text>Table of Contents</xsl:text>
4018
+ </xsl:if>
4019
+ <xsl:if test="$namespace = 'gb'">
4020
+ <xsl:text>Table of contents</xsl:text>
4021
+ </xsl:if>
4022
+ </title-toc> -->
4023
+ <title-toc lang="en">Table of contents</title-toc>
4024
+ <!-- <title-toc lang="fr">
4016
4025
  <xsl:text>Sommaire</xsl:text>
4017
- </title-toc>
4018
- <title-toc lang="zh">
4019
-
4026
+ </title-toc> -->
4027
+ <!-- <title-toc lang="zh">
4028
+ <xsl:choose>
4029
+ <xsl:when test="$namespace = 'gb'">
4030
+ <xsl:text>目次</xsl:text>
4031
+ </xsl:when>
4032
+ <xsl:otherwise>
4020
4033
  <xsl:text>Contents</xsl:text>
4021
-
4022
- </title-toc>
4023
-
4024
- <title-descriptors lang="en">Descriptors</title-descriptors>
4034
+ </xsl:otherwise>
4035
+ </xsl:choose>
4036
+ </title-toc> -->
4037
+ <title-toc lang="zh">目次</title-toc>
4025
4038
 
4026
4039
  <title-part lang="en">
4027
4040
 
@@ -4041,20 +4054,6 @@
4041
4054
  <title-subpart lang="en">Sub-part #</title-subpart>
4042
4055
  <title-subpart lang="fr">Partie de sub #</title-subpart>
4043
4056
 
4044
- <title-list-tables lang="en">List of Tables</title-list-tables>
4045
-
4046
- <title-list-figures lang="en">List of Figures</title-list-figures>
4047
-
4048
- <title-table-figures lang="en">Table of Figures</title-table-figures>
4049
-
4050
- <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
4051
-
4052
- <title-summary lang="en">Summary</title-summary>
4053
-
4054
- <title-continued lang="ru">(продолжение)</title-continued>
4055
- <title-continued lang="en">(continued)</title-continued>
4056
- <title-continued lang="fr">(continué)</title-continued>
4057
-
4058
4057
  </xsl:variable>
4059
4058
  <xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
4060
4059
 
@@ -4062,8 +4061,8 @@
4062
4061
  <xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
4063
4062
  <xsl:value-of select="$toc_table_title"/>
4064
4063
  <xsl:if test="normalize-space($toc_table_title) = ''">
4065
- <xsl:call-template name="getTitle">
4066
- <xsl:with-param name="name" select="'title-list-tables'"/>
4064
+ <xsl:call-template name="getLocalizedString">
4065
+ <xsl:with-param name="key">toc_tables</xsl:with-param>
4067
4066
  </xsl:call-template>
4068
4067
  </xsl:if>
4069
4068
  </xsl:variable>
@@ -4072,8 +4071,8 @@
4072
4071
  <xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
4073
4072
  <xsl:value-of select="$toc_figure_title"/>
4074
4073
  <xsl:if test="normalize-space($toc_figure_title) = ''">
4075
- <xsl:call-template name="getTitle">
4076
- <xsl:with-param name="name" select="'title-list-figures'"/>
4074
+ <xsl:call-template name="getLocalizedString">
4075
+ <xsl:with-param name="key">toc_figures</xsl:with-param>
4077
4076
  </xsl:call-template>
4078
4077
  </xsl:if>
4079
4078
  </xsl:variable>
@@ -4082,8 +4081,8 @@
4082
4081
  <xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
4083
4082
  <xsl:value-of select="$toc_requirement_title"/>
4084
4083
  <xsl:if test="normalize-space($toc_requirement_title) = ''">
4085
- <xsl:call-template name="getTitle">
4086
- <xsl:with-param name="name" select="'title-list-recommendations'"/>
4084
+ <xsl:call-template name="getLocalizedString">
4085
+ <xsl:with-param name="key">toc_recommendations</xsl:with-param>
4087
4086
  </xsl:call-template>
4088
4087
  </xsl:if>
4089
4088
  </xsl:variable>
@@ -7954,7 +7953,7 @@
7954
7953
  <xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
7955
7954
  <xsl:template match="*[local-name()='tt']/text()" priority="2">
7956
7955
  <xsl:choose>
7957
- <xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
7956
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
7958
7957
  <!-- url -->
7959
7958
  <xsl:call-template name="add-zero-spaces-link-java"/>
7960
7959
  </xsl:when>
@@ -8416,10 +8415,13 @@
8416
8415
  </xsl:choose>
8417
8416
  </xsl:variable>
8418
8417
 
8418
+ <!-- replace sequence #x200B to one &#x200B -->
8419
+ <xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '​')"/>
8420
+
8419
8421
  <!-- replace sequence #x200B and space TO space -->
8420
- <xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
8422
+ <xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
8421
8423
 
8422
- <xsl:value-of select="$text10"/>
8424
+ <xsl:value-of select="$text11"/>
8423
8425
  </xsl:template>
8424
8426
 
8425
8427
  <xsl:template name="add-zero-spaces-link-java">
@@ -8429,8 +8431,12 @@
8429
8431
  <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
8430
8432
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @ -->
8431
8433
  <xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1​')"/>
8434
+
8435
+ <!-- replace sequence #x200B to one &#x200B -->
8436
+ <xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '​')"/>
8437
+
8432
8438
  <!-- remove zero-width space at the end -->
8433
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
8439
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '​$', '')"/>
8434
8440
  </xsl:template>
8435
8441
 
8436
8442
  <!-- add zero space after dash character (for table's entries) -->
@@ -9725,7 +9731,7 @@
9725
9731
 
9726
9732
  <xsl:call-template name="refine_note_block_style"/>
9727
9733
 
9728
- <fo:inline xsl:use-attribute-sets="note-name-style">
9734
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
9729
9735
 
9730
9736
  <xsl:call-template name="refine_note-name-style"/>
9731
9737
 
@@ -9769,12 +9775,12 @@
9769
9775
  <xsl:variable name="num"><xsl:number/></xsl:variable>
9770
9776
  <xsl:choose>
9771
9777
  <xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
9772
- <fo:inline xsl:use-attribute-sets="note-p-style">
9778
+ <fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
9773
9779
  <xsl:apply-templates/>
9774
9780
  </fo:inline>
9775
9781
  </xsl:when>
9776
9782
  <xsl:otherwise>
9777
- <fo:block xsl:use-attribute-sets="note-p-style">
9783
+ <fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
9778
9784
  <xsl:apply-templates/>
9779
9785
  </fo:block>
9780
9786
  </xsl:otherwise>
data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl CHANGED
@@ -4009,19 +4009,32 @@
4009
4009
  <xsl:variable name="titles_">
4010
4010
 
4011
4011
  <!-- These titles of Table of contents renders different than determined in localized-strings -->
4012
- <title-toc lang="en">
4013
-
4014
- </title-toc>
4015
- <title-toc lang="fr">
4012
+ <!-- <title-toc lang="en">
4013
+ <xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
4014
+ <xsl:text>Contents</xsl:text>
4015
+ </xsl:if>
4016
+ <xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
4017
+ <xsl:text>Table of Contents</xsl:text>
4018
+ </xsl:if>
4019
+ <xsl:if test="$namespace = 'gb'">
4020
+ <xsl:text>Table of contents</xsl:text>
4021
+ </xsl:if>
4022
+ </title-toc> -->
4023
+ <title-toc lang="en">Table of contents</title-toc>
4024
+ <!-- <title-toc lang="fr">
4016
4025
  <xsl:text>Sommaire</xsl:text>
4017
- </title-toc>
4018
- <title-toc lang="zh">
4019
-
4026
+ </title-toc> -->
4027
+ <!-- <title-toc lang="zh">
4028
+ <xsl:choose>
4029
+ <xsl:when test="$namespace = 'gb'">
4030
+ <xsl:text>目次</xsl:text>
4031
+ </xsl:when>
4032
+ <xsl:otherwise>
4020
4033
  <xsl:text>Contents</xsl:text>
4021
-
4022
- </title-toc>
4023
-
4024
- <title-descriptors lang="en">Descriptors</title-descriptors>
4034
+ </xsl:otherwise>
4035
+ </xsl:choose>
4036
+ </title-toc> -->
4037
+ <title-toc lang="zh">目次</title-toc>
4025
4038
 
4026
4039
  <title-part lang="en">
4027
4040
 
@@ -4041,20 +4054,6 @@
4041
4054
  <title-subpart lang="en">Sub-part #</title-subpart>
4042
4055
  <title-subpart lang="fr">Partie de sub #</title-subpart>
4043
4056
 
4044
- <title-list-tables lang="en">List of Tables</title-list-tables>
4045
-
4046
- <title-list-figures lang="en">List of Figures</title-list-figures>
4047
-
4048
- <title-table-figures lang="en">Table of Figures</title-table-figures>
4049
-
4050
- <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
4051
-
4052
- <title-summary lang="en">Summary</title-summary>
4053
-
4054
- <title-continued lang="ru">(продолжение)</title-continued>
4055
- <title-continued lang="en">(continued)</title-continued>
4056
- <title-continued lang="fr">(continué)</title-continued>
4057
-
4058
4057
  </xsl:variable>
4059
4058
  <xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
4060
4059
 
@@ -4062,8 +4061,8 @@
4062
4061
  <xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
4063
4062
  <xsl:value-of select="$toc_table_title"/>
4064
4063
  <xsl:if test="normalize-space($toc_table_title) = ''">
4065
- <xsl:call-template name="getTitle">
4066
- <xsl:with-param name="name" select="'title-list-tables'"/>
4064
+ <xsl:call-template name="getLocalizedString">
4065
+ <xsl:with-param name="key">toc_tables</xsl:with-param>
4067
4066
  </xsl:call-template>
4068
4067
  </xsl:if>
4069
4068
  </xsl:variable>
@@ -4072,8 +4071,8 @@
4072
4071
  <xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
4073
4072
  <xsl:value-of select="$toc_figure_title"/>
4074
4073
  <xsl:if test="normalize-space($toc_figure_title) = ''">
4075
- <xsl:call-template name="getTitle">
4076
- <xsl:with-param name="name" select="'title-list-figures'"/>
4074
+ <xsl:call-template name="getLocalizedString">
4075
+ <xsl:with-param name="key">toc_figures</xsl:with-param>
4077
4076
  </xsl:call-template>
4078
4077
  </xsl:if>
4079
4078
  </xsl:variable>
@@ -4082,8 +4081,8 @@
4082
4081
  <xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
4083
4082
  <xsl:value-of select="$toc_requirement_title"/>
4084
4083
  <xsl:if test="normalize-space($toc_requirement_title) = ''">
4085
- <xsl:call-template name="getTitle">
4086
- <xsl:with-param name="name" select="'title-list-recommendations'"/>
4084
+ <xsl:call-template name="getLocalizedString">
4085
+ <xsl:with-param name="key">toc_recommendations</xsl:with-param>
4087
4086
  </xsl:call-template>
4088
4087
  </xsl:if>
4089
4088
  </xsl:variable>
@@ -7954,7 +7953,7 @@
7954
7953
  <xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
7955
7954
  <xsl:template match="*[local-name()='tt']/text()" priority="2">
7956
7955
  <xsl:choose>
7957
- <xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
7956
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
7958
7957
  <!-- url -->
7959
7958
  <xsl:call-template name="add-zero-spaces-link-java"/>
7960
7959
  </xsl:when>
@@ -8416,10 +8415,13 @@
8416
8415
  </xsl:choose>
8417
8416
  </xsl:variable>
8418
8417
 
8418
+ <!-- replace sequence #x200B to one &#x200B -->
8419
+ <xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '​')"/>
8420
+
8419
8421
  <!-- replace sequence #x200B and space TO space -->
8420
- <xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
8422
+ <xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
8421
8423
 
8422
- <xsl:value-of select="$text10"/>
8424
+ <xsl:value-of select="$text11"/>
8423
8425
  </xsl:template>
8424
8426
 
8425
8427
  <xsl:template name="add-zero-spaces-link-java">
@@ -8429,8 +8431,12 @@
8429
8431
  <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
8430
8432
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @ -->
8431
8433
  <xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1​')"/>
8434
+
8435
+ <!-- replace sequence #x200B to one &#x200B -->
8436
+ <xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '​')"/>
8437
+
8432
8438
  <!-- remove zero-width space at the end -->
8433
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
8439
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '​$', '')"/>
8434
8440
  </xsl:template>
8435
8441
 
8436
8442
  <!-- add zero space after dash character (for table's entries) -->
@@ -9725,7 +9731,7 @@
9725
9731
 
9726
9732
  <xsl:call-template name="refine_note_block_style"/>
9727
9733
 
9728
- <fo:inline xsl:use-attribute-sets="note-name-style">
9734
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
9729
9735
 
9730
9736
  <xsl:call-template name="refine_note-name-style"/>
9731
9737
 
@@ -9769,12 +9775,12 @@
9769
9775
  <xsl:variable name="num"><xsl:number/></xsl:variable>
9770
9776
  <xsl:choose>
9771
9777
  <xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
9772
- <fo:inline xsl:use-attribute-sets="note-p-style">
9778
+ <fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
9773
9779
  <xsl:apply-templates/>
9774
9780
  </fo:inline>
9775
9781
  </xsl:when>
9776
9782
  <xsl:otherwise>
9777
- <fo:block xsl:use-attribute-sets="note-p-style">
9783
+ <fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
9778
9784
  <xsl:apply-templates/>
9779
9785
  </fo:block>
9780
9786
  </xsl:otherwise>
data/lib/isodoc/bipm/bipm.rapport.xsl CHANGED
@@ -4009,19 +4009,32 @@
4009
4009
  <xsl:variable name="titles_">
4010
4010
 
4011
4011
  <!-- These titles of Table of contents renders different than determined in localized-strings -->
4012
- <title-toc lang="en">
4013
-
4014
- </title-toc>
4015
- <title-toc lang="fr">
4012
+ <!-- <title-toc lang="en">
4013
+ <xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
4014
+ <xsl:text>Contents</xsl:text>
4015
+ </xsl:if>
4016
+ <xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
4017
+ <xsl:text>Table of Contents</xsl:text>
4018
+ </xsl:if>
4019
+ <xsl:if test="$namespace = 'gb'">
4020
+ <xsl:text>Table of contents</xsl:text>
4021
+ </xsl:if>
4022
+ </title-toc> -->
4023
+ <title-toc lang="en">Table of contents</title-toc>
4024
+ <!-- <title-toc lang="fr">
4016
4025
  <xsl:text>Sommaire</xsl:text>
4017
- </title-toc>
4018
- <title-toc lang="zh">
4019
-
4026
+ </title-toc> -->
4027
+ <!-- <title-toc lang="zh">
4028
+ <xsl:choose>
4029
+ <xsl:when test="$namespace = 'gb'">
4030
+ <xsl:text>目次</xsl:text>
4031
+ </xsl:when>
4032
+ <xsl:otherwise>
4020
4033
  <xsl:text>Contents</xsl:text>
4021
-
4022
- </title-toc>
4023
-
4024
- <title-descriptors lang="en">Descriptors</title-descriptors>
4034
+ </xsl:otherwise>
4035
+ </xsl:choose>
4036
+ </title-toc> -->
4037
+ <title-toc lang="zh">目次</title-toc>
4025
4038
 
4026
4039
  <title-part lang="en">
4027
4040
 
@@ -4041,20 +4054,6 @@
4041
4054
  <title-subpart lang="en">Sub-part #</title-subpart>
4042
4055
  <title-subpart lang="fr">Partie de sub #</title-subpart>
4043
4056
 
4044
- <title-list-tables lang="en">List of Tables</title-list-tables>
4045
-
4046
- <title-list-figures lang="en">List of Figures</title-list-figures>
4047
-
4048
- <title-table-figures lang="en">Table of Figures</title-table-figures>
4049
-
4050
- <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
4051
-
4052
- <title-summary lang="en">Summary</title-summary>
4053
-
4054
- <title-continued lang="ru">(продолжение)</title-continued>
4055
- <title-continued lang="en">(continued)</title-continued>
4056
- <title-continued lang="fr">(continué)</title-continued>
4057
-
4058
4057
  </xsl:variable>
4059
4058
  <xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
4060
4059
 
@@ -4062,8 +4061,8 @@
4062
4061
  <xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
4063
4062
  <xsl:value-of select="$toc_table_title"/>
4064
4063
  <xsl:if test="normalize-space($toc_table_title) = ''">
4065
- <xsl:call-template name="getTitle">
4066
- <xsl:with-param name="name" select="'title-list-tables'"/>
4064
+ <xsl:call-template name="getLocalizedString">
4065
+ <xsl:with-param name="key">toc_tables</xsl:with-param>
4067
4066
  </xsl:call-template>
4068
4067
  </xsl:if>
4069
4068
  </xsl:variable>
@@ -4072,8 +4071,8 @@
4072
4071
  <xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
4073
4072
  <xsl:value-of select="$toc_figure_title"/>
4074
4073
  <xsl:if test="normalize-space($toc_figure_title) = ''">
4075
- <xsl:call-template name="getTitle">
4076
- <xsl:with-param name="name" select="'title-list-figures'"/>
4074
+ <xsl:call-template name="getLocalizedString">
4075
+ <xsl:with-param name="key">toc_figures</xsl:with-param>
4077
4076
  </xsl:call-template>
4078
4077
  </xsl:if>
4079
4078
  </xsl:variable>
@@ -4082,8 +4081,8 @@
4082
4081
  <xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
4083
4082
  <xsl:value-of select="$toc_requirement_title"/>
4084
4083
  <xsl:if test="normalize-space($toc_requirement_title) = ''">
4085
- <xsl:call-template name="getTitle">
4086
- <xsl:with-param name="name" select="'title-list-recommendations'"/>
4084
+ <xsl:call-template name="getLocalizedString">
4085
+ <xsl:with-param name="key">toc_recommendations</xsl:with-param>
4087
4086
  </xsl:call-template>
4088
4087
  </xsl:if>
4089
4088
  </xsl:variable>
@@ -7954,7 +7953,7 @@
7954
7953
  <xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
7955
7954
  <xsl:template match="*[local-name()='tt']/text()" priority="2">
7956
7955
  <xsl:choose>
7957
- <xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
7956
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
7958
7957
  <!-- url -->
7959
7958
  <xsl:call-template name="add-zero-spaces-link-java"/>
7960
7959
  </xsl:when>
@@ -8416,10 +8415,13 @@
8416
8415
  </xsl:choose>
8417
8416
  </xsl:variable>
8418
8417
 
8418
+ <!-- replace sequence #x200B to one &#x200B -->
8419
+ <xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '​')"/>
8420
+
8419
8421
  <!-- replace sequence #x200B and space TO space -->
8420
- <xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
8422
+ <xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
8421
8423
 
8422
- <xsl:value-of select="$text10"/>
8424
+ <xsl:value-of select="$text11"/>
8423
8425
  </xsl:template>
8424
8426
 
8425
8427
  <xsl:template name="add-zero-spaces-link-java">
@@ -8429,8 +8431,12 @@
8429
8431
  <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
8430
8432
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @ -->
8431
8433
  <xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1​')"/>
8434
+
8435
+ <!-- replace sequence #x200B to one &#x200B -->
8436
+ <xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '​')"/>
8437
+
8432
8438
  <!-- remove zero-width space at the end -->
8433
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
8439
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '​$', '')"/>
8434
8440
  </xsl:template>
8435
8441
 
8436
8442
  <!-- add zero space after dash character (for table's entries) -->
@@ -9725,7 +9731,7 @@
9725
9731
 
9726
9732
  <xsl:call-template name="refine_note_block_style"/>
9727
9733
 
9728
- <fo:inline xsl:use-attribute-sets="note-name-style">
9734
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
9729
9735
 
9730
9736
  <xsl:call-template name="refine_note-name-style"/>
9731
9737
 
@@ -9769,12 +9775,12 @@
9769
9775
  <xsl:variable name="num"><xsl:number/></xsl:variable>
9770
9776
  <xsl:choose>
9771
9777
  <xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
9772
- <fo:inline xsl:use-attribute-sets="note-p-style">
9778
+ <fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
9773
9779
  <xsl:apply-templates/>
9774
9780
  </fo:inline>
9775
9781
  </xsl:when>
9776
9782
  <xsl:otherwise>
9777
- <fo:block xsl:use-attribute-sets="note-p-style">
9783
+ <fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
9778
9784
  <xsl:apply-templates/>
9779
9785
  </fo:block>
9780
9786
  </xsl:otherwise>
data/lib/isodoc/bipm/html/htmlstyle.css CHANGED
@@ -98,7 +98,7 @@ h1, h2, h3, h4, h5, h6 {
98
98
 
99
99
  blockquote, q {
100
100
  quotes: none; }
101
- blockquote:before, blockquote:after, q:before, q:after {
101
+ blockquote::before, blockquote::after, q::before, q::after {
102
102
  content: '';
103
103
  content: none; }
104
104
 
@@ -121,14 +121,18 @@ b, strong {
121
121
  div.document-stage-band, div.document-type-band {
122
122
  background-color: #333333; }
123
123
 
124
- a.FootnoteRef + a.FootnoteRef:before {
124
+ a.FootnoteRef + a.FootnoteRef::before {
125
125
  content: ", ";
126
126
  vertical-align: super; }
127
127
 
128
- a.TableFootnoteRef + a.TableFootnoteRef:before {
128
+ a.TableFootnoteRef + a.TableFootnoteRef::before {
129
129
  content: ", ";
130
130
  vertical-align: super; }
131
131
 
132
+ a.TableFootnoteRef, span.TableFootnoteRef,
133
+ a.FootnoteRef, span.FootnoteRef {
134
+ vertical-align: super; }
135
+
132
136
  .addition {
133
137
  color: blue; }
134
138
 
data/lib/isodoc/bipm/jcgm.standard.xsl CHANGED
@@ -1839,19 +1839,32 @@
1839
1839
  <xsl:variable name="titles_">
1840
1840
 
1841
1841
  <!-- These titles of Table of contents renders different than determined in localized-strings -->
1842
- <title-toc lang="en">
1843
-
1844
- </title-toc>
1845
- <title-toc lang="fr">
1842
+ <!-- <title-toc lang="en">
1843
+ <xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
1844
+ <xsl:text>Contents</xsl:text>
1845
+ </xsl:if>
1846
+ <xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
1847
+ <xsl:text>Table of Contents</xsl:text>
1848
+ </xsl:if>
1849
+ <xsl:if test="$namespace = 'gb'">
1850
+ <xsl:text>Table of contents</xsl:text>
1851
+ </xsl:if>
1852
+ </title-toc> -->
1853
+ <title-toc lang="en">Table of contents</title-toc>
1854
+ <!-- <title-toc lang="fr">
1846
1855
  <xsl:text>Sommaire</xsl:text>
1847
- </title-toc>
1848
- <title-toc lang="zh">
1849
-
1856
+ </title-toc> -->
1857
+ <!-- <title-toc lang="zh">
1858
+ <xsl:choose>
1859
+ <xsl:when test="$namespace = 'gb'">
1860
+ <xsl:text>目次</xsl:text>
1861
+ </xsl:when>
1862
+ <xsl:otherwise>
1850
1863
  <xsl:text>Contents</xsl:text>
1851
-
1852
- </title-toc>
1853
-
1854
- <title-descriptors lang="en">Descriptors</title-descriptors>
1864
+ </xsl:otherwise>
1865
+ </xsl:choose>
1866
+ </title-toc> -->
1867
+ <title-toc lang="zh">目次</title-toc>
1855
1868
 
1856
1869
  <title-part lang="en">
1857
1870
 
@@ -1867,20 +1880,6 @@
1867
1880
  <title-subpart lang="en">Sub-part #</title-subpart>
1868
1881
  <title-subpart lang="fr">Partie de sub #</title-subpart>
1869
1882
 
1870
- <title-list-tables lang="en">List of Tables</title-list-tables>
1871
-
1872
- <title-list-figures lang="en">List of Figures</title-list-figures>
1873
-
1874
- <title-table-figures lang="en">Table of Figures</title-table-figures>
1875
-
1876
- <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
1877
-
1878
- <title-summary lang="en">Summary</title-summary>
1879
-
1880
- <title-continued lang="ru">(продолжение)</title-continued>
1881
- <title-continued lang="en">(continued)</title-continued>
1882
- <title-continued lang="fr">(continué)</title-continued>
1883
-
1884
1883
  </xsl:variable>
1885
1884
  <xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
1886
1885
 
@@ -1888,8 +1887,8 @@
1888
1887
  <xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
1889
1888
  <xsl:value-of select="$toc_table_title"/>
1890
1889
  <xsl:if test="normalize-space($toc_table_title) = ''">
1891
- <xsl:call-template name="getTitle">
1892
- <xsl:with-param name="name" select="'title-list-tables'"/>
1890
+ <xsl:call-template name="getLocalizedString">
1891
+ <xsl:with-param name="key">toc_tables</xsl:with-param>
1893
1892
  </xsl:call-template>
1894
1893
  </xsl:if>
1895
1894
  </xsl:variable>
@@ -1898,8 +1897,8 @@
1898
1897
  <xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
1899
1898
  <xsl:value-of select="$toc_figure_title"/>
1900
1899
  <xsl:if test="normalize-space($toc_figure_title) = ''">
1901
- <xsl:call-template name="getTitle">
1902
- <xsl:with-param name="name" select="'title-list-figures'"/>
1900
+ <xsl:call-template name="getLocalizedString">
1901
+ <xsl:with-param name="key">toc_figures</xsl:with-param>
1903
1902
  </xsl:call-template>
1904
1903
  </xsl:if>
1905
1904
  </xsl:variable>
@@ -1908,8 +1907,8 @@
1908
1907
  <xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
1909
1908
  <xsl:value-of select="$toc_requirement_title"/>
1910
1909
  <xsl:if test="normalize-space($toc_requirement_title) = ''">
1911
- <xsl:call-template name="getTitle">
1912
- <xsl:with-param name="name" select="'title-list-recommendations'"/>
1910
+ <xsl:call-template name="getLocalizedString">
1911
+ <xsl:with-param name="key">toc_recommendations</xsl:with-param>
1913
1912
  </xsl:call-template>
1914
1913
  </xsl:if>
1915
1914
  </xsl:variable>
@@ -4379,13 +4378,13 @@
4379
4378
  <fo:table-body>
4380
4379
 
4381
4380
  <xsl:variable name="title_continued_">
4382
- <xsl:call-template name="getTitle">
4383
- <xsl:with-param name="name" select="'title-continued'"/>
4381
+ <xsl:call-template name="getLocalizedString">
4382
+ <xsl:with-param name="key">continued</xsl:with-param>
4384
4383
  </xsl:call-template>
4385
4384
  </xsl:variable>
4386
-
4385
+ <xsl:variable name="title_continued_in_parenthesis" select="concat('(',$title_continued_,')')"/>
4387
4386
  <xsl:variable name="title_continued">
4388
- <xsl:value-of select="$title_continued_"/>
4387
+ <xsl:value-of select="$title_continued_in_parenthesis"/>
4389
4388
 
4390
4389
  </xsl:variable>
4391
4390
 
@@ -5787,7 +5786,7 @@
5787
5786
  <xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
5788
5787
  <xsl:template match="*[local-name()='tt']/text()" priority="2">
5789
5788
  <xsl:choose>
5790
- <xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
5789
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
5791
5790
  <!-- url -->
5792
5791
  <xsl:call-template name="add-zero-spaces-link-java"/>
5793
5792
  </xsl:when>
@@ -6249,10 +6248,13 @@
6249
6248
  </xsl:choose>
6250
6249
  </xsl:variable>
6251
6250
 
6251
+ <!-- replace sequence #x200B to one &#x200B -->
6252
+ <xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '​')"/>
6253
+
6252
6254
  <!-- replace sequence #x200B and space TO space -->
6253
- <xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
6255
+ <xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
6254
6256
 
6255
- <xsl:value-of select="$text10"/>
6257
+ <xsl:value-of select="$text11"/>
6256
6258
  </xsl:template>
6257
6259
 
6258
6260
  <xsl:template name="add-zero-spaces-link-java">
@@ -6262,8 +6264,12 @@
6262
6264
  <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
6263
6265
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @ -->
6264
6266
  <xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1​')"/>
6267
+
6268
+ <!-- replace sequence #x200B to one &#x200B -->
6269
+ <xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '​')"/>
6270
+
6265
6271
  <!-- remove zero-width space at the end -->
6266
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
6272
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '​$', '')"/>
6267
6273
  </xsl:template>
6268
6274
 
6269
6275
  <!-- add zero space after dash character (for table's entries) -->
@@ -7533,7 +7539,7 @@
7533
7539
 
7534
7540
  <xsl:call-template name="refine_note_block_style"/>
7535
7541
 
7536
- <fo:inline xsl:use-attribute-sets="note-name-style">
7542
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
7537
7543
 
7538
7544
  <xsl:call-template name="refine_note-name-style"/>
7539
7545
 
@@ -7570,12 +7576,12 @@
7570
7576
  <xsl:variable name="num"><xsl:number/></xsl:variable>
7571
7577
  <xsl:choose>
7572
7578
  <xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
7573
- <fo:inline xsl:use-attribute-sets="note-p-style">
7579
+ <fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
7574
7580
  <xsl:apply-templates/>
7575
7581
  </fo:inline>
7576
7582
  </xsl:when>
7577
7583
  <xsl:otherwise>
7578
- <fo:block xsl:use-attribute-sets="note-p-style">
7584
+ <fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
7579
7585
  <xsl:apply-templates/>
7580
7586
  </fo:block>
7581
7587
  </xsl:otherwise>
data/lib/metanorma/bipm/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module BIPM
3
- VERSION = "2.2.13".freeze
3
+ VERSION = "2.2.14".freeze
4
4
  end
5
5
  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.2.13
4
+ version: 2.2.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-07-07 00:00:00.000000000 Z
11
+ date: 2023-07-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic