metanorma-cc 2.2.12 → 2.2.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/cc/cc.standard.xsl +43 -39
- data/lib/isodoc/cc/html/_coverpage.css +7 -3
- data/lib/isodoc/cc/html/htmlstyle.css +17 -9
- data/lib/isodoc/cc/html/htmlstyle.scss +3 -3
- data/lib/isodoc/cc/i18n-en.yaml +1 -1
- data/lib/metanorma/cc/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: be02166f761818223e01176f6722d2104e3c839dbcb40cda104ee117fbf98942
|
4
|
+
data.tar.gz: 60e0f9d9f3330f86a04b11552b817f9c9b457d0dba3cd12cd209ddfae6b10338
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 588407c54d6785cdf22f4b824c50d8fbcf0c5ccb1a13144bcce2f8d018dbae191a72868fae8ea4d4c3f41d8945443debfdda92d110a42423ed6b03d95d8e70c5
|
7
|
+
data.tar.gz: 5264ee9f84a1c8cb07d7e1fdc0b28d2e8f3254693017f4cfc6abf75d6a64e92b3d9c3194768367d41b9f5e2b04104b055b1b8ce00988fcfb5a0272e847b722a1
|
@@ -713,21 +713,32 @@
|
|
713
713
|
<xsl:variable name="titles_">
|
714
714
|
|
715
715
|
<!-- These titles of Table of contents renders different than determined in localized-strings -->
|
716
|
-
<title-toc lang="en">
|
717
|
-
|
716
|
+
<!-- <title-toc lang="en">
|
717
|
+
<xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
|
718
718
|
<xsl:text>Contents</xsl:text>
|
719
|
-
|
720
|
-
|
721
|
-
|
719
|
+
</xsl:if>
|
720
|
+
<xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
|
721
|
+
<xsl:text>Table of Contents</xsl:text>
|
722
|
+
</xsl:if>
|
723
|
+
<xsl:if test="$namespace = 'gb'">
|
724
|
+
<xsl:text>Table of contents</xsl:text>
|
725
|
+
</xsl:if>
|
726
|
+
</title-toc> -->
|
727
|
+
<title-toc lang="en">Table of contents</title-toc>
|
728
|
+
<!-- <title-toc lang="fr">
|
722
729
|
<xsl:text>Sommaire</xsl:text>
|
723
|
-
</title-toc>
|
724
|
-
<title-toc lang="zh">
|
725
|
-
|
730
|
+
</title-toc> -->
|
731
|
+
<!-- <title-toc lang="zh">
|
732
|
+
<xsl:choose>
|
733
|
+
<xsl:when test="$namespace = 'gb'">
|
734
|
+
<xsl:text>目次</xsl:text>
|
735
|
+
</xsl:when>
|
736
|
+
<xsl:otherwise>
|
726
737
|
<xsl:text>Contents</xsl:text>
|
727
|
-
|
728
|
-
|
729
|
-
|
730
|
-
<title-
|
738
|
+
</xsl:otherwise>
|
739
|
+
</xsl:choose>
|
740
|
+
</title-toc> -->
|
741
|
+
<title-toc lang="zh">目次</title-toc>
|
731
742
|
|
732
743
|
<title-part lang="en">
|
733
744
|
|
@@ -743,20 +754,6 @@
|
|
743
754
|
<title-subpart lang="en">Sub-part #</title-subpart>
|
744
755
|
<title-subpart lang="fr">Partie de sub #</title-subpart>
|
745
756
|
|
746
|
-
<title-list-tables lang="en">List of Tables</title-list-tables>
|
747
|
-
|
748
|
-
<title-list-figures lang="en">List of Figures</title-list-figures>
|
749
|
-
|
750
|
-
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
751
|
-
|
752
|
-
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
753
|
-
|
754
|
-
<title-summary lang="en">Summary</title-summary>
|
755
|
-
|
756
|
-
<title-continued lang="ru">(продолжение)</title-continued>
|
757
|
-
<title-continued lang="en">(continued)</title-continued>
|
758
|
-
<title-continued lang="fr">(continué)</title-continued>
|
759
|
-
|
760
757
|
</xsl:variable>
|
761
758
|
<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
|
762
759
|
|
@@ -764,8 +761,8 @@
|
|
764
761
|
<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
|
765
762
|
<xsl:value-of select="$toc_table_title"/>
|
766
763
|
<xsl:if test="normalize-space($toc_table_title) = ''">
|
767
|
-
<xsl:call-template name="
|
768
|
-
<xsl:with-param name="
|
764
|
+
<xsl:call-template name="getLocalizedString">
|
765
|
+
<xsl:with-param name="key">toc_tables</xsl:with-param>
|
769
766
|
</xsl:call-template>
|
770
767
|
</xsl:if>
|
771
768
|
</xsl:variable>
|
@@ -774,8 +771,8 @@
|
|
774
771
|
<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
|
775
772
|
<xsl:value-of select="$toc_figure_title"/>
|
776
773
|
<xsl:if test="normalize-space($toc_figure_title) = ''">
|
777
|
-
<xsl:call-template name="
|
778
|
-
<xsl:with-param name="
|
774
|
+
<xsl:call-template name="getLocalizedString">
|
775
|
+
<xsl:with-param name="key">toc_figures</xsl:with-param>
|
779
776
|
</xsl:call-template>
|
780
777
|
</xsl:if>
|
781
778
|
</xsl:variable>
|
@@ -784,8 +781,8 @@
|
|
784
781
|
<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
|
785
782
|
<xsl:value-of select="$toc_requirement_title"/>
|
786
783
|
<xsl:if test="normalize-space($toc_requirement_title) = ''">
|
787
|
-
<xsl:call-template name="
|
788
|
-
<xsl:with-param name="
|
784
|
+
<xsl:call-template name="getLocalizedString">
|
785
|
+
<xsl:with-param name="key">toc_recommendations</xsl:with-param>
|
789
786
|
</xsl:call-template>
|
790
787
|
</xsl:if>
|
791
788
|
</xsl:variable>
|
@@ -4520,7 +4517,7 @@
|
|
4520
4517
|
<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
|
4521
4518
|
<xsl:template match="*[local-name()='tt']/text()" priority="2">
|
4522
4519
|
<xsl:choose>
|
4523
|
-
<xsl:when test="java:replaceAll(java:java.lang.String.new(.),
|
4520
|
+
<xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
|
4524
4521
|
<!-- url -->
|
4525
4522
|
<xsl:call-template name="add-zero-spaces-link-java"/>
|
4526
4523
|
</xsl:when>
|
@@ -4982,10 +4979,13 @@
|
|
4982
4979
|
</xsl:choose>
|
4983
4980
|
</xsl:variable>
|
4984
4981
|
|
4982
|
+
<!-- replace sequence #x200B to one ​ -->
|
4983
|
+
<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '')"/>
|
4984
|
+
|
4985
4985
|
<!-- replace sequence #x200B and space TO space -->
|
4986
|
-
<xsl:variable name="
|
4986
|
+
<xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
|
4987
4987
|
|
4988
|
-
<xsl:value-of select="$
|
4988
|
+
<xsl:value-of select="$text11"/>
|
4989
4989
|
</xsl:template>
|
4990
4990
|
|
4991
4991
|
<xsl:template name="add-zero-spaces-link-java">
|
@@ -4995,8 +4995,12 @@
|
|
4995
4995
|
<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
|
4996
4996
|
<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @ -->
|
4997
4997
|
<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1')"/>
|
4998
|
+
|
4999
|
+
<!-- replace sequence #x200B to one ​ -->
|
5000
|
+
<xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '')"/>
|
5001
|
+
|
4998
5002
|
<!-- remove zero-width space at the end -->
|
4999
|
-
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($
|
5003
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '$', '')"/>
|
5000
5004
|
</xsl:template>
|
5001
5005
|
|
5002
5006
|
<!-- add zero space after dash character (for table's entries) -->
|
@@ -6259,7 +6263,7 @@
|
|
6259
6263
|
|
6260
6264
|
<xsl:call-template name="refine_note_block_style"/>
|
6261
6265
|
|
6262
|
-
<fo:inline xsl:use-attribute-sets="note-name-style">
|
6266
|
+
<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
|
6263
6267
|
|
6264
6268
|
<xsl:call-template name="refine_note-name-style"/>
|
6265
6269
|
|
@@ -6296,12 +6300,12 @@
|
|
6296
6300
|
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
6297
6301
|
<xsl:choose>
|
6298
6302
|
<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
|
6299
|
-
<fo:inline xsl:use-attribute-sets="note-p-style">
|
6303
|
+
<fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
|
6300
6304
|
<xsl:apply-templates/>
|
6301
6305
|
</fo:inline>
|
6302
6306
|
</xsl:when>
|
6303
6307
|
<xsl:otherwise>
|
6304
|
-
<fo:block xsl:use-attribute-sets="note-p-style">
|
6308
|
+
<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
|
6305
6309
|
<xsl:apply-templates/>
|
6306
6310
|
</fo:block>
|
6307
6311
|
</xsl:otherwise>
|
@@ -90,7 +90,7 @@ h1, h2, h3, h4, h5, h6 {
|
|
90
90
|
|
91
91
|
blockquote, q {
|
92
92
|
quotes: none; }
|
93
|
-
blockquote
|
93
|
+
blockquote::before, blockquote::after, q::before, q::after {
|
94
94
|
content: '';
|
95
95
|
content: none; }
|
96
96
|
|
@@ -113,14 +113,18 @@ b, strong {
|
|
113
113
|
div.document-stage-band, div.document-type-band {
|
114
114
|
background-color: #333333; }
|
115
115
|
|
116
|
-
a.FootnoteRef + a.FootnoteRef
|
116
|
+
a.FootnoteRef + a.FootnoteRef::before {
|
117
117
|
content: ", ";
|
118
118
|
vertical-align: super; }
|
119
119
|
|
120
|
-
a.TableFootnoteRef + a.TableFootnoteRef
|
120
|
+
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
121
121
|
content: ", ";
|
122
122
|
vertical-align: super; }
|
123
123
|
|
124
|
+
a.TableFootnoteRef, span.TableFootnoteRef,
|
125
|
+
a.FootnoteRef, span.FootnoteRef {
|
126
|
+
vertical-align: super; }
|
127
|
+
|
124
128
|
.addition {
|
125
129
|
color: blue; }
|
126
130
|
|
@@ -90,7 +90,7 @@ h1, h2, h3, h4, h5, h6 {
|
|
90
90
|
|
91
91
|
blockquote, q {
|
92
92
|
quotes: none; }
|
93
|
-
blockquote
|
93
|
+
blockquote::before, blockquote::after, q::before, q::after {
|
94
94
|
content: '';
|
95
95
|
content: none; }
|
96
96
|
|
@@ -113,14 +113,18 @@ b, strong {
|
|
113
113
|
div.document-stage-band, div.document-type-band {
|
114
114
|
background-color: #333333; }
|
115
115
|
|
116
|
-
a.FootnoteRef + a.FootnoteRef
|
116
|
+
a.FootnoteRef + a.FootnoteRef::before {
|
117
117
|
content: ", ";
|
118
118
|
vertical-align: super; }
|
119
119
|
|
120
|
-
a.TableFootnoteRef + a.TableFootnoteRef
|
120
|
+
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
121
121
|
content: ", ";
|
122
122
|
vertical-align: super; }
|
123
123
|
|
124
|
+
a.TableFootnoteRef, span.TableFootnoteRef,
|
125
|
+
a.FootnoteRef, span.FootnoteRef {
|
126
|
+
vertical-align: super; }
|
127
|
+
|
124
128
|
.addition {
|
125
129
|
color: blue; }
|
126
130
|
|
@@ -351,7 +355,7 @@ h1, h2, h3, h4, h5, h6 {
|
|
351
355
|
|
352
356
|
blockquote, q {
|
353
357
|
quotes: none; }
|
354
|
-
blockquote
|
358
|
+
blockquote::before, blockquote::after, q::before, q::after {
|
355
359
|
content: '';
|
356
360
|
content: none; }
|
357
361
|
|
@@ -374,14 +378,18 @@ b, strong {
|
|
374
378
|
div.document-stage-band, div.document-type-band {
|
375
379
|
background-color: #333333; }
|
376
380
|
|
377
|
-
a.FootnoteRef + a.FootnoteRef
|
381
|
+
a.FootnoteRef + a.FootnoteRef::before {
|
378
382
|
content: ", ";
|
379
383
|
vertical-align: super; }
|
380
384
|
|
381
|
-
a.TableFootnoteRef + a.TableFootnoteRef
|
385
|
+
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
382
386
|
content: ", ";
|
383
387
|
vertical-align: super; }
|
384
388
|
|
389
|
+
a.TableFootnoteRef, span.TableFootnoteRef,
|
390
|
+
a.FootnoteRef, span.FootnoteRef {
|
391
|
+
vertical-align: super; }
|
392
|
+
|
385
393
|
.addition {
|
386
394
|
color: blue; }
|
387
395
|
|
@@ -742,7 +750,7 @@ nav #toc {
|
|
742
750
|
|
743
751
|
#toc li, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li {
|
744
752
|
list-style-type: none; }
|
745
|
-
#toc li
|
753
|
+
#toc li::before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li::before {
|
746
754
|
content: " " !important;
|
747
755
|
display: none; }
|
748
756
|
|
@@ -894,7 +902,7 @@ ul {
|
|
894
902
|
list-style: none;
|
895
903
|
padding-left: 1.2em; }
|
896
904
|
|
897
|
-
ul > li
|
905
|
+
ul > li::before {
|
898
906
|
content: "\2014";
|
899
907
|
position: absolute;
|
900
908
|
left: 0; }
|
@@ -907,7 +915,7 @@ main li {
|
|
907
915
|
p.Biblio, p.NormRef {
|
908
916
|
margin-top: 1em; }
|
909
917
|
|
910
|
-
p.Biblio
|
918
|
+
p.Biblio::before, p.NormRef::before {
|
911
919
|
content: "\2014";
|
912
920
|
padding-right: 1em; }
|
913
921
|
|
@@ -66,7 +66,7 @@ nav {
|
|
66
66
|
li {
|
67
67
|
list-style-type: none;
|
68
68
|
|
69
|
-
|
69
|
+
&::before {
|
70
70
|
content: " " !important;
|
71
71
|
display: none;
|
72
72
|
}
|
@@ -184,7 +184,7 @@ ul {
|
|
184
184
|
padding-left: 1.2em;
|
185
185
|
}
|
186
186
|
|
187
|
-
ul > li
|
187
|
+
ul > li::before {
|
188
188
|
content: "\2014";
|
189
189
|
position: absolute;
|
190
190
|
left: 0;
|
@@ -202,7 +202,7 @@ p.Biblio, p.NormRef {
|
|
202
202
|
margin-top: 1em;
|
203
203
|
}
|
204
204
|
|
205
|
-
p.Biblio
|
205
|
+
p.Biblio::before, p.NormRef::before {
|
206
206
|
content: "\2014";
|
207
207
|
padding-right: 1em;
|
208
208
|
}
|
data/lib/isodoc/cc/i18n-en.yaml
CHANGED
@@ -1,2 +1,2 @@
|
|
1
1
|
annex: Appendix
|
2
|
-
|
2
|
+
table_of_contents: Contents
|
data/lib/metanorma/cc/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-cc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.2.
|
4
|
+
version: 2.2.13
|
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-
|
11
|
+
date: 2023-07-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|