metanorma-iec 1.2.12 → 1.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/asciidoctor/iec/basicdoc.rng +5 -3
- data/lib/asciidoctor/iec/converter.rb +3 -0
- data/lib/asciidoctor/iec/front.rb +17 -51
- data/lib/asciidoctor/iec/isodoc.rng +3 -0
- data/lib/isodoc/iec/html/html_iec_intro.html +1 -1
- data/lib/isodoc/iec/html/word_iec_intro.html +1 -1
- data/lib/isodoc/iec/html_convert.rb +2 -2
- data/lib/isodoc/iec/iec.international-standard.xsl +212 -49
- data/lib/isodoc/iec/word_convert.rb +2 -2
- data/lib/metanorma/iec/version.rb +1 -1
- data/metanorma-iec.gemspec +2 -2
- data/spec/asciidoctor-iec/base_spec.rb +15 -2
- data/spec/asciidoctor-iec/validate_spec.rb +1 -1
- data/spec/isodoc/iso_spec.rb +2 -2
- 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: da6ad61eab0892f2e07d9b8d873eee4316295b203cfb72c2633e044756a9e9a7
|
|
4
|
+
data.tar.gz: 53ab2f3431293cded98808c721ccc3031430cf550f51ec41e4e1ae8586194140
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: dc20a397df9f1578b979898aeccaba321733ef2d0c316a7b7e28215ea8015ff1d5e3791b730928dd6c5a564c5d635bf61be0b47cff4808906532430474fd0b4a
|
|
7
|
+
data.tar.gz: 0b0a5b94455b97132e7837d640c73cddb5b12f81a6dd2240610284c0866c4e0eb93dc87fd41f29ac2d4877e9a843206593aa49da02277b5a42830f2eb4f51b1c
|
|
@@ -729,9 +729,11 @@
|
|
|
729
729
|
</define>
|
|
730
730
|
<define name="index">
|
|
731
731
|
<element name="index">
|
|
732
|
-
<
|
|
733
|
-
<
|
|
734
|
-
|
|
732
|
+
<optional>
|
|
733
|
+
<attribute name="to">
|
|
734
|
+
<data type="IDREF"/>
|
|
735
|
+
</attribute>
|
|
736
|
+
</optional>
|
|
735
737
|
<element name="primary">
|
|
736
738
|
<oneOrMore>
|
|
737
739
|
<ref name="PureTextElement"/>
|
|
@@ -51,56 +51,17 @@ module Asciidoctor
|
|
|
51
51
|
end
|
|
52
52
|
|
|
53
53
|
STAGE_CODES = {
|
|
54
|
-
"PNW" => "1000",
|
|
55
|
-
"
|
|
56
|
-
"
|
|
57
|
-
"
|
|
58
|
-
"
|
|
59
|
-
"
|
|
60
|
-
"
|
|
61
|
-
"
|
|
62
|
-
"
|
|
63
|
-
"
|
|
64
|
-
"
|
|
65
|
-
"6CD" => "3520",
|
|
66
|
-
"7CD" => "3520",
|
|
67
|
-
"8CD" => "3520",
|
|
68
|
-
"9CD" => "3520",
|
|
69
|
-
"CDM" => "3591",
|
|
70
|
-
"A3CD" => "3592",
|
|
71
|
-
"A4CD" => "3592",
|
|
72
|
-
"A5CD" => "3592",
|
|
73
|
-
"A6CD" => "3592",
|
|
74
|
-
"A7CD" => "3592",
|
|
75
|
-
"A8CD" => "3592",
|
|
76
|
-
"A9CD" => "3592",
|
|
77
|
-
"ACDV" => "3599",
|
|
78
|
-
"CCDV" => "4020",
|
|
79
|
-
"CDVM" => "4091",
|
|
80
|
-
"NCDV" => "4092",
|
|
81
|
-
"NADIS" => "4093",
|
|
82
|
-
"ADIS" => "4099",
|
|
83
|
-
"ADTR" => "4099",
|
|
84
|
-
"ADTS" => "4099",
|
|
85
|
-
"RDISH" => "5000",
|
|
86
|
-
"RFDIS" => "5000",
|
|
87
|
-
"CDISH" => "5020",
|
|
88
|
-
"CDPAS" => "5020",
|
|
89
|
-
"CDTR" => "5020",
|
|
90
|
-
"CDTS" => "5020",
|
|
91
|
-
"CFDIS" => "5020",
|
|
92
|
-
"DTRM" => "5092",
|
|
93
|
-
"DTSM" => "5092",
|
|
94
|
-
"NDTR" => "5092",
|
|
95
|
-
"NDTS" => "5092",
|
|
96
|
-
"NFDIS" => "5092",
|
|
97
|
-
"APUB" => "5099",
|
|
98
|
-
"BPUB" => "6000",
|
|
99
|
-
"PPUB" => "6060",
|
|
100
|
-
"RR" => "9092",
|
|
101
|
-
"AMW" => "9220",
|
|
102
|
-
"WPUB" => "9599",
|
|
103
|
-
"DELPUB" => "9960",
|
|
54
|
+
"PNW" => "1000", "ANW" => "2000", "CAN" => "2098", "ACD" => "2099", "CD" => "3020",
|
|
55
|
+
"BWG" => "3092", "A2CD" => "3099", "2CD" => "3520", "3CD" => "3520", "4CD" => "3520",
|
|
56
|
+
"5CD" => "3520", "6CD" => "3520", "7CD" => "3520", "8CD" => "3520", "9CD" => "3520",
|
|
57
|
+
"CDM" => "3591", "A3CD" => "3592", "A4CD" => "3592", "A5CD" => "3592", "A6CD" => "3592",
|
|
58
|
+
"A7CD" => "3592", "A8CD" => "3592", "A9CD" => "3592", "ACDV" => "3599", "CCDV" => "4020",
|
|
59
|
+
"CDVM" => "4091", "NCDV" => "4092", "NADIS" => "4093", "ADIS" => "4099", "ADTR" => "4099",
|
|
60
|
+
"ADTS" => "4099", "RDISH" => "5000", "RFDIS" => "5000", "CDISH" => "5020", "CDPAS" => "5020",
|
|
61
|
+
"CDTR" => "5020", "CDTS" => "5020", "CFDIS" => "5020", "DTRM" => "5092", "DTSM" => "5092",
|
|
62
|
+
"NDTR" => "5092", "NDTS" => "5092", "NFDIS" => "5092", "APUB" => "5099", "BPUB" => "6000",
|
|
63
|
+
"PPUB" => "6060", "RR" => "9092", "AMW" => "9220", "WPUB" => "9599", "DELPUB" => "9960",
|
|
64
|
+
"PWI" => "0000", "NWIP" => "1000", "WD" => "2000", "CDV" => "4000", "FDIS" => "5000",
|
|
104
65
|
}.freeze
|
|
105
66
|
|
|
106
67
|
DOC_STAGE = {
|
|
@@ -123,7 +84,8 @@ module Asciidoctor
|
|
|
123
84
|
"20" => {"00" => "ANW", "98" => "CAN", "99" => "ACD"},
|
|
124
85
|
"30" => {"00" => "CD", "20" => "CD", "92" => "BWG", "97" => "MERGED", "98" => "DREJ", "99" => "A2CD"},
|
|
125
86
|
"35" => {"00" => "CD", "20" => "CD", "91" => "CDM", "92" => "ACD", "99" => "ACDV"},
|
|
126
|
-
"40" => {"00" => "CCDV", "20" => "CCDV", "91" => "CDVM", "92" => "NCDV", "93" => "NADIS",
|
|
87
|
+
"40" => {"00" => "CCDV", "20" => "CCDV", "91" => "CDVM", "92" => "NCDV", "93" => "NADIS",
|
|
88
|
+
"95" => "ADISSB", "99" => "ADIS"},
|
|
127
89
|
"50" => {"00" => "RFDIS", "20" => "CFDIS", "92" => "NFDIS", "95" => "APUBSB", "99" => "APUB"},
|
|
128
90
|
"60" => {"00" => "BPUB", "60" => "PPUB"},
|
|
129
91
|
"90" => {"00" => "RR", "92" => "RR"},
|
|
@@ -220,6 +182,10 @@ module Asciidoctor
|
|
|
220
182
|
a = node.attr("function") and xml.function a
|
|
221
183
|
end
|
|
222
184
|
|
|
185
|
+
def relaton_relations
|
|
186
|
+
super + %w(obsoletes)
|
|
187
|
+
end
|
|
188
|
+
|
|
223
189
|
def metadata_ext(node, xml)
|
|
224
190
|
super
|
|
225
191
|
a = node.attr("accessibility-color-inside") and xml.accessibility_color_inside a
|
|
@@ -13,8 +13,8 @@ module IsoDoc
|
|
|
13
13
|
|
|
14
14
|
def default_fonts(options)
|
|
15
15
|
{
|
|
16
|
-
bodyfont: (options[:script] == "Hans" ? '"
|
|
17
|
-
headerfont: (options[:script] == "Hans" ? '"
|
|
16
|
+
bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' : '"Arial",sans-serif'),
|
|
17
|
+
headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : '"Arial",sans-serif'),
|
|
18
18
|
monospacefont: ('"Courier New",monospace'),
|
|
19
19
|
monospacefontsize: "1.0em",
|
|
20
20
|
footnotefontsize: "0.9em",
|
|
@@ -335,7 +335,7 @@
|
|
|
335
335
|
</fo:block-container>
|
|
336
336
|
</fo:block>
|
|
337
337
|
|
|
338
|
-
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:feedback-statement"/>
|
|
338
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:feedback-statement"/> <!-- //iec:clause[not(@id) or @id != 'boilerplate-cenelec-attention'] -->
|
|
339
339
|
<fo:block span="all" border-bottom="0.5pt solid black"/>
|
|
340
340
|
<xsl:if test="(//iec:iec-standard)[2]/iec:boilerplate/iec:feedback-statement">
|
|
341
341
|
<xsl:apply-templates select="(//iec:iec-standard)[2]/iec:boilerplate/iec:feedback-statement"/>
|
|
@@ -584,7 +584,10 @@
|
|
|
584
584
|
<fo:static-content flow-name="footer-FDIS">
|
|
585
585
|
<fo:block-container background-color="rgb(236, 232, 232)" padding="2mm" border="1.5pt solid white">
|
|
586
586
|
<fo:block font-size="8pt" margin-bottom="6pt">
|
|
587
|
-
|
|
587
|
+
|
|
588
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[not(@id)]"/>
|
|
589
|
+
|
|
590
|
+
<!-- <fo:inline font-weight="bold">
|
|
588
591
|
<xsl:call-template name="addLetterSpacing">
|
|
589
592
|
<xsl:with-param name="text">
|
|
590
593
|
<xsl:for-each select="(//iec:iec-standard)[1]/iec:bibdata/iec:copyright">
|
|
@@ -599,7 +602,7 @@
|
|
|
599
602
|
<xsl:text>. All rights reserved. It is permitted to download this electronic file, to make a copy and to print out the content for the sole purpose of preparing National Committee positions. You may not copy or "mirror" the file or printed version of the document, or any part of it, for any other purpose without permission in writing from IEC.</xsl:text>
|
|
600
603
|
</xsl:with-param>
|
|
601
604
|
</xsl:call-template>
|
|
602
|
-
</fo:inline>
|
|
605
|
+
</fo:inline> -->
|
|
603
606
|
</fo:block>
|
|
604
607
|
</fo:block-container>
|
|
605
608
|
</fo:static-content>
|
|
@@ -611,7 +614,8 @@
|
|
|
611
614
|
<fo:inline font-size="8pt" padding-left="0.5mm" color="{$color_blue}">®</fo:inline>
|
|
612
615
|
</xsl:if>
|
|
613
616
|
<fo:inline keep-together.within-line="always" font-size="18pt" font-weight="bold" baseline-shift="10mm"><fo:leader leader-pattern="space"/>
|
|
614
|
-
|
|
617
|
+
<!-- Ex: 34D/1511/FDIS -->
|
|
618
|
+
<xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:docidentifier[@type='iso-tc']"/>
|
|
615
619
|
<xsl:text> </xsl:text>
|
|
616
620
|
</fo:inline>
|
|
617
621
|
</fo:block>
|
|
@@ -672,7 +676,8 @@
|
|
|
672
676
|
</fo:block>
|
|
673
677
|
<fo:block font-size="9pt" font-weight="bold">
|
|
674
678
|
<xsl:call-template name="addLetterSpacing">
|
|
675
|
-
|
|
679
|
+
<!-- 2019-12-06 -->
|
|
680
|
+
<xsl:with-param name="text"><xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:date[@type='vote-ended']/iec:on"/></xsl:with-param>
|
|
676
681
|
</xsl:call-template>
|
|
677
682
|
</fo:block>
|
|
678
683
|
</fo:table-cell>
|
|
@@ -686,7 +691,8 @@
|
|
|
686
691
|
</fo:block>
|
|
687
692
|
<fo:block font-size="9pt" font-weight="bold">
|
|
688
693
|
<xsl:variable name="supersedes_documents">
|
|
689
|
-
<xsl:for-each select="//iec:iec-standard/iec:bibdata/iec:relation[@type='supersedes']/iec:bibitem/iec:docnumber">
|
|
694
|
+
<!-- <xsl:for-each select="//iec:iec-standard/iec:bibdata/iec:relation[@type='supersedes']/iec:bibitem/iec:docnumber"> -->
|
|
695
|
+
<xsl:for-each select="//iec:iec-standard/iec:bibdata/iec:relation[@type='obsoletes']/iec:bibitem/iec:docidentifier">
|
|
690
696
|
<xsl:value-of select="."/>
|
|
691
697
|
<xsl:if test="position() != last()">,</xsl:if>
|
|
692
698
|
</xsl:for-each>
|
|
@@ -712,22 +718,26 @@
|
|
|
712
718
|
<fo:table-row height="4mm">
|
|
713
719
|
<fo:table-cell number-columns-spanned="2" border="1.5pt solid {$border-color}" padding="1.5mm" padding-bottom="0mm">
|
|
714
720
|
<fo:block>
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
721
|
+
<!-- If //bibdata/ext/editorialgroup/subcommittee exists, use "IEC SC" + //bibdata/ext/editorialgroup/subcommittee/@number + //bibdata/ext/editorialgroup/subcommittee,
|
|
722
|
+
else use "IEC TC" + //bibdata/ext/editorialgroup/technical-committee/@number + //bibdata/ext/editorialgroup/technical-committee -->
|
|
723
|
+
<xsl:choose>
|
|
724
|
+
<xsl:when test="//iec:iec-standard/iec:bibdata/iec:ext/iec:editorialgroup/iec:subcommittee">
|
|
725
|
+
<fo:block font-size="6.5pt">
|
|
726
|
+
<fo:inline font-size="8pt">IEC SC <xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:ext/iec:editorialgroup/iec:subcommittee/@number"/> : </fo:inline>
|
|
727
|
+
<xsl:call-template name="addLetterSpacingSmallCaps">
|
|
728
|
+
<xsl:with-param name="text" select="//iec:iec-standard/iec:bibdata/iec:ext/iec:editorialgroup/iec:subcommittee"/>
|
|
729
|
+
</xsl:call-template>
|
|
730
|
+
</fo:block>
|
|
731
|
+
</xsl:when>
|
|
732
|
+
<xsl:when test="//iec:iec-standard/iec:bibdata/iec:ext/iec:editorialgroup/iec:technical-committee">
|
|
733
|
+
<fo:block font-size="6.5pt">
|
|
734
|
+
<fo:inline font-size="8pt">IEC TC <xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:ext/iec:editorialgroup/iec:technical-committee/@number"/> : </fo:inline>
|
|
735
|
+
<xsl:call-template name="addLetterSpacingSmallCaps">
|
|
736
|
+
<xsl:with-param name="text" select="//iec:iec-standard/iec:bibdata/iec:ext/iec:editorialgroup/iec:technical-committee"/>
|
|
737
|
+
</xsl:call-template>
|
|
738
|
+
</fo:block>
|
|
739
|
+
</xsl:when>
|
|
740
|
+
</xsl:choose>
|
|
731
741
|
</fo:block>
|
|
732
742
|
</fo:table-cell>
|
|
733
743
|
</fo:table-row>
|
|
@@ -751,8 +761,9 @@
|
|
|
751
761
|
</xsl:call-template>
|
|
752
762
|
</fo:block>
|
|
753
763
|
<fo:block font-size="9pt">
|
|
764
|
+
<!-- Example: Ms Shanti Conn -->
|
|
754
765
|
<xsl:call-template name="addLetterSpacing">
|
|
755
|
-
<xsl:with-param name="text" select="
|
|
766
|
+
<xsl:with-param name="text" select="//iec:iec-standard/iec:bibdata/iec:ext/iec:secretary"/>
|
|
756
767
|
</xsl:call-template>
|
|
757
768
|
</fo:block>
|
|
758
769
|
</fo:table-cell>
|
|
@@ -767,6 +778,11 @@
|
|
|
767
778
|
<xsl:with-param name="text" select="'Of interest to the following committees:'"/>
|
|
768
779
|
</xsl:call-template>
|
|
769
780
|
</fo:block>
|
|
781
|
+
<fo:block font-size="9pt">
|
|
782
|
+
<xsl:call-template name="addLetterSpacing">
|
|
783
|
+
<xsl:with-param name="text" select="//iec:iec-standard/iec:bibdata/iec:ext/iec:interest-to-committees"/>
|
|
784
|
+
</xsl:call-template>
|
|
785
|
+
</fo:block>
|
|
770
786
|
</fo:table-cell>
|
|
771
787
|
<xsl:if test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'CDV' or $stage-abbreviation = 'CD'">
|
|
772
788
|
<fo:table-cell border="1.5pt solid {$border-color}" padding="1.5mm" padding-bottom="0mm">
|
|
@@ -782,9 +798,15 @@
|
|
|
782
798
|
</xsl:call-template>
|
|
783
799
|
</xsl:if>
|
|
784
800
|
</fo:block>
|
|
785
|
-
|
|
786
801
|
<fo:block>
|
|
787
|
-
<xsl:
|
|
802
|
+
<xsl:choose>
|
|
803
|
+
<xsl:when test="//iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal = 'true'">
|
|
804
|
+
<xsl:call-template name="insertCheckBoxOn"/>
|
|
805
|
+
</xsl:when>
|
|
806
|
+
<xsl:otherwise>
|
|
807
|
+
<xsl:call-template name="insertCheckBoxOff"/>
|
|
808
|
+
</xsl:otherwise>
|
|
809
|
+
</xsl:choose>
|
|
788
810
|
</fo:block>
|
|
789
811
|
|
|
790
812
|
<xsl:if test="$stage-abbreviation = 'CDV' or $stage-abbreviation = 'CD'">
|
|
@@ -885,13 +907,10 @@
|
|
|
885
907
|
<xsl:with-param name="text" select="'Submitted for CENELEC parallel voting'"/>
|
|
886
908
|
</xsl:call-template>
|
|
887
909
|
</fo:block>
|
|
888
|
-
<fo:block font-size="8pt" font-weight="bold" margin-bottom="10pt">
|
|
889
|
-
<xsl:call-template name="addLetterSpacing">
|
|
890
|
-
<xsl:with-param name="text" select="'Attention IEC-CENELEC parallel voting'"/>
|
|
891
|
-
</xsl:call-template>
|
|
892
|
-
</fo:block>
|
|
893
910
|
|
|
894
|
-
<
|
|
911
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:feedback-statement/iec:clause[@id = 'boilerplate-cenelec-attention']"/>
|
|
912
|
+
|
|
913
|
+
<!-- <fo:block font-size="8pt" margin-bottom="10pt" text-align="justify">
|
|
895
914
|
<xsl:if test="$stage-abbreviation = 'FDIS'">
|
|
896
915
|
<xsl:call-template name="addLetterSpacing">
|
|
897
916
|
<xsl:with-param name="text" select="'The attention of IEC National Committees, members of CENELEC, is drawn to the fact that this Final Draft International Standard (FDIS) is submitted for parallel voting.'"/>
|
|
@@ -907,7 +926,8 @@
|
|
|
907
926
|
<xsl:call-template name="addLetterSpacing">
|
|
908
927
|
<xsl:with-param name="text" select="'The CENELEC members are invited to vote through the CENELEC online voting system.'"/>
|
|
909
928
|
</xsl:call-template>
|
|
910
|
-
</fo:block>
|
|
929
|
+
</fo:block> -->
|
|
930
|
+
|
|
911
931
|
</fo:table-cell>
|
|
912
932
|
<fo:table-cell border="1.5pt solid {$border-color}" padding="1.5mm" padding-bottom="0mm">
|
|
913
933
|
<fo:block font-size="6.5pt" margin-bottom="6pt">
|
|
@@ -932,7 +952,10 @@
|
|
|
932
952
|
</fo:block-container>
|
|
933
953
|
|
|
934
954
|
<fo:block-container font-size="8pt" background-color="rgb(236, 232, 232)" margin-top="5mm" padding="2mm" text-align="justify" border="1.5pt solid white">
|
|
935
|
-
<
|
|
955
|
+
<fo:block>
|
|
956
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:license-statement" mode="cover-page-internal"/>
|
|
957
|
+
</fo:block>
|
|
958
|
+
<!-- <xsl:if test="$stage-abbreviation = 'FDIS'">
|
|
936
959
|
<fo:block margin-bottom="6pt">
|
|
937
960
|
<xsl:call-template name="addLetterSpacing">
|
|
938
961
|
<xsl:with-param name="text">This document is a draft distributed for approval. It may not be referred to as an International Standard until published as such.</xsl:with-param>
|
|
@@ -949,7 +972,17 @@
|
|
|
949
972
|
</xsl:call-template>
|
|
950
973
|
</fo:block>
|
|
951
974
|
</xsl:if>
|
|
952
|
-
<xsl:if test="$stage-abbreviation = 'NWIP' or
|
|
975
|
+
<xsl:if test="$stage-abbreviation = 'NWIP' or
|
|
976
|
+
$stage-abbreviation = 'PWI' or
|
|
977
|
+
$stage-abbreviation = 'NP' or
|
|
978
|
+
$stage-abbreviation = 'AWI' or
|
|
979
|
+
$stage-abbreviation = 'WD' or
|
|
980
|
+
$stage-abbreviation = 'CD' or
|
|
981
|
+
$stage-abbreviation = 'CDV' or
|
|
982
|
+
$stage-abbreviation = 'CD-TSTR' or
|
|
983
|
+
$stage-abbreviation = 'DTS' or
|
|
984
|
+
$stage-abbreviation = 'DTR' or
|
|
985
|
+
$stage-abbreviation = 'DPAS'">
|
|
953
986
|
<fo:block margin-bottom="6pt">
|
|
954
987
|
<xsl:call-template name="addLetterSpacing">
|
|
955
988
|
<xsl:with-param name="text">This document is still under study and subject to change. It should not be used for reference purposes.</xsl:with-param>
|
|
@@ -960,7 +993,7 @@
|
|
|
960
993
|
<xsl:with-param name="text">Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</xsl:with-param>
|
|
961
994
|
</xsl:call-template>
|
|
962
995
|
</fo:block>
|
|
963
|
-
</xsl:if>
|
|
996
|
+
</xsl:if> -->
|
|
964
997
|
</fo:block-container>
|
|
965
998
|
|
|
966
999
|
<fo:block-container background-color="rgb(219, 229, 241)" margin-top="4mm" padding="2mm" padding-top="1mm" border="1.5pt solid white">
|
|
@@ -984,24 +1017,24 @@
|
|
|
984
1017
|
<xsl:text>PROPOSED STABILITY DATE: </xsl:text>
|
|
985
1018
|
</xsl:with-param>
|
|
986
1019
|
</xsl:call-template>
|
|
987
|
-
|
|
1020
|
+
<!-- 2023 -->
|
|
1021
|
+
<fo:inline font-size="9pt"><xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:date[@type='unchanged']/iec:on"/></fo:inline>
|
|
988
1022
|
</fo:block>
|
|
989
1023
|
</fo:block-container>
|
|
990
1024
|
</xsl:if>
|
|
991
1025
|
|
|
992
|
-
<fo:block-container border="1.5 solid" border-color="rgb(221, 213, 213)"
|
|
1026
|
+
<fo:block-container border="1.5 solid" border-color="rgb(221, 213, 213)" padding="1mm" margin-top="3mm">
|
|
993
1027
|
<fo:block font-size="6.5pt" margin-bottom="6pt">
|
|
994
1028
|
<xsl:call-template name="addLetterSpacingSmallCaps">
|
|
995
1029
|
<xsl:with-param name="text">Note from TC/SC officers:</xsl:with-param>
|
|
996
1030
|
</xsl:call-template>
|
|
997
1031
|
</fo:block>
|
|
998
|
-
<!--
|
|
1032
|
+
<!-- Example: This FDIS is the result of the discussion between the IEC SC21A experts WG 3 during the meeting held in -->
|
|
1033
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:bibdata/iec:ext/iec:tc-sc-officers-note"/>
|
|
999
1034
|
</fo:block-container>
|
|
1000
1035
|
|
|
1001
|
-
|
|
1002
|
-
|
|
1003
|
-
<xsl:if test="$stage-abbreviation = 'FDIS'">
|
|
1004
|
-
<fo:block-container font-size="9pt" border="1.5 solid" border-color="rgb(221, 213, 213)" height="13mm" padding="1mm" margin-top="3mm">
|
|
1036
|
+
<!-- <xsl:if test="$stage-abbreviation = 'FDIS'">
|
|
1037
|
+
<fo:block-container font-size="9pt" border="1.5 solid" border-color="rgb(221, 213, 213)" height="13mm" padding="1mm" margin-top="3mm">
|
|
1005
1038
|
<fo:block margin-bottom="6pt">
|
|
1006
1039
|
<xsl:call-template name="addLetterSpacing">
|
|
1007
1040
|
<xsl:with-param name="text">
|
|
@@ -1017,7 +1050,7 @@
|
|
|
1017
1050
|
</xsl:call-template>
|
|
1018
1051
|
</fo:block>
|
|
1019
1052
|
</fo:block-container>
|
|
1020
|
-
</xsl:if>
|
|
1053
|
+
</xsl:if> -->
|
|
1021
1054
|
|
|
1022
1055
|
</fo:flow>
|
|
1023
1056
|
</fo:page-sequence>
|
|
@@ -1191,6 +1224,10 @@
|
|
|
1191
1224
|
</fo:root>
|
|
1192
1225
|
</xsl:template>
|
|
1193
1226
|
|
|
1227
|
+
<xsl:template match="iec:tc-sc-officers-note/iec:p">
|
|
1228
|
+
<fo:block><xsl:apply-templates/></fo:block>
|
|
1229
|
+
</xsl:template>
|
|
1230
|
+
|
|
1194
1231
|
<xsl:template name="insertCoverPart1">
|
|
1195
1232
|
<xsl:variable name="lang_second">
|
|
1196
1233
|
<xsl:choose>
|
|
@@ -1574,6 +1611,39 @@
|
|
|
1574
1611
|
</xsl:template>
|
|
1575
1612
|
|
|
1576
1613
|
|
|
1614
|
+
<xsl:template match="iec:feedback-statement/iec:clause[@id = 'boilerplate-cenelec-attention']" priority="3">
|
|
1615
|
+
<fo:block font-size="8pt" margin-bottom="10pt" text-align="justify">
|
|
1616
|
+
<xsl:apply-templates/>
|
|
1617
|
+
</fo:block>
|
|
1618
|
+
</xsl:template>
|
|
1619
|
+
|
|
1620
|
+
<xsl:template match="iec:feedback-statement/iec:clause[@id = 'boilerplate-cenelec-attention']//iec:title" priority="3">
|
|
1621
|
+
<fo:block font-size="8pt" font-weight="bold" margin-bottom="10pt">
|
|
1622
|
+
<xsl:apply-templates/>
|
|
1623
|
+
</fo:block>
|
|
1624
|
+
</xsl:template>
|
|
1625
|
+
|
|
1626
|
+
<xsl:template match="iec:feedback-statement/iec:clause[@id = 'boilerplate-cenelec-attention']//iec:p" priority="3">
|
|
1627
|
+
<fo:block font-size="8pt" margin-bottom="10pt" text-align="justify">
|
|
1628
|
+
<xsl:apply-templates/>
|
|
1629
|
+
</fo:block>
|
|
1630
|
+
</xsl:template>
|
|
1631
|
+
|
|
1632
|
+
<xsl:template match="iec:feedback-statement/iec:clause[@id = 'boilerplate-cenelec-attention']//text()" priority="3">
|
|
1633
|
+
<!-- Example: Attention IEC-CENELEC parallel voting -->
|
|
1634
|
+
<xsl:if test="normalize-space() ! = ''">
|
|
1635
|
+
<xsl:call-template name="addLetterSpacing">
|
|
1636
|
+
<xsl:with-param name="text" select="."/>
|
|
1637
|
+
</xsl:call-template>
|
|
1638
|
+
</xsl:if>
|
|
1639
|
+
</xsl:template>
|
|
1640
|
+
|
|
1641
|
+
<xsl:template match="iec:boilerplate/iec:feedback-statement">
|
|
1642
|
+
<fo:block margin-top="6pt" font-size="1pt" span="all">
|
|
1643
|
+
</fo:block>
|
|
1644
|
+
<xsl:apply-templates select="*[not(@id) or @id != 'boilerplate-cenelec-attention']"/>
|
|
1645
|
+
</xsl:template>
|
|
1646
|
+
|
|
1577
1647
|
<xsl:template match="iec:feedback-statement//iec:clause/iec:title" priority="2">
|
|
1578
1648
|
<fo:block font-weight="bold" keep-with-next="always"><xsl:apply-templates/></fo:block>
|
|
1579
1649
|
</xsl:template>
|
|
@@ -1584,9 +1654,9 @@
|
|
|
1584
1654
|
|
|
1585
1655
|
<xsl:template match="iec:feedback-statement/iec:clause[not(iec:clause)]" priority="2">
|
|
1586
1656
|
<fo:block span="all" text-align="justify">
|
|
1587
|
-
<xsl:if test="not(preceding-sibling::iec:clause)">
|
|
1657
|
+
<!-- <xsl:if test="not(preceding-sibling::iec:clause)">
|
|
1588
1658
|
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
|
1589
|
-
</xsl:if>
|
|
1659
|
+
</xsl:if> -->
|
|
1590
1660
|
<xsl:apply-templates/>
|
|
1591
1661
|
</fo:block>
|
|
1592
1662
|
</xsl:template>
|
|
@@ -1693,6 +1763,23 @@
|
|
|
1693
1763
|
</fo:block>
|
|
1694
1764
|
</xsl:template>
|
|
1695
1765
|
|
|
1766
|
+
<xsl:template match="iec:license-statement//iec:title" mode="cover-page-internal">
|
|
1767
|
+
<fo:block text-align="center" font-weight="bold">
|
|
1768
|
+
<xsl:apply-templates/>
|
|
1769
|
+
</fo:block>
|
|
1770
|
+
</xsl:template>
|
|
1771
|
+
<xsl:template match="iec:license-statement//iec:p" mode="cover-page-internal">
|
|
1772
|
+
<fo:block margin-bottom="6pt">
|
|
1773
|
+
<xsl:apply-templates mode="cover-page-internal"/>
|
|
1774
|
+
</fo:block>
|
|
1775
|
+
</xsl:template>
|
|
1776
|
+
<xsl:template match="iec:license-statement//iec:p//text()" mode="cover-page-internal">
|
|
1777
|
+
<xsl:call-template name="addLetterSpacing">
|
|
1778
|
+
<xsl:with-param name="text"><xsl:value-of select="."/></xsl:with-param>
|
|
1779
|
+
</xsl:call-template>
|
|
1780
|
+
</xsl:template>
|
|
1781
|
+
|
|
1782
|
+
|
|
1696
1783
|
<!-- <fo:block margin-bottom="12pt">© ISO 2019, Published in Switzerland.</fo:block>
|
|
1697
1784
|
<fo:block font-size="10pt" margin-bottom="12pt">All rights reserved. Unless otherwise specified, no part of this publication may be reproduced or utilized otherwise in any form or by any means, electronic or mechanical, including photocopying, or posting on the internet or an intranet, without prior written permission. Permission can be requested from either ISO at the address below or ISO’s member body in the country of the requester.</fo:block>
|
|
1698
1785
|
<fo:block font-size="10pt" text-indent="7.1mm">
|
|
@@ -1728,6 +1815,15 @@
|
|
|
1728
1815
|
<xsl:apply-templates/>
|
|
1729
1816
|
</fo:block>
|
|
1730
1817
|
</xsl:template>
|
|
1818
|
+
|
|
1819
|
+
<!-- copyright text in footer internal footer -->
|
|
1820
|
+
<xsl:template match="iec:copyright-statement//iec:p[not(@id)]//text()">
|
|
1821
|
+
<xsl:if test="normalize-space() ! = ''">
|
|
1822
|
+
<xsl:call-template name="addLetterSpacing">
|
|
1823
|
+
<xsl:with-param name="text" select="normalize-space(.)"/>
|
|
1824
|
+
</xsl:call-template>
|
|
1825
|
+
</xsl:if>
|
|
1826
|
+
</xsl:template>
|
|
1731
1827
|
|
|
1732
1828
|
|
|
1733
1829
|
<xsl:template match="iec:iec-standard/iec:preface/iec:foreword" priority="3">
|
|
@@ -2748,6 +2844,7 @@
|
|
|
2748
2844
|
|
|
2749
2845
|
|
|
2750
2846
|
|
|
2847
|
+
|
|
2751
2848
|
<xsl:attribute name="margin-top">5pt</xsl:attribute>
|
|
2752
2849
|
<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
|
|
2753
2850
|
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
|
@@ -2898,7 +2995,7 @@
|
|
|
2898
2995
|
</xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
|
|
2899
2996
|
<!-- <xsl:call-template name="add-zero-spaces"/> -->
|
|
2900
2997
|
<xsl:call-template name="add-zero-spaces-java"/>
|
|
2901
|
-
</xsl:template><xsl:template match="*[local-name()='table']">
|
|
2998
|
+
</xsl:template><xsl:template match="*[local-name()='table']" name="table">
|
|
2902
2999
|
|
|
2903
3000
|
<xsl:variable name="simple-table">
|
|
2904
3001
|
<xsl:call-template name="getSimpleTable"/>
|
|
@@ -4231,6 +4328,7 @@
|
|
|
4231
4328
|
|
|
4232
4329
|
|
|
4233
4330
|
|
|
4331
|
+
|
|
4234
4332
|
|
|
4235
4333
|
</xsl:variable>
|
|
4236
4334
|
<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
|
|
@@ -4830,7 +4928,7 @@
|
|
|
4830
4928
|
</xsl:if> -->
|
|
4831
4929
|
</fo:inline>
|
|
4832
4930
|
</xsl:if>
|
|
4833
|
-
</xsl:template><xsl:template match="*[local-name() = 'figure']">
|
|
4931
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
|
|
4834
4932
|
<fo:block-container id="{@id}">
|
|
4835
4933
|
|
|
4836
4934
|
<fo:block>
|
|
@@ -5037,6 +5135,12 @@
|
|
|
5037
5135
|
<!-- <xsl:text> </xsl:text> -->
|
|
5038
5136
|
</xsl:template><xsl:template name="getSection">
|
|
5039
5137
|
<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
|
|
5138
|
+
<!--
|
|
5139
|
+
<xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
|
|
5140
|
+
<xsl:value-of select="."/>
|
|
5141
|
+
</xsl:for-each>
|
|
5142
|
+
-->
|
|
5143
|
+
|
|
5040
5144
|
</xsl:template><xsl:template name="getName">
|
|
5041
5145
|
<xsl:choose>
|
|
5042
5146
|
<xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
|
|
@@ -5089,6 +5193,10 @@
|
|
|
5089
5193
|
<xsl:copy>
|
|
5090
5194
|
<xsl:apply-templates mode="contents_item"/>
|
|
5091
5195
|
</xsl:copy>
|
|
5196
|
+
</xsl:template><xsl:template match="*[local-name() = 'em']" mode="contents_item">
|
|
5197
|
+
<xsl:copy>
|
|
5198
|
+
<xsl:apply-templates mode="contents_item"/>
|
|
5199
|
+
</xsl:copy>
|
|
5092
5200
|
</xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
|
|
5093
5201
|
<xsl:text> </xsl:text>
|
|
5094
5202
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
|
|
@@ -5114,6 +5222,7 @@
|
|
|
5114
5222
|
|
|
5115
5223
|
|
|
5116
5224
|
|
|
5225
|
+
|
|
5117
5226
|
|
|
5118
5227
|
|
|
5119
5228
|
|
|
@@ -5651,6 +5760,7 @@
|
|
|
5651
5760
|
|
|
5652
5761
|
|
|
5653
5762
|
|
|
5763
|
+
|
|
5654
5764
|
|
|
5655
5765
|
|
|
5656
5766
|
|
|
@@ -5662,7 +5772,7 @@
|
|
|
5662
5772
|
|
|
5663
5773
|
|
|
5664
5774
|
|
|
5665
|
-
</xsl:template><xsl:template match="
|
|
5775
|
+
</xsl:template><xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
|
|
5666
5776
|
<fo:block break-after="page"/>
|
|
5667
5777
|
<fo:block>
|
|
5668
5778
|
<xsl:call-template name="setId"/>
|
|
@@ -5670,7 +5780,8 @@
|
|
|
5670
5780
|
</fo:block>
|
|
5671
5781
|
</xsl:template><xsl:template match="*[local-name() = 'clause']">
|
|
5672
5782
|
<fo:block>
|
|
5673
|
-
<xsl:call-template name="setId"/>
|
|
5783
|
+
<xsl:call-template name="setId"/>
|
|
5784
|
+
|
|
5674
5785
|
|
|
5675
5786
|
<xsl:apply-templates/>
|
|
5676
5787
|
</fo:block>
|
|
@@ -5842,6 +5953,57 @@
|
|
|
5842
5953
|
</xsl:variable>
|
|
5843
5954
|
<xsl:variable name="result">
|
|
5844
5955
|
<xsl:choose>
|
|
5956
|
+
<xsl:when test="$format = 'ddMMyyyy'">
|
|
5957
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
5958
|
+
<xsl:text> </xsl:text>
|
|
5959
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
|
|
5960
|
+
</xsl:when>
|
|
5961
|
+
<xsl:when test="$format = 'ddMM'">
|
|
5962
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
5963
|
+
<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
|
|
5964
|
+
</xsl:when>
|
|
5965
|
+
<xsl:when test="$format = 'short' or $day = ''">
|
|
5966
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
|
|
5967
|
+
</xsl:when>
|
|
5968
|
+
<xsl:otherwise>
|
|
5969
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
|
|
5970
|
+
</xsl:otherwise>
|
|
5971
|
+
</xsl:choose>
|
|
5972
|
+
</xsl:variable>
|
|
5973
|
+
<xsl:value-of select="$result"/>
|
|
5974
|
+
</xsl:template><xsl:template name="convertDateLocalized">
|
|
5975
|
+
<xsl:param name="date"/>
|
|
5976
|
+
<xsl:param name="format" select="'short'"/>
|
|
5977
|
+
<xsl:variable name="year" select="substring($date, 1, 4)"/>
|
|
5978
|
+
<xsl:variable name="month" select="substring($date, 6, 2)"/>
|
|
5979
|
+
<xsl:variable name="day" select="substring($date, 9, 2)"/>
|
|
5980
|
+
<xsl:variable name="monthStr">
|
|
5981
|
+
<xsl:choose>
|
|
5982
|
+
<xsl:when test="$month = '01'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_january</xsl:with-param></xsl:call-template></xsl:when>
|
|
5983
|
+
<xsl:when test="$month = '02'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_february</xsl:with-param></xsl:call-template></xsl:when>
|
|
5984
|
+
<xsl:when test="$month = '03'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_march</xsl:with-param></xsl:call-template></xsl:when>
|
|
5985
|
+
<xsl:when test="$month = '04'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_april</xsl:with-param></xsl:call-template></xsl:when>
|
|
5986
|
+
<xsl:when test="$month = '05'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_may</xsl:with-param></xsl:call-template></xsl:when>
|
|
5987
|
+
<xsl:when test="$month = '06'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_june</xsl:with-param></xsl:call-template></xsl:when>
|
|
5988
|
+
<xsl:when test="$month = '07'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_july</xsl:with-param></xsl:call-template></xsl:when>
|
|
5989
|
+
<xsl:when test="$month = '08'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_august</xsl:with-param></xsl:call-template></xsl:when>
|
|
5990
|
+
<xsl:when test="$month = '09'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_september</xsl:with-param></xsl:call-template></xsl:when>
|
|
5991
|
+
<xsl:when test="$month = '10'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_october</xsl:with-param></xsl:call-template></xsl:when>
|
|
5992
|
+
<xsl:when test="$month = '11'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_november</xsl:with-param></xsl:call-template></xsl:when>
|
|
5993
|
+
<xsl:when test="$month = '12'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_december</xsl:with-param></xsl:call-template></xsl:when>
|
|
5994
|
+
</xsl:choose>
|
|
5995
|
+
</xsl:variable>
|
|
5996
|
+
<xsl:variable name="result">
|
|
5997
|
+
<xsl:choose>
|
|
5998
|
+
<xsl:when test="$format = 'ddMMyyyy'">
|
|
5999
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
6000
|
+
<xsl:text> </xsl:text>
|
|
6001
|
+
<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
|
|
6002
|
+
</xsl:when>
|
|
6003
|
+
<xsl:when test="$format = 'ddMM'">
|
|
6004
|
+
<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
|
|
6005
|
+
<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
|
|
6006
|
+
</xsl:when>
|
|
5845
6007
|
<xsl:when test="$format = 'short' or $day = ''">
|
|
5846
6008
|
<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
|
|
5847
6009
|
</xsl:when>
|
|
@@ -6036,6 +6198,7 @@
|
|
|
6036
6198
|
|
|
6037
6199
|
|
|
6038
6200
|
|
|
6201
|
+
|
|
6039
6202
|
</xsl:variable>
|
|
6040
6203
|
<xsl:if test="$documentNS != $XSLNS">
|
|
6041
6204
|
<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
|
|
@@ -13,8 +13,8 @@ module IsoDoc
|
|
|
13
13
|
|
|
14
14
|
def default_fonts(options)
|
|
15
15
|
{
|
|
16
|
-
bodyfont: (options[:script] == "Hans" ? '"
|
|
17
|
-
headerfont: (options[:script] == "Hans" ? '"
|
|
16
|
+
bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' : '"Arial",sans-serif'),
|
|
17
|
+
headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : '"Arial",sans-serif'),
|
|
18
18
|
monospacefont: '"Courier New",monospace',
|
|
19
19
|
normalfontsize: "10.0pt",
|
|
20
20
|
footnotefontsize: "8.0pt",
|
data/metanorma-iec.gemspec
CHANGED
|
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
|
|
|
13
13
|
spec.summary = "metanorma-iec lets you write IEC standards "\
|
|
14
14
|
"in AsciiDoc."
|
|
15
15
|
spec.description = <<~DESCRIPTION
|
|
16
|
-
metanorma-
|
|
16
|
+
metanorma-iec lets you write IEC standards in AsciiDoc syntax.
|
|
17
17
|
|
|
18
18
|
This gem is in active development.
|
|
19
19
|
DESCRIPTION
|
|
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
|
|
|
28
28
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
|
|
29
29
|
|
|
30
30
|
spec.add_dependency "ruby-jing"
|
|
31
|
-
spec.add_dependency "metanorma-iso", "~> 1.
|
|
31
|
+
spec.add_dependency "metanorma-iso", "~> 1.7.0"
|
|
32
32
|
|
|
33
33
|
spec.add_development_dependency "byebug"
|
|
34
34
|
spec.add_development_dependency "sassc", "2.4.0"
|
|
@@ -101,6 +101,7 @@ end
|
|
|
101
101
|
:cen-processing: true
|
|
102
102
|
:secretary: Fred Nerk
|
|
103
103
|
:interest-to-committees: TC 6121, SC 12
|
|
104
|
+
:obsoletes: ABC; DEF
|
|
104
105
|
INPUT
|
|
105
106
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
106
107
|
<iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
|
|
@@ -150,6 +151,18 @@ end
|
|
|
150
151
|
</organization>
|
|
151
152
|
</owner>
|
|
152
153
|
</copyright>
|
|
154
|
+
<relation type='obsoletes'>
|
|
155
|
+
<bibitem>
|
|
156
|
+
<title>--</title>
|
|
157
|
+
<docidentifier>ABC</docidentifier>
|
|
158
|
+
</bibitem>
|
|
159
|
+
</relation>
|
|
160
|
+
<relation type='obsoletes'>
|
|
161
|
+
<bibitem>
|
|
162
|
+
<title>--</title>
|
|
163
|
+
<docidentifier>DEF</docidentifier>
|
|
164
|
+
</bibitem>
|
|
165
|
+
</relation>
|
|
153
166
|
<ext>
|
|
154
167
|
<doctype>article</doctype>
|
|
155
168
|
<horizontal>false</horizontal>
|
|
@@ -987,8 +1000,8 @@ OUTPUT
|
|
|
987
1000
|
INPUT
|
|
988
1001
|
html = File.read("test.html", encoding: "utf-8")
|
|
989
1002
|
expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
|
|
990
|
-
expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "
|
|
991
|
-
expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "
|
|
1003
|
+
expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
|
|
1004
|
+
expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
|
|
992
1005
|
end
|
|
993
1006
|
|
|
994
1007
|
it "uses specified fonts" do
|
|
@@ -17,7 +17,7 @@ RSpec.describe Asciidoctor::Iec do
|
|
|
17
17
|
expect do
|
|
18
18
|
Metanorma::Compile
|
|
19
19
|
.new
|
|
20
|
-
.compile("spec/assets/xref_error.adoc", type: "iec")
|
|
20
|
+
.compile("spec/assets/xref_error.adoc", type: "iec", :"agree-to-terms" => true)
|
|
21
21
|
end.to(change { File.exist?("spec/assets/xref_error.err") }
|
|
22
22
|
.from(false).to(true))
|
|
23
23
|
end
|
data/spec/isodoc/iso_spec.rb
CHANGED
|
@@ -32,8 +32,8 @@ RSpec.describe IsoDoc::Iec do
|
|
|
32
32
|
INPUT
|
|
33
33
|
html = File.read("test.html", encoding: "utf-8")
|
|
34
34
|
expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
|
|
35
|
-
expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "
|
|
36
|
-
expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "
|
|
35
|
+
expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
|
|
36
|
+
expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
|
|
37
37
|
end
|
|
38
38
|
|
|
39
39
|
it "processes isodoc as ISO: user nominated fonts" do
|
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: 1.2.
|
|
4
|
+
version: 1.2.13
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-01-
|
|
11
|
+
date: 2021-01-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: ruby-jing
|
|
@@ -30,14 +30,14 @@ dependencies:
|
|
|
30
30
|
requirements:
|
|
31
31
|
- - "~>"
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 1.
|
|
33
|
+
version: 1.7.0
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
38
|
- - "~>"
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: 1.
|
|
40
|
+
version: 1.7.0
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: byebug
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -193,7 +193,7 @@ dependencies:
|
|
|
193
193
|
- !ruby/object:Gem::Version
|
|
194
194
|
version: 0.2.0
|
|
195
195
|
description: |
|
|
196
|
-
metanorma-
|
|
196
|
+
metanorma-iec lets you write IEC standards in AsciiDoc syntax.
|
|
197
197
|
|
|
198
198
|
This gem is in active development.
|
|
199
199
|
email:
|