metanorma-iec 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.
- checksums.yaml +4 -4
- data/lib/isodoc/iec/html/htmlstyle.css +24 -20
- data/lib/isodoc/iec/html/htmlstyle.scss +17 -17
- data/lib/isodoc/iec/i18n-en.yaml +3 -0
- data/lib/isodoc/iec/i18n-fr.yaml +3 -0
- data/lib/isodoc/iec/i18n-zh-Hans.yaml +3 -0
- data/lib/isodoc/iec/iec.international-standard.xsl +67 -45
- data/lib/metanorma/iec/front.rb +8 -2
- data/lib/metanorma/iec/version.rb +1 -1
- data/metanorma-iec.gemspec +1 -0
- metadata +16 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0dcfbfc355ea835e896c3efa463647098bc8ad0c10d79ace8de627e15c1b8a3e
|
|
4
|
+
data.tar.gz: '054086032be92eea2f17e511ca544c283dd2d33892a1626929da7dc918bf7d34'
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8dbca0f48f61bbcac0645919b6fb8748efa855929b6d5487b62bb8cfe254693f4e083cce53d0bdeec4a736a50d3589372321529c4a2e543ee4b24b1e2e0931fc
|
|
7
|
+
data.tar.gz: 2e0688e57610d42458e70ca71cd3d1a90b749791d4f5261171a3981b8411c2eb9518fbab082c07e7176526b0e4ff1d66cfa5da09fdbacdc5c42da1183c55dde1
|
|
@@ -97,7 +97,7 @@ h1, h2, h3, h4, h5, h6 {
|
|
|
97
97
|
|
|
98
98
|
blockquote, q {
|
|
99
99
|
quotes: none; }
|
|
100
|
-
blockquote
|
|
100
|
+
blockquote::before, blockquote::after, q::before, q::after {
|
|
101
101
|
content: '';
|
|
102
102
|
content: none; }
|
|
103
103
|
|
|
@@ -120,14 +120,18 @@ b, strong {
|
|
|
120
120
|
div.document-stage-band, div.document-type-band {
|
|
121
121
|
background-color: #333333; }
|
|
122
122
|
|
|
123
|
-
a.FootnoteRef + a.FootnoteRef
|
|
123
|
+
a.FootnoteRef + a.FootnoteRef::before {
|
|
124
124
|
content: ", ";
|
|
125
125
|
vertical-align: super; }
|
|
126
126
|
|
|
127
|
-
a.TableFootnoteRef + a.TableFootnoteRef
|
|
127
|
+
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
|
128
128
|
content: ", ";
|
|
129
129
|
vertical-align: super; }
|
|
130
130
|
|
|
131
|
+
a.TableFootnoteRef, span.TableFootnoteRef,
|
|
132
|
+
a.FootnoteRef, span.FootnoteRef {
|
|
133
|
+
vertical-align: super; }
|
|
134
|
+
|
|
131
135
|
.addition {
|
|
132
136
|
color: blue; }
|
|
133
137
|
|
|
@@ -385,7 +389,7 @@ h2 p, .h2 p {
|
|
|
385
389
|
ul > li {
|
|
386
390
|
list-style: none; }
|
|
387
391
|
|
|
388
|
-
ul > li > p:first-child
|
|
392
|
+
ul > li > p:first-child::before {
|
|
389
393
|
content: "\2014";
|
|
390
394
|
display: inline-block;
|
|
391
395
|
width: 1em;
|
|
@@ -397,7 +401,7 @@ li p {
|
|
|
397
401
|
margin-bottom: 0.6em;
|
|
398
402
|
line-height: 1.2; }
|
|
399
403
|
|
|
400
|
-
#toc li
|
|
404
|
+
#toc li::before {
|
|
401
405
|
content: " ";
|
|
402
406
|
display: none; }
|
|
403
407
|
|
|
@@ -757,57 +761,57 @@ ol > li {
|
|
|
757
761
|
list-style: none;
|
|
758
762
|
position: relative; }
|
|
759
763
|
|
|
760
|
-
ol > li
|
|
764
|
+
ol > li::before {
|
|
761
765
|
position: absolute;
|
|
762
766
|
left: -1.4em; }
|
|
763
767
|
|
|
764
|
-
ol[class="roman"] > li
|
|
768
|
+
ol[class="roman"] > li::before {
|
|
765
769
|
left: -2.0em; }
|
|
766
770
|
|
|
767
|
-
ol[class="roman_upper"] > li
|
|
771
|
+
ol[class="roman_upper"] > li::before {
|
|
768
772
|
left: -2.3em; }
|
|
769
773
|
|
|
770
|
-
ol[class="alphabet"] > li
|
|
774
|
+
ol[class="alphabet"] > li::before {
|
|
771
775
|
counter-increment: alphabet;
|
|
772
776
|
content: counter(alphabet, lower-alpha) ") "; }
|
|
773
777
|
|
|
774
|
-
ol[class="arabic"] > li
|
|
778
|
+
ol[class="arabic"] > li::before {
|
|
775
779
|
counter-increment: arabic;
|
|
776
780
|
content: counter(arabic, decimal) ") "; }
|
|
777
781
|
|
|
778
|
-
ol[class="roman"] > li
|
|
782
|
+
ol[class="roman"] > li::before {
|
|
779
783
|
counter-increment: roman;
|
|
780
784
|
content: counter(roman, lower-roman) ") "; }
|
|
781
785
|
|
|
782
|
-
ol[class="alphabet_upper"] > li
|
|
786
|
+
ol[class="alphabet_upper"] > li::before {
|
|
783
787
|
counter-increment: alphabet_upper;
|
|
784
788
|
content: counter(alphabet_upper, upper-alpha) ") "; }
|
|
785
789
|
|
|
786
|
-
ol[class="roman_upper"] > li
|
|
790
|
+
ol[class="roman_upper"] > li::before {
|
|
787
791
|
counter-increment: roman_upper;
|
|
788
792
|
content: counter(roman_upper, upper-roman) ") "; }
|
|
789
793
|
|
|
790
|
-
ol > li
|
|
794
|
+
ol > li::before {
|
|
791
795
|
counter-increment: alphabet;
|
|
792
796
|
content: counter(alphabet, lower-alpha) ") "; }
|
|
793
797
|
|
|
794
|
-
ol[class="alphabet"] ol[class="alphabet"] > li
|
|
798
|
+
ol[class="alphabet"] ol[class="alphabet"] > li::before {
|
|
795
799
|
counter-increment: alphabet2;
|
|
796
800
|
content: counter(alphabet2, lower-alpha) ") "; }
|
|
797
801
|
|
|
798
|
-
ol[class="arabic"] ol[class="arabic"] > li
|
|
802
|
+
ol[class="arabic"] ol[class="arabic"] > li::before {
|
|
799
803
|
counter-increment: arabic2;
|
|
800
804
|
content: counter(arabic2, decimal) ") "; }
|
|
801
805
|
|
|
802
|
-
ol[class="roman"] ol[class="roman"] > li
|
|
806
|
+
ol[class="roman"] ol[class="roman"] > li::before {
|
|
803
807
|
counter-increment: roman2;
|
|
804
808
|
content: counter(roman2, lower-roman) ") "; }
|
|
805
809
|
|
|
806
|
-
ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li
|
|
810
|
+
ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li::before {
|
|
807
811
|
counter-increment: alphabet_upper2;
|
|
808
812
|
content: counter(alphabet_upper2, upper-alpha) ") "; }
|
|
809
813
|
|
|
810
|
-
ol[class="roman_upper"] ol[class="roman_upper"] > li
|
|
814
|
+
ol[class="roman_upper"] ol[class="roman_upper"] > li::before {
|
|
811
815
|
counter-increment: roman_upper2;
|
|
812
816
|
content: counter(roman_upper2, upper-roman) ") "; }
|
|
813
817
|
|
|
@@ -994,7 +998,7 @@ ol.footnotes-list:first-child {
|
|
|
994
998
|
ol.footnotes-list p, aside.footnote p {
|
|
995
999
|
display: inline; }
|
|
996
1000
|
|
|
997
|
-
ol > li > p
|
|
1001
|
+
ol > li > p::before {
|
|
998
1002
|
content: "";
|
|
999
1003
|
display: none; }
|
|
1000
1004
|
|
|
@@ -161,7 +161,7 @@ h2 p, .h2 p {
|
|
|
161
161
|
list-style: none;
|
|
162
162
|
}
|
|
163
163
|
|
|
164
|
-
ul > li > p:first-child
|
|
164
|
+
ul > li > p:first-child::before {
|
|
165
165
|
content: "\2014";
|
|
166
166
|
display: inline-block;
|
|
167
167
|
width: 1em;
|
|
@@ -176,7 +176,7 @@ ul > li > p:first-child:before {
|
|
|
176
176
|
}
|
|
177
177
|
|
|
178
178
|
|
|
179
|
-
#toc li
|
|
179
|
+
#toc li::before {
|
|
180
180
|
content: " ";
|
|
181
181
|
display: none;
|
|
182
182
|
}
|
|
@@ -450,57 +450,57 @@ ol > li {
|
|
|
450
450
|
list-style: none;
|
|
451
451
|
position: relative;
|
|
452
452
|
}
|
|
453
|
-
ol > li
|
|
453
|
+
ol > li::before {
|
|
454
454
|
position: absolute;
|
|
455
455
|
left: -1.4em;
|
|
456
456
|
}
|
|
457
|
-
ol[class="roman"] > li
|
|
457
|
+
ol[class="roman"] > li::before {
|
|
458
458
|
left: -2.0em;
|
|
459
459
|
}
|
|
460
|
-
ol[class="roman_upper"] > li
|
|
460
|
+
ol[class="roman_upper"] > li::before {
|
|
461
461
|
left: -2.3em;
|
|
462
462
|
}
|
|
463
|
-
ol[class="alphabet"] > li
|
|
463
|
+
ol[class="alphabet"] > li::before {
|
|
464
464
|
counter-increment: alphabet;
|
|
465
465
|
content: counter(alphabet, lower-alpha)") "
|
|
466
466
|
}
|
|
467
|
-
ol[class="arabic"] > li
|
|
467
|
+
ol[class="arabic"] > li::before {
|
|
468
468
|
counter-increment: arabic;
|
|
469
469
|
content: counter(arabic, decimal)") "
|
|
470
470
|
}
|
|
471
|
-
ol[class="roman"] > li
|
|
471
|
+
ol[class="roman"] > li::before {
|
|
472
472
|
counter-increment: roman;
|
|
473
473
|
content: counter(roman, lower-roman)") "
|
|
474
474
|
}
|
|
475
|
-
ol[class="alphabet_upper"] > li
|
|
475
|
+
ol[class="alphabet_upper"] > li::before {
|
|
476
476
|
counter-increment: alphabet_upper;
|
|
477
477
|
content: counter(alphabet_upper, upper-alpha)") "
|
|
478
478
|
}
|
|
479
|
-
ol[class="roman_upper"] > li
|
|
479
|
+
ol[class="roman_upper"] > li::before {
|
|
480
480
|
counter-increment: roman_upper;
|
|
481
481
|
content: counter(roman_upper, upper-roman)") "
|
|
482
482
|
}
|
|
483
|
-
ol > li
|
|
483
|
+
ol > li::before {
|
|
484
484
|
counter-increment: alphabet;
|
|
485
485
|
content: counter(alphabet, lower-alpha)") "
|
|
486
486
|
}
|
|
487
|
-
ol[class="alphabet"] ol[class="alphabet"] > li
|
|
487
|
+
ol[class="alphabet"] ol[class="alphabet"] > li::before {
|
|
488
488
|
counter-increment: alphabet2;
|
|
489
489
|
content: counter(alphabet2, lower-alpha)") "
|
|
490
490
|
}
|
|
491
|
-
ol[class="arabic"] ol[class="arabic"] > li
|
|
491
|
+
ol[class="arabic"] ol[class="arabic"] > li::before {
|
|
492
492
|
counter-increment: arabic2;
|
|
493
493
|
content: counter(arabic2, decimal)") "
|
|
494
494
|
}
|
|
495
|
-
ol[class="roman"] ol[class="roman"] > li
|
|
495
|
+
ol[class="roman"] ol[class="roman"] > li::before {
|
|
496
496
|
counter-increment: roman2;
|
|
497
497
|
content: counter(roman2, lower-roman)") "
|
|
498
498
|
}
|
|
499
|
-
ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li
|
|
499
|
+
ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li::before {
|
|
500
500
|
counter-increment: alphabet_upper2;
|
|
501
501
|
content: counter(alphabet_upper2, upper-alpha)") "
|
|
502
502
|
}
|
|
503
|
-
ol[class="roman_upper"] ol[class="roman_upper"] > li
|
|
503
|
+
ol[class="roman_upper"] ol[class="roman_upper"] > li::before {
|
|
504
504
|
counter-increment: roman_upper2;
|
|
505
505
|
content: counter(roman_upper2, upper-roman)") "
|
|
506
506
|
}
|
|
@@ -672,7 +672,7 @@ ol.footnotes-list p, aside.footnote p {
|
|
|
672
672
|
display: inline;
|
|
673
673
|
}
|
|
674
674
|
|
|
675
|
-
ol > li > p
|
|
675
|
+
ol > li > p::before {
|
|
676
676
|
content: "";
|
|
677
677
|
display: none;
|
|
678
678
|
}
|
data/lib/isodoc/iec/i18n-en.yaml
CHANGED
|
@@ -6,6 +6,9 @@ formula: Equation
|
|
|
6
6
|
inequality: Inequality
|
|
7
7
|
section_iev: Section
|
|
8
8
|
price-code: Price Code
|
|
9
|
+
title: Title
|
|
10
|
+
proposed_stability_date: PROPOSED STABILITY DATE
|
|
11
|
+
tc_sc_note: Note from TC/SC officers
|
|
9
12
|
term_def_boilerplate: |
|
|
10
13
|
<p>ISO and IEC maintain terminological databases for use in
|
|
11
14
|
standardization at the following addresses:</p>
|
data/lib/isodoc/iec/i18n-fr.yaml
CHANGED
|
@@ -6,6 +6,9 @@ inequality: Inégalité
|
|
|
6
6
|
IEC: COMMISSION ELECTROTECHNIQUE INTERNATIONALE
|
|
7
7
|
section_iev: Section
|
|
8
8
|
price-code: Code prix
|
|
9
|
+
title: Titre
|
|
10
|
+
proposed_stability_date: DATE DE STABILITÉ PROPOSÉE
|
|
11
|
+
tc_sc_note: Note des officiers TC/SC
|
|
9
12
|
term_def_boilerplate: |
|
|
10
13
|
<p>L'ISO et l'IEC tiennent à jour des bases de données terminologiques
|
|
11
14
|
destinées à être utilisées en normalisation, consultables aux adresses
|
|
@@ -814,7 +814,13 @@
|
|
|
814
814
|
<fo:block-container background-color="rgb(219, 229, 241)" margin-top="4mm" padding="2mm" padding-top="1mm" border="1.5pt solid white">
|
|
815
815
|
<fo:block font-size="6.5pt" margin-bottom="6pt">
|
|
816
816
|
<xsl:call-template name="addLetterSpacingSmallCaps">
|
|
817
|
-
<xsl:with-param name="text">
|
|
817
|
+
<xsl:with-param name="text">
|
|
818
|
+
<!-- Title: -->
|
|
819
|
+
<xsl:call-template name="getLocalizedString">
|
|
820
|
+
<xsl:with-param name="key">title</xsl:with-param>
|
|
821
|
+
</xsl:call-template>
|
|
822
|
+
<xsl:text>:</xsl:text>
|
|
823
|
+
</xsl:with-param>
|
|
818
824
|
</xsl:call-template>
|
|
819
825
|
</fo:block>
|
|
820
826
|
<fo:block font-size="9pt" font-weight="bold">
|
|
@@ -829,7 +835,11 @@
|
|
|
829
835
|
<fo:block font-size="6.5pt">
|
|
830
836
|
<xsl:call-template name="addLetterSpacing">
|
|
831
837
|
<xsl:with-param name="text">
|
|
832
|
-
|
|
838
|
+
<!-- PROPOSED STABILITY DATE: -->
|
|
839
|
+
<xsl:call-template name="getLocalizedString">
|
|
840
|
+
<xsl:with-param name="key">proposed_stability_date</xsl:with-param>
|
|
841
|
+
</xsl:call-template>
|
|
842
|
+
<xsl:text>: </xsl:text>
|
|
833
843
|
</xsl:with-param>
|
|
834
844
|
</xsl:call-template>
|
|
835
845
|
<!-- 2023 -->
|
|
@@ -841,7 +851,13 @@
|
|
|
841
851
|
<fo:block-container border="1.5 solid" border-color="rgb(221, 213, 213)" padding="1mm" margin-top="3mm">
|
|
842
852
|
<fo:block font-size="6.5pt" margin-bottom="6pt">
|
|
843
853
|
<xsl:call-template name="addLetterSpacingSmallCaps">
|
|
844
|
-
<xsl:with-param name="text">
|
|
854
|
+
<xsl:with-param name="text">
|
|
855
|
+
<!-- Note from TC/SC officers: -->
|
|
856
|
+
<xsl:call-template name="getLocalizedString">
|
|
857
|
+
<xsl:with-param name="key">tc_sc_note</xsl:with-param>
|
|
858
|
+
</xsl:call-template>
|
|
859
|
+
<xsl:text>:</xsl:text>
|
|
860
|
+
</xsl:with-param>
|
|
845
861
|
</xsl:call-template>
|
|
846
862
|
</fo:block>
|
|
847
863
|
<!-- Example: This FDIS is the result of the discussion between the IEC SC21A experts WG 3 during the meeting held in -->
|
|
@@ -2220,19 +2236,32 @@
|
|
|
2220
2236
|
<xsl:variable name="titles_">
|
|
2221
2237
|
|
|
2222
2238
|
<!-- These titles of Table of contents renders different than determined in localized-strings -->
|
|
2223
|
-
<title-toc lang="en">
|
|
2224
|
-
|
|
2225
|
-
|
|
2226
|
-
|
|
2239
|
+
<!-- <title-toc lang="en">
|
|
2240
|
+
<xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
|
|
2241
|
+
<xsl:text>Contents</xsl:text>
|
|
2242
|
+
</xsl:if>
|
|
2243
|
+
<xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
|
|
2244
|
+
<xsl:text>Table of Contents</xsl:text>
|
|
2245
|
+
</xsl:if>
|
|
2246
|
+
<xsl:if test="$namespace = 'gb'">
|
|
2247
|
+
<xsl:text>Table of contents</xsl:text>
|
|
2248
|
+
</xsl:if>
|
|
2249
|
+
</title-toc> -->
|
|
2250
|
+
<title-toc lang="en">Table of contents</title-toc>
|
|
2251
|
+
<!-- <title-toc lang="fr">
|
|
2227
2252
|
<xsl:text>Sommaire</xsl:text>
|
|
2228
|
-
</title-toc>
|
|
2229
|
-
<title-toc lang="zh">
|
|
2230
|
-
|
|
2253
|
+
</title-toc> -->
|
|
2254
|
+
<!-- <title-toc lang="zh">
|
|
2255
|
+
<xsl:choose>
|
|
2256
|
+
<xsl:when test="$namespace = 'gb'">
|
|
2257
|
+
<xsl:text>目次</xsl:text>
|
|
2258
|
+
</xsl:when>
|
|
2259
|
+
<xsl:otherwise>
|
|
2231
2260
|
<xsl:text>Contents</xsl:text>
|
|
2232
|
-
|
|
2233
|
-
|
|
2234
|
-
|
|
2235
|
-
<title-
|
|
2261
|
+
</xsl:otherwise>
|
|
2262
|
+
</xsl:choose>
|
|
2263
|
+
</title-toc> -->
|
|
2264
|
+
<title-toc lang="zh">目次</title-toc>
|
|
2236
2265
|
|
|
2237
2266
|
<title-part lang="en">
|
|
2238
2267
|
|
|
@@ -2254,20 +2283,6 @@
|
|
|
2254
2283
|
<title-subpart lang="en">Sub-part #</title-subpart>
|
|
2255
2284
|
<title-subpart lang="fr">Partie de sub #</title-subpart>
|
|
2256
2285
|
|
|
2257
|
-
<title-list-tables lang="en">List of Tables</title-list-tables>
|
|
2258
|
-
|
|
2259
|
-
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
2260
|
-
|
|
2261
|
-
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
2262
|
-
|
|
2263
|
-
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
2264
|
-
|
|
2265
|
-
<title-summary lang="en">Summary</title-summary>
|
|
2266
|
-
|
|
2267
|
-
<title-continued lang="ru">(продолжение)</title-continued>
|
|
2268
|
-
<title-continued lang="en">(continued)</title-continued>
|
|
2269
|
-
<title-continued lang="fr">(continué)</title-continued>
|
|
2270
|
-
|
|
2271
2286
|
</xsl:variable>
|
|
2272
2287
|
<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
|
|
2273
2288
|
|
|
@@ -2275,8 +2290,8 @@
|
|
|
2275
2290
|
<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
|
|
2276
2291
|
<xsl:value-of select="$toc_table_title"/>
|
|
2277
2292
|
<xsl:if test="normalize-space($toc_table_title) = ''">
|
|
2278
|
-
<xsl:call-template name="
|
|
2279
|
-
<xsl:with-param name="
|
|
2293
|
+
<xsl:call-template name="getLocalizedString">
|
|
2294
|
+
<xsl:with-param name="key">toc_tables</xsl:with-param>
|
|
2280
2295
|
</xsl:call-template>
|
|
2281
2296
|
</xsl:if>
|
|
2282
2297
|
</xsl:variable>
|
|
@@ -2285,8 +2300,8 @@
|
|
|
2285
2300
|
<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
|
|
2286
2301
|
<xsl:value-of select="$toc_figure_title"/>
|
|
2287
2302
|
<xsl:if test="normalize-space($toc_figure_title) = ''">
|
|
2288
|
-
<xsl:call-template name="
|
|
2289
|
-
<xsl:with-param name="
|
|
2303
|
+
<xsl:call-template name="getLocalizedString">
|
|
2304
|
+
<xsl:with-param name="key">toc_figures</xsl:with-param>
|
|
2290
2305
|
</xsl:call-template>
|
|
2291
2306
|
</xsl:if>
|
|
2292
2307
|
</xsl:variable>
|
|
@@ -2295,8 +2310,8 @@
|
|
|
2295
2310
|
<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
|
|
2296
2311
|
<xsl:value-of select="$toc_requirement_title"/>
|
|
2297
2312
|
<xsl:if test="normalize-space($toc_requirement_title) = ''">
|
|
2298
|
-
<xsl:call-template name="
|
|
2299
|
-
<xsl:with-param name="
|
|
2313
|
+
<xsl:call-template name="getLocalizedString">
|
|
2314
|
+
<xsl:with-param name="key">toc_recommendations</xsl:with-param>
|
|
2300
2315
|
</xsl:call-template>
|
|
2301
2316
|
</xsl:if>
|
|
2302
2317
|
</xsl:variable>
|
|
@@ -4815,13 +4830,13 @@
|
|
|
4815
4830
|
<fo:table-body>
|
|
4816
4831
|
|
|
4817
4832
|
<xsl:variable name="title_continued_">
|
|
4818
|
-
<xsl:call-template name="
|
|
4819
|
-
<xsl:with-param name="
|
|
4833
|
+
<xsl:call-template name="getLocalizedString">
|
|
4834
|
+
<xsl:with-param name="key">continued</xsl:with-param>
|
|
4820
4835
|
</xsl:call-template>
|
|
4821
4836
|
</xsl:variable>
|
|
4822
|
-
|
|
4837
|
+
<xsl:variable name="title_continued_in_parenthesis" select="concat('(',$title_continued_,')')"/>
|
|
4823
4838
|
<xsl:variable name="title_continued">
|
|
4824
|
-
<xsl:value-of select="$
|
|
4839
|
+
<xsl:value-of select="$title_continued_in_parenthesis"/>
|
|
4825
4840
|
|
|
4826
4841
|
</xsl:variable>
|
|
4827
4842
|
|
|
@@ -6223,7 +6238,7 @@
|
|
|
6223
6238
|
<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
|
|
6224
6239
|
<xsl:template match="*[local-name()='tt']/text()" priority="2">
|
|
6225
6240
|
<xsl:choose>
|
|
6226
|
-
<xsl:when test="java:replaceAll(java:java.lang.String.new(.),
|
|
6241
|
+
<xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
|
|
6227
6242
|
<!-- url -->
|
|
6228
6243
|
<xsl:call-template name="add-zero-spaces-link-java"/>
|
|
6229
6244
|
</xsl:when>
|
|
@@ -6756,10 +6771,13 @@
|
|
|
6756
6771
|
</xsl:choose>
|
|
6757
6772
|
</xsl:variable>
|
|
6758
6773
|
|
|
6774
|
+
<!-- replace sequence #x200B to one ​ -->
|
|
6775
|
+
<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '')"/>
|
|
6776
|
+
|
|
6759
6777
|
<!-- replace sequence #x200B and space TO space -->
|
|
6760
|
-
<xsl:variable name="
|
|
6778
|
+
<xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
|
|
6761
6779
|
|
|
6762
|
-
<xsl:value-of select="$
|
|
6780
|
+
<xsl:value-of select="$text11"/>
|
|
6763
6781
|
</xsl:template>
|
|
6764
6782
|
|
|
6765
6783
|
<xsl:template name="add-zero-spaces-link-java">
|
|
@@ -6769,8 +6787,12 @@
|
|
|
6769
6787
|
<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
|
|
6770
6788
|
<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @ -->
|
|
6771
6789
|
<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1')"/>
|
|
6790
|
+
|
|
6791
|
+
<!-- replace sequence #x200B to one ​ -->
|
|
6792
|
+
<xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '')"/>
|
|
6793
|
+
|
|
6772
6794
|
<!-- remove zero-width space at the end -->
|
|
6773
|
-
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($
|
|
6795
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '$', '')"/>
|
|
6774
6796
|
</xsl:template>
|
|
6775
6797
|
|
|
6776
6798
|
<!-- add zero space after dash character (for table's entries) -->
|
|
@@ -8033,7 +8055,7 @@
|
|
|
8033
8055
|
|
|
8034
8056
|
<xsl:call-template name="refine_note_block_style"/>
|
|
8035
8057
|
|
|
8036
|
-
<fo:inline xsl:use-attribute-sets="note-name-style">
|
|
8058
|
+
<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
|
|
8037
8059
|
|
|
8038
8060
|
<xsl:call-template name="refine_note-name-style"/>
|
|
8039
8061
|
|
|
@@ -8070,12 +8092,12 @@
|
|
|
8070
8092
|
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
|
8071
8093
|
<xsl:choose>
|
|
8072
8094
|
<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
|
|
8073
|
-
<fo:inline xsl:use-attribute-sets="note-p-style">
|
|
8095
|
+
<fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
|
|
8074
8096
|
<xsl:apply-templates/>
|
|
8075
8097
|
</fo:inline>
|
|
8076
8098
|
</xsl:when>
|
|
8077
8099
|
<xsl:otherwise>
|
|
8078
|
-
<fo:block xsl:use-attribute-sets="note-p-style">
|
|
8100
|
+
<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
|
|
8079
8101
|
<xsl:apply-templates/>
|
|
8080
8102
|
</fo:block>
|
|
8081
8103
|
</xsl:otherwise>
|
data/lib/metanorma/iec/front.rb
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
require "pubid-iec"
|
|
2
|
+
|
|
1
3
|
module Metanorma
|
|
2
4
|
module Iec
|
|
3
5
|
class Converter < ISO::Converter
|
|
@@ -42,8 +44,7 @@ module Metanorma
|
|
|
42
44
|
end
|
|
43
45
|
|
|
44
46
|
def iso_id(node, xml)
|
|
45
|
-
|
|
46
|
-
|
|
47
|
+
node.attr("docnumber") || node.attr("docidentifier") or return
|
|
47
48
|
unless dn = node.attr("docidentifier")
|
|
48
49
|
part, subpart = node&.attr("partnumber")&.split(/-/)
|
|
49
50
|
dn = add_id_parts(node.attr("docnumber"), part, subpart)
|
|
@@ -220,6 +221,7 @@ module Metanorma
|
|
|
220
221
|
abbr
|
|
221
222
|
end
|
|
222
223
|
|
|
224
|
+
# TODO: replace by ISO call
|
|
223
225
|
def metadata_status(node, xml)
|
|
224
226
|
stage = get_stage(node)
|
|
225
227
|
substage = get_substage(node)
|
|
@@ -231,6 +233,10 @@ module Metanorma
|
|
|
231
233
|
s.substage substage, **attr_code(abbreviation: subst)
|
|
232
234
|
node.attr("iteration") && (s.iteration node.attr("iteration"))
|
|
233
235
|
end
|
|
236
|
+
iso_id_default(iso_id_params(node))
|
|
237
|
+
rescue Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
|
|
238
|
+
Pubid::Core::Errors::TypeStageParseError
|
|
239
|
+
report_illegal_stage(stage, substage)
|
|
234
240
|
end
|
|
235
241
|
|
|
236
242
|
def metadata_subdoctype(node, xml)
|
data/metanorma-iec.gemspec
CHANGED
|
@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
|
|
|
31
31
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
|
|
32
32
|
|
|
33
33
|
spec.add_dependency "metanorma-iso", "~> 2.4.2"
|
|
34
|
+
spec.add_dependency "pubid-iec"
|
|
34
35
|
spec.add_dependency "ruby-jing"
|
|
35
36
|
|
|
36
37
|
spec.add_development_dependency "debug"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-iec
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.2.
|
|
4
|
+
version: 2.2.14
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
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-iso
|
|
@@ -24,6 +24,20 @@ dependencies:
|
|
|
24
24
|
- - "~>"
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
26
|
version: 2.4.2
|
|
27
|
+
- !ruby/object:Gem::Dependency
|
|
28
|
+
name: pubid-iec
|
|
29
|
+
requirement: !ruby/object:Gem::Requirement
|
|
30
|
+
requirements:
|
|
31
|
+
- - ">="
|
|
32
|
+
- !ruby/object:Gem::Version
|
|
33
|
+
version: '0'
|
|
34
|
+
type: :runtime
|
|
35
|
+
prerelease: false
|
|
36
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
37
|
+
requirements:
|
|
38
|
+
- - ">="
|
|
39
|
+
- !ruby/object:Gem::Version
|
|
40
|
+
version: '0'
|
|
27
41
|
- !ruby/object:Gem::Dependency
|
|
28
42
|
name: ruby-jing
|
|
29
43
|
requirement: !ruby/object:Gem::Requirement
|