metanorma-iec 1.2.10 → 1.2.11
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 +18 -3
- data/lib/asciidoctor/iec/front.rb +1 -0
- data/lib/asciidoctor/iec/iec.rng +8 -5
- data/lib/asciidoctor/iec/isodoc.rng +7 -0
- data/lib/isodoc/iec/iec.international-standard.xsl +333 -145
- data/lib/metanorma/iec/processor.rb +11 -0
- data/lib/metanorma/iec/version.rb +1 -1
- data/metanorma-iec.gemspec +1 -1
- data/spec/asciidoctor-iec/base_spec.rb +3 -1
- data/spec/asciidoctor-iec/cleanup_spec.rb +7 -2
- metadata +4 -5
- data/lib/metanorma/iec/fonts_manifest.yaml +0 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 757f304ffb697a9e1ac4cbea8cb23bd97d1c84919c79330c850c185147e87dea
|
|
4
|
+
data.tar.gz: c9abb1c90c14b852382dc58cceb438292a06221a027d00f50f7b10b234193db9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: '09f9d546277d03635c47c8ec61c2a19c3170605e0edd6e1632f62258d2d1d1f6e458bdf781bf95b3e9b0c8995072cb003f8c60ecf885b7d9f9b0fb1168c8210c'
|
|
7
|
+
data.tar.gz: e327cf4c18dc4e20fe836829ac9428492edb163e46e4f864e67c42a1affb33d72e366a10c59cc750e1274eff26fde85ae9193a84b0941c94e9e6e054c08d253b
|
|
@@ -729,12 +729,27 @@
|
|
|
729
729
|
</define>
|
|
730
730
|
<define name="index">
|
|
731
731
|
<element name="index">
|
|
732
|
-
<attribute name="
|
|
732
|
+
<attribute name="to">
|
|
733
|
+
<data type="IDREF"/>
|
|
734
|
+
</attribute>
|
|
735
|
+
<element name="primary">
|
|
736
|
+
<oneOrMore>
|
|
737
|
+
<ref name="PureTextElement"/>
|
|
738
|
+
</oneOrMore>
|
|
739
|
+
</element>
|
|
733
740
|
<optional>
|
|
734
|
-
<
|
|
741
|
+
<element name="secondary">
|
|
742
|
+
<oneOrMore>
|
|
743
|
+
<ref name="PureTextElement"/>
|
|
744
|
+
</oneOrMore>
|
|
745
|
+
</element>
|
|
735
746
|
</optional>
|
|
736
747
|
<optional>
|
|
737
|
-
<
|
|
748
|
+
<element name="tertiary">
|
|
749
|
+
<oneOrMore>
|
|
750
|
+
<ref name="PureTextElement"/>
|
|
751
|
+
</oneOrMore>
|
|
752
|
+
</element>
|
|
738
753
|
</optional>
|
|
739
754
|
</element>
|
|
740
755
|
</define>
|
data/lib/asciidoctor/iec/iec.rng
CHANGED
|
@@ -40,6 +40,9 @@
|
|
|
40
40
|
<optional>
|
|
41
41
|
<ref name="price-code"/>
|
|
42
42
|
</optional>
|
|
43
|
+
<optional>
|
|
44
|
+
<ref name="cen-processing"/>
|
|
45
|
+
</optional>
|
|
43
46
|
</define>
|
|
44
47
|
</include>
|
|
45
48
|
<!-- end overrides -->
|
|
@@ -53,11 +56,6 @@
|
|
|
53
56
|
</choice>
|
|
54
57
|
</element>
|
|
55
58
|
</define>
|
|
56
|
-
<define name="horizontal">
|
|
57
|
-
<element name="horizontal">
|
|
58
|
-
<data type="boolean"/>
|
|
59
|
-
</element>
|
|
60
|
-
</define>
|
|
61
59
|
<define name="accessibility-color-inside">
|
|
62
60
|
<element name="accessibility-color-inside">
|
|
63
61
|
<data type="boolean"/>
|
|
@@ -68,6 +66,11 @@
|
|
|
68
66
|
<text/>
|
|
69
67
|
</element>
|
|
70
68
|
</define>
|
|
69
|
+
<define name="cen-processing">
|
|
70
|
+
<element name="cen-processing">
|
|
71
|
+
<data type="boolean"/>
|
|
72
|
+
</element>
|
|
73
|
+
</define>
|
|
71
74
|
<!--
|
|
72
75
|
We display the Normative References between scope and terms; but to keep the
|
|
73
76
|
grammar simple, we keep the references together
|
|
@@ -55,6 +55,13 @@
|
|
|
55
55
|
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
56
56
|
</data>
|
|
57
57
|
</attribute>
|
|
58
|
+
<optional>
|
|
59
|
+
<attribute name="to">
|
|
60
|
+
<data type="string">
|
|
61
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
62
|
+
</data>
|
|
63
|
+
</attribute>
|
|
64
|
+
</optional>
|
|
58
65
|
<optional>
|
|
59
66
|
<attribute name="type">
|
|
60
67
|
<ref name="ReferenceFormat"/>
|
|
@@ -17,31 +17,23 @@
|
|
|
17
17
|
|
|
18
18
|
|
|
19
19
|
|
|
20
|
-
<xsl:variable name="debug">
|
|
20
|
+
<xsl:variable name="debug">false</xsl:variable>
|
|
21
21
|
<xsl:variable name="pageWidth" select="'210mm'"/>
|
|
22
22
|
<xsl:variable name="pageHeight" select="'297mm'"/>
|
|
23
23
|
|
|
24
|
-
<xsl:variable name="copyrightText" select="concat('© ',
|
|
24
|
+
<xsl:variable name="copyrightText" select="concat('© ', //iec:iec-standard/iec:bibdata/iec:copyright/iec:owner/iec:organization/iec:abbreviation, ':', //iec:iec-standard/iec:bibdata/iec:copyright/iec:from)"/>
|
|
25
25
|
<!-- <xsl:variable name="lang-1st-letter" select="concat('(', translate(substring(iec:iec-standard/iec:bibdata/iec:language,1,1),$lower, $upper), ')')"/> -->
|
|
26
26
|
<xsl:variable name="lang-1st-letter" select="''"/>
|
|
27
|
-
<xsl:variable name="ISOname" select="
|
|
27
|
+
<xsl:variable name="ISOname" select="//iec:iec-standard/iec:bibdata/iec:docidentifier[@type='iso' or @type='ISO']"/>
|
|
28
28
|
|
|
29
|
-
<xsl:variable name="
|
|
30
|
-
<xsl:variable name="title-intro-fr" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr' and @type = 'title-intro']"/>
|
|
31
|
-
<xsl:variable name="title-main" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'en' and @type = 'title-main']"/>
|
|
32
|
-
<xsl:variable name="title-main-fr" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr' and @type = 'title-main']"/>
|
|
33
|
-
<xsl:variable name="part" select="/iec:iec-standard/iec:bibdata/iec:ext/iec:structuredidentifier/iec:project-number/@part"/>
|
|
29
|
+
<xsl:variable name="part" select="//iec:iec-standard/iec:bibdata/iec:ext/iec:structuredidentifier/iec:project-number/@part"/>
|
|
34
30
|
|
|
35
|
-
<xsl:variable name="doctype_uppercased" select="java:toUpperCase(java:java.lang.String.new(
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
<xsl:variable name="publisher" select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:contributor[iec:role/@type = 'publisher']/iec:organization/iec:name))"/>
|
|
31
|
+
<xsl:variable name="doctype_uppercased" select="java:toUpperCase(java:java.lang.String.new(//iec:iec-standard/iec:bibdata/iec:ext/iec:doctype[@language = $lang]))"/>
|
|
40
32
|
|
|
41
|
-
<xsl:variable name="stage" select="number(
|
|
42
|
-
<xsl:variable name="substage" select="number(
|
|
43
|
-
<xsl:variable name="stagename" select="normalize-space(
|
|
44
|
-
<xsl:variable name="abbreviation" select="normalize-space(
|
|
33
|
+
<xsl:variable name="stage" select="number(//iec:iec-standard/iec:bibdata/iec:status/iec:stage)"/>
|
|
34
|
+
<xsl:variable name="substage" select="number(//iec:iec-standard/iec:bibdata/iec:status/iec:substage)"/>
|
|
35
|
+
<xsl:variable name="stagename" select="normalize-space(//iec:iec-standard/iec:bibdata/iec:ext/iec:stagename)"/>
|
|
36
|
+
<xsl:variable name="abbreviation" select="normalize-space(//iec:iec-standard/iec:bibdata/iec:status/iec:stage/@abbreviation)"/>
|
|
45
37
|
|
|
46
38
|
<xsl:variable name="stage-abbreviation">
|
|
47
39
|
<xsl:choose>
|
|
@@ -87,7 +79,24 @@
|
|
|
87
79
|
<item id="term-script" display="false">3.2</item>
|
|
88
80
|
-->
|
|
89
81
|
<xsl:variable name="contents">
|
|
90
|
-
|
|
82
|
+
|
|
83
|
+
<xsl:for-each select="//iec:iec-standard">
|
|
84
|
+
<xsl:variable name="lang" select="*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
|
|
85
|
+
<xsl:variable name="current_document">
|
|
86
|
+
<xsl:copy-of select="."/>
|
|
87
|
+
</xsl:variable>
|
|
88
|
+
<xsl:for-each select="xalan:nodeset($current_document)">
|
|
89
|
+
<xsl:variable name="docid">
|
|
90
|
+
<xsl:call-template name="getDocumentId"/>
|
|
91
|
+
</xsl:variable>
|
|
92
|
+
<doc id="{$docid}" lang="{$lang}">
|
|
93
|
+
<xsl:call-template name="generateContents"/>
|
|
94
|
+
</doc>
|
|
95
|
+
</xsl:for-each>
|
|
96
|
+
</xsl:for-each>
|
|
97
|
+
|
|
98
|
+
|
|
99
|
+
<!-- <xsl:variable name="docid">
|
|
91
100
|
<xsl:call-template name="getDocumentId"/>
|
|
92
101
|
</xsl:variable>
|
|
93
102
|
<doc id="{$docid}" lang="{$lang}">
|
|
@@ -113,7 +122,7 @@
|
|
|
113
122
|
</doc>
|
|
114
123
|
</xsl:for-each>
|
|
115
124
|
</xsl:for-each>
|
|
116
|
-
</xsl:for-each>
|
|
125
|
+
</xsl:for-each> -->
|
|
117
126
|
|
|
118
127
|
|
|
119
128
|
</xsl:variable>
|
|
@@ -122,6 +131,16 @@
|
|
|
122
131
|
<contents>
|
|
123
132
|
<xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
|
|
124
133
|
<xsl:call-template name="processMainSectionsDefault_Contents"/>
|
|
134
|
+
<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name']]">
|
|
135
|
+
<figure id="{@id}">
|
|
136
|
+
<title><xsl:value-of select="*[local-name() = 'name']/text()"/></title>
|
|
137
|
+
</figure>
|
|
138
|
+
</xsl:for-each>
|
|
139
|
+
<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name']]">
|
|
140
|
+
<table id="{@id}">
|
|
141
|
+
<title><xsl:value-of select="*[local-name() = 'name']/text()"/></title>
|
|
142
|
+
</table>
|
|
143
|
+
</xsl:for-each>
|
|
125
144
|
</contents>
|
|
126
145
|
</xsl:template>
|
|
127
146
|
|
|
@@ -210,7 +229,7 @@
|
|
|
210
229
|
<fo:static-content flow-name="left-region">
|
|
211
230
|
<fo:block-container reference-orientation="90">
|
|
212
231
|
<fo:block font-size="7pt" margin-left="0.5mm" margin-top="5mm">
|
|
213
|
-
<xsl:value-of select="
|
|
232
|
+
<xsl:value-of select="(//iec:iec-standard)[1]/iec:bibdata/iec:docidentifier[@type = 'iso-with-lang']"/>
|
|
214
233
|
</fo:block>
|
|
215
234
|
</fo:block-container>
|
|
216
235
|
</fo:static-content>
|
|
@@ -245,7 +264,7 @@
|
|
|
245
264
|
<fo:block margin-bottom="3pt">THIS PUBLICATION IS COPYRIGHT PROTECTED</fo:block>
|
|
246
265
|
<fo:block margin-bottom="10pt">
|
|
247
266
|
<!-- Example: Copyright © 2014 IEC, Geneva, Switzerland -->
|
|
248
|
-
<xsl:apply-templates select="
|
|
267
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-year')]"/>
|
|
249
268
|
</fo:block>
|
|
250
269
|
</fo:table-cell>
|
|
251
270
|
</fo:table-row>
|
|
@@ -258,15 +277,18 @@
|
|
|
258
277
|
either IEC or IEC's member National Committee in the country of the requester. If you have any questions about IEC
|
|
259
278
|
copyright or have an enquiry about obtaining additional rights to this publication, please contact the address below or
|
|
260
279
|
your local IEC member National Committee for further information. -->
|
|
261
|
-
<xsl:apply-templates select="
|
|
280
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-message')]"/>
|
|
262
281
|
</fo:block>
|
|
263
|
-
|
|
282
|
+
<!-- Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne peut être reproduite
|
|
264
283
|
ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique ou mécanique, y compris la photocopie
|
|
265
284
|
et les microfilms, sans l'accord écrit de l'IEC ou du Comité national de l'IEC du pays du demandeur. Si vous avez des
|
|
266
285
|
questions sur le copyright de l'IEC ou si vous désirez obtenir des droits supplémentaires sur cette publication, utilisez
|
|
267
|
-
les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pays de résidence
|
|
286
|
+
les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pays de résidence. -->
|
|
287
|
+
<fo:block margin-bottom="8pt" text-align="justify">
|
|
288
|
+
<xsl:apply-templates select="(//iec:iec-standard)[2]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-message')]"/>
|
|
289
|
+
</fo:block>
|
|
268
290
|
|
|
269
|
-
<xsl:variable name="telpos" select="count(
|
|
291
|
+
<xsl:variable name="telpos" select="count((//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-address')]/text()[contains(., 'Tel.')]/preceding-sibling::node())"/>
|
|
270
292
|
<fo:table table-layout="fixed" width="100%">
|
|
271
293
|
<fo:table-column column-width="59mm"/>
|
|
272
294
|
<fo:table-column column-width="90mm"/>
|
|
@@ -278,13 +300,13 @@
|
|
|
278
300
|
3, rue de Varembé
|
|
279
301
|
CH-1211 Geneva 20
|
|
280
302
|
Switzerland -->
|
|
281
|
-
<xsl:apply-templates select="
|
|
303
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-name')]" mode="coverpage"/>
|
|
282
304
|
<xsl:choose>
|
|
283
305
|
<xsl:when test="$telpos != 0">
|
|
284
|
-
<xsl:apply-templates select="
|
|
306
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-address')]/node()[position() < $telpos]" mode="coverpage"/>
|
|
285
307
|
</xsl:when>
|
|
286
308
|
<xsl:otherwise>
|
|
287
|
-
<xsl:apply-templates select="
|
|
309
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-address')]" mode="coverpage"/>
|
|
288
310
|
</xsl:otherwise>
|
|
289
311
|
</xsl:choose>
|
|
290
312
|
</fo:block>
|
|
@@ -297,7 +319,7 @@
|
|
|
297
319
|
www.iec.ch -->
|
|
298
320
|
<xsl:choose>
|
|
299
321
|
<xsl:when test="$telpos != 0">
|
|
300
|
-
<xsl:apply-templates select="
|
|
322
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-address')]/node()[position() > $telpos]" mode="coverpage"/>
|
|
301
323
|
</xsl:when>
|
|
302
324
|
<xsl:otherwise> </xsl:otherwise>
|
|
303
325
|
</xsl:choose>
|
|
@@ -313,9 +335,12 @@
|
|
|
313
335
|
</fo:block-container>
|
|
314
336
|
</fo:block>
|
|
315
337
|
|
|
316
|
-
<xsl:apply-templates select="
|
|
338
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:feedback-statement"/>
|
|
317
339
|
<fo:block span="all" border-bottom="0.5pt solid black"/>
|
|
318
|
-
|
|
340
|
+
<xsl:if test="(//iec:iec-standard)[2]/iec:boilerplate/iec:feedback-statement">
|
|
341
|
+
<xsl:apply-templates select="(//iec:iec-standard)[2]/iec:boilerplate/iec:feedback-statement"/>
|
|
342
|
+
<fo:block span="all"/>
|
|
343
|
+
</xsl:if>
|
|
319
344
|
<!-- <fo:block span="all">
|
|
320
345
|
<fo:block-container margin-top="6pt">
|
|
321
346
|
<fo:block-container text-align="justify" margin-left="0mm" margin-right="0mm">
|
|
@@ -452,7 +477,7 @@
|
|
|
452
477
|
</fo:flow>
|
|
453
478
|
</fo:page-sequence>
|
|
454
479
|
</xsl:if>
|
|
455
|
-
|
|
480
|
+
<xsl:variable name="lang_second" select="(//iec:iec-standard)[2]/iec:bibdata/iec:language[@current = 'true']"/>
|
|
456
481
|
<!-- For 'Published' documents insert 3rd Cover Page
|
|
457
482
|
OR insert first Covert Page for FDIS -->
|
|
458
483
|
<xsl:if test="$stage >= 60 or $stage-abbreviation = 'FDIS'">
|
|
@@ -464,15 +489,18 @@
|
|
|
464
489
|
<fo:block font-size="9pt" color="{$color_blue}" line-height="150%">
|
|
465
490
|
<fo:block-container width="40mm">
|
|
466
491
|
<fo:block>
|
|
467
|
-
<xsl:
|
|
492
|
+
<!-- <xsl:variable name="publisher" select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:contributor[iec:role/@type = 'publisher']/iec:organization/iec:name))"/> -->
|
|
493
|
+
<!-- <xsl:value-of select="$publisher"/> -->
|
|
494
|
+
<xsl:value-of select="(//iec:iec-standard)[1]/iec:localized-strings/iec:localized-string[@key='IEC' and @language=$lang]"/>
|
|
468
495
|
</fo:block>
|
|
469
496
|
</fo:block-container>
|
|
470
497
|
</fo:block>
|
|
471
|
-
<xsl:if test="
|
|
498
|
+
<xsl:if test="(//iec:iec-standard)[2]/iec:localized-strings/iec:localized-string[@key='IEC' and @language=$lang_second]">
|
|
472
499
|
<fo:block font-size="9pt" line-height="150%" margin-top="8pt">
|
|
473
500
|
<fo:block-container width="40mm">
|
|
474
501
|
<fo:block>
|
|
475
|
-
<xsl:value-of select="'COMMISSION ELECTROTECHNIQUE INTERNATIONALE'"/>
|
|
502
|
+
<!-- <xsl:value-of select="'COMMISSION ELECTROTECHNIQUE INTERNATIONALE'"/> -->
|
|
503
|
+
<xsl:value-of select="(//iec:iec-standard)[2]/iec:localized-strings/iec:localized-string[@key='IEC' and @language=$lang_second]"/>
|
|
476
504
|
</fo:block>
|
|
477
505
|
</fo:block-container>
|
|
478
506
|
</fo:block>
|
|
@@ -489,25 +517,32 @@
|
|
|
489
517
|
<fo:block color="{$color_blue}" margin-bottom="3pt">
|
|
490
518
|
<!-- PRICE CODE -->
|
|
491
519
|
<xsl:variable name="price_code">
|
|
492
|
-
<xsl:call-template name="getLocalizedString">
|
|
520
|
+
<!-- <xsl:call-template name="getLocalizedString">
|
|
493
521
|
<xsl:with-param name="key">price-code</xsl:with-param>
|
|
494
|
-
</xsl:call-template>
|
|
522
|
+
</xsl:call-template> -->
|
|
523
|
+
<xsl:value-of select="(//iec:iec-standard)[1]/iec:localized-strings/iec:localized-string[@key='price-code' and @language=$lang]"/>
|
|
495
524
|
</xsl:variable>
|
|
496
525
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($price_code))"/>
|
|
497
526
|
</fo:block>
|
|
498
|
-
<xsl:if test="$lang != 'fr'">
|
|
527
|
+
<!-- <xsl:if test="$lang != 'fr'">
|
|
499
528
|
<fo:block>CODE PRIX</fo:block>
|
|
500
|
-
</xsl:if>
|
|
529
|
+
</xsl:if> -->
|
|
530
|
+
<fo:block>
|
|
531
|
+
<xsl:variable name="price_code">
|
|
532
|
+
<xsl:value-of select="(//iec:iec-standard)[2]/iec:localized-strings/iec:localized-string[@key='price-code' and @language=$lang_second]"/>
|
|
533
|
+
</xsl:variable>
|
|
534
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($price_code))"/>
|
|
535
|
+
</fo:block>
|
|
501
536
|
</fo:block>
|
|
502
537
|
</fo:table-cell>
|
|
503
538
|
<fo:table-cell font-size="25pt" font-weight="bold" color="{$color_gray}" text-align="right" display-align="center">
|
|
504
|
-
<fo:block padding-top="1mm"><xsl:value-of select="
|
|
539
|
+
<fo:block padding-top="1mm"><xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:ext/iec:price-code"/></fo:block>
|
|
505
540
|
</fo:table-cell>
|
|
506
541
|
</fo:table-row>
|
|
507
542
|
</fo:table-body>
|
|
508
543
|
</fo:table>
|
|
509
544
|
<fo:block font-size="8pt" text-align-last="justify">
|
|
510
|
-
<xsl:for-each select="
|
|
545
|
+
<xsl:for-each select="//iec:iec-standard/iec:bibdata/iec:ext/iec:ics">
|
|
511
546
|
<xsl:if test="position() = 1">ICS </xsl:if>
|
|
512
547
|
<xsl:value-of select="iec:code"/>
|
|
513
548
|
<xsl:if test="position() != last()"><xsl:text> </xsl:text></xsl:if>
|
|
@@ -515,9 +550,9 @@
|
|
|
515
550
|
<xsl:text> </xsl:text>
|
|
516
551
|
<fo:inline keep-together.within-line="always"><fo:leader leader-pattern="space"/>
|
|
517
552
|
<xsl:text> </xsl:text>
|
|
518
|
-
<xsl:if test="
|
|
553
|
+
<xsl:if test="//iec:iec-standard/iec:bibdata/iec:docidentifier[@type='ISBN']">
|
|
519
554
|
<!-- <xsl:text>Example: ISBN 978-2-8322-1532-6</xsl:text> -->
|
|
520
|
-
<xsl:value-of select="
|
|
555
|
+
<xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:docidentifier[@type='ISBN']"/>
|
|
521
556
|
</xsl:if>
|
|
522
557
|
</fo:inline>
|
|
523
558
|
</fo:block>
|
|
@@ -525,7 +560,7 @@
|
|
|
525
560
|
<fo:block-container margin-left="0mm">
|
|
526
561
|
<fo:block-container border="0.5pt solid black" font-size="10pt" margin-top="8mm" font-weight="bold" padding-left="1.5mm" padding-top="0.5mm" width="102%" height="11mm" display-align="center">
|
|
527
562
|
<fo:block>Warning! Make sure that you obtained this publication from an authorized distributor.</fo:block>
|
|
528
|
-
<xsl:if test="
|
|
563
|
+
<xsl:if test="//iec:iec-standard/iec:bibdata/iec:title[@language = 'fr']">
|
|
529
564
|
<fo:block margin-top="3pt">Attention! Veuillez vous assurer que vous avez obtenu cette publication via un distributeur agréé.</fo:block>
|
|
530
565
|
</xsl:if>
|
|
531
566
|
</fo:block-container>
|
|
@@ -533,7 +568,7 @@
|
|
|
533
568
|
</fo:block-container>
|
|
534
569
|
<fo:block font-size="6pt" margin-top="6mm" margin-left="1mm">
|
|
535
570
|
<fo:block>® Registered trademark of the International Electrotechnical Commission</fo:block>
|
|
536
|
-
<xsl:if test="
|
|
571
|
+
<xsl:if test="//iec:iec-standard/iec:bibdata/iec:title[@language = 'fr']">
|
|
537
572
|
<fo:block margin-left="2mm">Marque déposée de la Commission Electrotechnique Internationale</fo:block>
|
|
538
573
|
</xsl:if>
|
|
539
574
|
</fo:block>
|
|
@@ -552,7 +587,9 @@
|
|
|
552
587
|
<fo:inline font-weight="bold">
|
|
553
588
|
<xsl:call-template name="addLetterSpacing">
|
|
554
589
|
<xsl:with-param name="text">
|
|
555
|
-
<xsl:
|
|
590
|
+
<xsl:for-each select="(//iec:iec-standard)[1]/iec:bibdata/iec:copyright">
|
|
591
|
+
<xsl:text>Copyright © </xsl:text><xsl:value-of select="iec:from"/><xsl:text> </xsl:text><xsl:value-of select="iec:owner/iec:organization/iec:name"/><xsl:text>, </xsl:text><xsl:value-of select="iec:owner/iec:organization/iec:abbreviation"/>
|
|
592
|
+
</xsl:for-each>
|
|
556
593
|
</xsl:with-param>
|
|
557
594
|
</xsl:call-template>
|
|
558
595
|
</fo:inline>
|
|
@@ -609,7 +646,7 @@
|
|
|
609
646
|
</fo:block>
|
|
610
647
|
<fo:block font-size="9pt" font-weight="bold">
|
|
611
648
|
<xsl:call-template name="addLetterSpacing">
|
|
612
|
-
<xsl:with-param name="text"><xsl:value-of select="
|
|
649
|
+
<xsl:with-param name="text"><xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:ext/iec:structuredidentifier/iec:project-number"/></xsl:with-param>
|
|
613
650
|
</xsl:call-template>
|
|
614
651
|
</fo:block>
|
|
615
652
|
</fo:table-cell>
|
|
@@ -623,7 +660,7 @@
|
|
|
623
660
|
</fo:block>
|
|
624
661
|
<fo:block font-size="9pt" font-weight="bold">
|
|
625
662
|
<xsl:call-template name="addLetterSpacing">
|
|
626
|
-
<xsl:with-param name="text"><xsl:value-of select="
|
|
663
|
+
<xsl:with-param name="text"><xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:date[@type ='circulated']/iec:on"/></xsl:with-param>
|
|
627
664
|
</xsl:call-template>
|
|
628
665
|
</fo:block>
|
|
629
666
|
</fo:table-cell>
|
|
@@ -649,7 +686,7 @@
|
|
|
649
686
|
</fo:block>
|
|
650
687
|
<fo:block font-size="9pt" font-weight="bold">
|
|
651
688
|
<xsl:variable name="supersedes_documents">
|
|
652
|
-
<xsl:for-each select="
|
|
689
|
+
<xsl:for-each select="//iec:iec-standard/iec:bibdata/iec:relation[@type='supersedes']/iec:bibitem/iec:docnumber">
|
|
653
690
|
<xsl:value-of select="."/>
|
|
654
691
|
<xsl:if test="position() != last()">,</xsl:if>
|
|
655
692
|
</xsl:for-each>
|
|
@@ -675,19 +712,19 @@
|
|
|
675
712
|
<fo:table-row height="4mm">
|
|
676
713
|
<fo:table-cell number-columns-spanned="2" border="1.5pt solid {$border-color}" padding="1.5mm" padding-bottom="0mm">
|
|
677
714
|
<fo:block>
|
|
678
|
-
<xsl:if test="
|
|
715
|
+
<xsl:if test="//iec:iec-standard/iec:bibdata/iec:ext/iec:editorialgroup/iec:subcommittee">
|
|
679
716
|
<fo:block font-size="6.5pt">
|
|
680
|
-
<fo:inline font-size="8pt">IEC SC <xsl:value-of select="
|
|
717
|
+
<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>
|
|
681
718
|
<xsl:call-template name="addLetterSpacingSmallCaps">
|
|
682
|
-
<xsl:with-param name="text" select="
|
|
719
|
+
<xsl:with-param name="text" select="//iec:iec-standard/iec:bibdata/iec:ext/iec:editorialgroup/iec:subcommittee"/>
|
|
683
720
|
</xsl:call-template>
|
|
684
721
|
</fo:block>
|
|
685
722
|
</xsl:if>
|
|
686
|
-
<xsl:if test="
|
|
723
|
+
<xsl:if test="//iec:iec-standard/iec:bibdata/iec:ext/iec:editorialgroup/iec:technical-committee">
|
|
687
724
|
<fo:block font-size="6.5pt">
|
|
688
|
-
<fo:inline font-size="8pt">IEC TC <xsl:value-of select="
|
|
725
|
+
<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>
|
|
689
726
|
<xsl:call-template name="addLetterSpacingSmallCaps">
|
|
690
|
-
<xsl:with-param name="text" select="
|
|
727
|
+
<xsl:with-param name="text" select="//iec:iec-standard/iec:bibdata/iec:ext/iec:editorialgroup/iec:technical-committee"/>
|
|
691
728
|
</xsl:call-template>
|
|
692
729
|
</fo:block>
|
|
693
730
|
</xsl:if>
|
|
@@ -703,7 +740,7 @@
|
|
|
703
740
|
</fo:block>
|
|
704
741
|
<fo:block font-size="9pt">
|
|
705
742
|
<xsl:call-template name="addLetterSpacing">
|
|
706
|
-
<xsl:with-param name="text" select="
|
|
743
|
+
<xsl:with-param name="text" select="//iec:iec-standard/iec:bibdata/iec:ext/iec:editorialgroup/iec:secretariat"/>
|
|
707
744
|
</xsl:call-template>
|
|
708
745
|
</fo:block>
|
|
709
746
|
</fo:table-cell>
|
|
@@ -776,7 +813,7 @@
|
|
|
776
813
|
<!-- function: { emc | safety | environment | quality-assurance } -->
|
|
777
814
|
<fo:block font-size="6.5pt">
|
|
778
815
|
<xsl:choose>
|
|
779
|
-
<xsl:when test="
|
|
816
|
+
<xsl:when test="//iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'emc'">
|
|
780
817
|
<xsl:call-template name="insertCheckBoxOn"/>
|
|
781
818
|
</xsl:when>
|
|
782
819
|
<xsl:otherwise>
|
|
@@ -788,7 +825,7 @@
|
|
|
788
825
|
</xsl:call-template>
|
|
789
826
|
<fo:inline padding-right="33mm"> </fo:inline>
|
|
790
827
|
<xsl:choose>
|
|
791
|
-
<xsl:when test="
|
|
828
|
+
<xsl:when test="//iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'environment'">
|
|
792
829
|
<xsl:call-template name="insertCheckBoxOn"/>
|
|
793
830
|
</xsl:when>
|
|
794
831
|
<xsl:otherwise>
|
|
@@ -804,7 +841,7 @@
|
|
|
804
841
|
<fo:block font-size="6.5pt" margin-bottom="6pt"> </fo:block>
|
|
805
842
|
<fo:block font-size="6.5pt">
|
|
806
843
|
<xsl:choose>
|
|
807
|
-
<xsl:when test="
|
|
844
|
+
<xsl:when test="//iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'quality-assurance'">
|
|
808
845
|
<xsl:call-template name="insertCheckBoxOn"/>
|
|
809
846
|
</xsl:when>
|
|
810
847
|
<xsl:otherwise>
|
|
@@ -816,7 +853,7 @@
|
|
|
816
853
|
</xsl:call-template>
|
|
817
854
|
<fo:inline padding-right="13mm"> </fo:inline>
|
|
818
855
|
<xsl:choose>
|
|
819
|
-
<xsl:when test="
|
|
856
|
+
<xsl:when test="//iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'safety'">
|
|
820
857
|
<xsl:call-template name="insertCheckBoxOn"/>
|
|
821
858
|
</xsl:when>
|
|
822
859
|
<xsl:otherwise>
|
|
@@ -836,7 +873,14 @@
|
|
|
836
873
|
<fo:table-row>
|
|
837
874
|
<fo:table-cell border="1.5pt solid {$border-color}" padding="1.5mm" padding-bottom="0mm">
|
|
838
875
|
<fo:block font-size="6.5pt" margin-bottom="12pt">
|
|
839
|
-
<xsl:
|
|
876
|
+
<xsl:choose>
|
|
877
|
+
<xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:cen-processing = 'true'">
|
|
878
|
+
<xsl:call-template name="insertCheckBoxOn"/>
|
|
879
|
+
</xsl:when>
|
|
880
|
+
<xsl:otherwise>
|
|
881
|
+
<xsl:call-template name="insertCheckBoxOff"/>
|
|
882
|
+
</xsl:otherwise>
|
|
883
|
+
</xsl:choose>
|
|
840
884
|
<xsl:call-template name="addLetterSpacingSmallCaps">
|
|
841
885
|
<xsl:with-param name="text" select="'Submitted for CENELEC parallel voting'"/>
|
|
842
886
|
</xsl:call-template>
|
|
@@ -867,7 +911,14 @@
|
|
|
867
911
|
</fo:table-cell>
|
|
868
912
|
<fo:table-cell border="1.5pt solid {$border-color}" padding="1.5mm" padding-bottom="0mm">
|
|
869
913
|
<fo:block font-size="6.5pt" margin-bottom="6pt">
|
|
870
|
-
<xsl:
|
|
914
|
+
<xsl:choose>
|
|
915
|
+
<xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:cen-processing = 'true'">
|
|
916
|
+
<xsl:call-template name="insertCheckBoxOff"/>
|
|
917
|
+
</xsl:when>
|
|
918
|
+
<xsl:otherwise>
|
|
919
|
+
<xsl:call-template name="insertCheckBoxOn"/>
|
|
920
|
+
</xsl:otherwise>
|
|
921
|
+
</xsl:choose>
|
|
871
922
|
<xsl:call-template name="addLetterSpacingSmallCaps">
|
|
872
923
|
<xsl:with-param name="text" select="'Not submitted for CENELEC parallel voting'"/>
|
|
873
924
|
</xsl:call-template>
|
|
@@ -920,7 +971,7 @@
|
|
|
920
971
|
</fo:block>
|
|
921
972
|
<fo:block font-size="9pt" font-weight="bold">
|
|
922
973
|
<xsl:call-template name="addLetterSpacing">
|
|
923
|
-
<xsl:with-param name="text"><xsl:value-of select="
|
|
974
|
+
<xsl:with-param name="text"><xsl:value-of select="(//iec:iec-standard)[1]/iec:bibdata/iec:title[@language = $lang and @type = 'main']"/></xsl:with-param>
|
|
924
975
|
</xsl:call-template>
|
|
925
976
|
</fo:block>
|
|
926
977
|
</fo:block-container>
|
|
@@ -972,8 +1023,56 @@
|
|
|
972
1023
|
</fo:page-sequence>
|
|
973
1024
|
</xsl:if>
|
|
974
1025
|
|
|
1026
|
+
<xsl:if test="$debug = 'true'">
|
|
1027
|
+
<xsl:text disable-output-escaping="yes"><!--</xsl:text>
|
|
1028
|
+
DEBUG
|
|
1029
|
+
contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
|
|
1030
|
+
<xsl:text disable-output-escaping="yes">--></xsl:text>
|
|
1031
|
+
</xsl:if>
|
|
1032
|
+
|
|
1033
|
+
<xsl:for-each select="//iec:iec-standard">
|
|
1034
|
+
<xsl:variable name="lang" select="*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
|
|
1035
|
+
<xsl:variable name="current_document">
|
|
1036
|
+
<xsl:copy-of select="."/>
|
|
1037
|
+
</xsl:variable>
|
|
1038
|
+
<xsl:for-each select="xalan:nodeset($current_document)">
|
|
1039
|
+
|
|
1040
|
+
<xsl:variable name="docid">
|
|
1041
|
+
<xsl:call-template name="getDocumentId"/>
|
|
1042
|
+
</xsl:variable>
|
|
1043
|
+
|
|
1044
|
+
|
|
1045
|
+
<fo:page-sequence master-reference="document" format="1" force-page-count="no-force"> <!-- initial-page-number="2" -->
|
|
1046
|
+
<xsl:variable name="num"><xsl:number count="iec:iec-standard" level="any"/></xsl:variable>
|
|
1047
|
+
<xsl:if test="$num = '1'">
|
|
1048
|
+
<xsl:attribute name="initial-page-number">2</xsl:attribute>
|
|
1049
|
+
</xsl:if>
|
|
1050
|
+
|
|
1051
|
+
<xsl:call-template name="insertHeaderFooter"/>
|
|
1052
|
+
<fo:flow flow-name="xsl-region-body">
|
|
1053
|
+
|
|
1054
|
+
<xsl:call-template name="insertTOCpages">
|
|
1055
|
+
<xsl:with-param name="contents" select="xalan:nodeset($contents)/doc[@id = $docid]"/>
|
|
1056
|
+
</xsl:call-template>
|
|
1057
|
+
|
|
1058
|
+
<xsl:call-template name="insertPrefacepages">
|
|
1059
|
+
<xsl:with-param name="lang" select="$lang"/>
|
|
1060
|
+
</xsl:call-template>
|
|
1061
|
+
|
|
1062
|
+
|
|
1063
|
+
</fo:flow>
|
|
1064
|
+
</fo:page-sequence>
|
|
1065
|
+
|
|
1066
|
+
<xsl:call-template name="insertBodypages">
|
|
1067
|
+
<xsl:with-param name="lang" select="$lang"/>
|
|
1068
|
+
</xsl:call-template>
|
|
1069
|
+
|
|
1070
|
+
</xsl:for-each>
|
|
1071
|
+
</xsl:for-each>
|
|
1072
|
+
|
|
975
1073
|
|
|
976
|
-
|
|
1074
|
+
|
|
1075
|
+
<!-- <fo:page-sequence master-reference="document" format="1" initial-page-number="2" force-page-count="no-force">
|
|
977
1076
|
<xsl:call-template name="insertHeaderFooter"/>
|
|
978
1077
|
<fo:flow flow-name="xsl-region-body">
|
|
979
1078
|
|
|
@@ -981,13 +1080,7 @@
|
|
|
981
1080
|
<xsl:call-template name="getDocumentId"/>
|
|
982
1081
|
</xsl:variable>
|
|
983
1082
|
|
|
984
|
-
|
|
985
|
-
<xsl:text disable-output-escaping="yes"><!--</xsl:text>
|
|
986
|
-
DEBUG
|
|
987
|
-
contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
|
|
988
|
-
<xsl:text disable-output-escaping="yes">--></xsl:text>
|
|
989
|
-
</xsl:if>
|
|
990
|
-
|
|
1083
|
+
|
|
991
1084
|
<xsl:call-template name="insertTOCpages">
|
|
992
1085
|
<xsl:with-param name="contents" select="xalan:nodeset($contents)/doc[@id = $docid]"/>
|
|
993
1086
|
</xsl:call-template>
|
|
@@ -999,11 +1092,11 @@
|
|
|
999
1092
|
|
|
1000
1093
|
|
|
1001
1094
|
<xsl:call-template name="insertBodypages"/>
|
|
1002
|
-
|
|
1095
|
+
-->
|
|
1003
1096
|
|
|
1004
1097
|
|
|
1005
1098
|
<!-- Test=<xsl:copy-of select="$additionalDocs"/> Test -->
|
|
1006
|
-
<xsl:for-each select="xalan:nodeset($additionalXMLsArray)/*">
|
|
1099
|
+
<!-- <xsl:for-each select="xalan:nodeset($additionalXMLsArray)/*">
|
|
1007
1100
|
|
|
1008
1101
|
<xsl:for-each select="document(.)">
|
|
1009
1102
|
<xsl:variable name="lang">
|
|
@@ -1044,7 +1137,7 @@
|
|
|
1044
1137
|
|
|
1045
1138
|
</xsl:for-each>
|
|
1046
1139
|
</xsl:for-each>
|
|
1047
|
-
</xsl:for-each>
|
|
1140
|
+
</xsl:for-each> -->
|
|
1048
1141
|
|
|
1049
1142
|
|
|
1050
1143
|
|
|
@@ -1063,6 +1156,7 @@
|
|
|
1063
1156
|
<fo:block font-size="11pt" color="{$color_blue}" margin-bottom="12pt" line-height="150%">
|
|
1064
1157
|
<fo:block-container width="42mm">
|
|
1065
1158
|
<fo:block>
|
|
1159
|
+
<xsl:variable name="publisher" select="java:toUpperCase(java:java.lang.String.new(//iec:iec-standard/iec:bibdata/iec:contributor[iec:role/@type = 'publisher']/iec:organization/iec:name))"/>
|
|
1066
1160
|
<xsl:value-of select="$publisher"/>
|
|
1067
1161
|
</fo:block>
|
|
1068
1162
|
</fo:block-container>
|
|
@@ -1078,14 +1172,14 @@
|
|
|
1078
1172
|
Fax: + 41 22 919 03 00
|
|
1079
1173
|
info@iec.ch
|
|
1080
1174
|
www.iec.ch -->
|
|
1081
|
-
<xsl:variable name="telpos" select="count(
|
|
1175
|
+
<xsl:variable name="telpos" select="count((//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-address')]/text()[contains(., 'Tel.')]/preceding-sibling::node())"/>
|
|
1082
1176
|
<xsl:choose>
|
|
1083
1177
|
<xsl:when test="$telpos != 0">
|
|
1084
|
-
<xsl:apply-templates select="
|
|
1085
|
-
<xsl:apply-templates select="
|
|
1178
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-address')]/node()[position() <= $telpos]" mode="coverpage"/>
|
|
1179
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-address')]/node()[position() >= $telpos]" mode="coverpage"/>
|
|
1086
1180
|
</xsl:when>
|
|
1087
1181
|
<xsl:otherwise>
|
|
1088
|
-
<xsl:apply-templates select="
|
|
1182
|
+
<xsl:apply-templates select="(//iec:iec-standard)[1]/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[contains(@id, 'boilerplate-address')]" mode="coverpage"/>
|
|
1089
1183
|
</xsl:otherwise>
|
|
1090
1184
|
</xsl:choose>
|
|
1091
1185
|
</fo:block>
|
|
@@ -1098,10 +1192,20 @@
|
|
|
1098
1192
|
</xsl:template>
|
|
1099
1193
|
|
|
1100
1194
|
<xsl:template name="insertCoverPart1">
|
|
1195
|
+
<xsl:variable name="lang_second">
|
|
1196
|
+
<xsl:choose>
|
|
1197
|
+
<xsl:when test="(//iec:iec-standard)[2]/iec:bibdata/iec:language[@current = 'true']">
|
|
1198
|
+
<xsl:value-of select="(//iec:iec-standard)[2]/iec:bibdata/iec:language[@current = 'true']"/>
|
|
1199
|
+
</xsl:when>
|
|
1200
|
+
<xsl:otherwise>
|
|
1201
|
+
<xsl:value-of select="/iec:iec-standard/iec:bibdata/iec:title[@language and @language != $lang]/@language"/>
|
|
1202
|
+
</xsl:otherwise>
|
|
1203
|
+
</xsl:choose>
|
|
1204
|
+
</xsl:variable>
|
|
1101
1205
|
<fo:block text-align-last="justify">
|
|
1102
1206
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo-IEC))}" width="18mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo IEC"/>
|
|
1103
1207
|
<fo:inline font-size="8pt" padding-left="0.5mm" color="rgb(88, 88, 90)">®</fo:inline>
|
|
1104
|
-
<fo:inline keep-together.within-line="always" font-size="25pt" font-weight="bold" color="{$color_gray}" border-bottom="0.5pt solid {$color_gray}" padding-bottom="3.5mm" baseline-shift="5.5mm"><fo:leader leader-pattern="space"/><xsl:value-of select="
|
|
1208
|
+
<fo:inline keep-together.within-line="always" font-size="25pt" font-weight="bold" color="{$color_gray}" border-bottom="0.5pt solid {$color_gray}" padding-bottom="3.5mm" baseline-shift="5.5mm"><fo:leader leader-pattern="space"/><xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:docidentifier[@type = 'iso' or @type = 'ISO']"/></fo:inline>
|
|
1105
1209
|
</fo:block>
|
|
1106
1210
|
<fo:block font-size="10.5pt" text-align="right" margin-top="0.5mm">
|
|
1107
1211
|
<xsl:variable name="title-edition">
|
|
@@ -1111,12 +1215,13 @@
|
|
|
1111
1215
|
</xsl:variable>
|
|
1112
1216
|
<xsl:value-of select="$title-edition"/>
|
|
1113
1217
|
<fo:inline>
|
|
1114
|
-
<xsl:
|
|
1115
|
-
<xsl:
|
|
1218
|
+
<xsl:variable name="edition" select="//iec:iec-standard/iec:bibdata/iec:edition"/>
|
|
1219
|
+
<xsl:value-of select="$edition"/>
|
|
1220
|
+
<xsl:if test="not(contains($edition, '.'))">.0</xsl:if>
|
|
1116
1221
|
</fo:inline>
|
|
1117
1222
|
<fo:inline padding-left="4mm">
|
|
1118
1223
|
<!-- Example 2014-05 -->
|
|
1119
|
-
<xsl:value-of select="substring(
|
|
1224
|
+
<xsl:value-of select="substring(//iec:iec-standard/iec:bibdata/iec:version/iec:revision-date, 1, 7)"/>
|
|
1120
1225
|
</fo:inline>
|
|
1121
1226
|
<fo:block> </fo:block>
|
|
1122
1227
|
</fo:block>
|
|
@@ -1132,6 +1237,7 @@
|
|
|
1132
1237
|
<xsl:text>PRE-RELEASE VERSION (FDIS)</xsl:text>
|
|
1133
1238
|
</xsl:when>
|
|
1134
1239
|
<xsl:when test="$stage >= 60">
|
|
1240
|
+
<xsl:variable name="doctype_uppercased" select="java:toUpperCase(java:java.lang.String.new((//iec:iec-standard)[1]/iec:bibdata/iec:ext/iec:doctype[@language = $lang]))"/>
|
|
1135
1241
|
<xsl:value-of select="$doctype_uppercased"/>
|
|
1136
1242
|
</xsl:when>
|
|
1137
1243
|
<xsl:otherwise>
|
|
@@ -1139,10 +1245,10 @@
|
|
|
1139
1245
|
<xsl:text> (</xsl:text><xsl:value-of select="$stage-abbreviation"/><xsl:text>)</xsl:text>
|
|
1140
1246
|
</xsl:otherwise>
|
|
1141
1247
|
</xsl:choose>
|
|
1142
|
-
|
|
1143
1248
|
</fo:block>
|
|
1144
1249
|
</fo:block-container>
|
|
1145
|
-
|
|
1250
|
+
|
|
1251
|
+
<xsl:if test="//iec:iec-standard/iec:bibdata/iec:title[@language = $lang_second]">
|
|
1146
1252
|
<fo:block-container height="26mm" margin-top="10pt" display-align="after">
|
|
1147
1253
|
<xsl:if test="$stage >= 60">
|
|
1148
1254
|
<xsl:attribute name="width">100mm</xsl:attribute>
|
|
@@ -1150,7 +1256,7 @@
|
|
|
1150
1256
|
<fo:block color="{$color_gray}">
|
|
1151
1257
|
<xsl:if test="$stage >= 60">
|
|
1152
1258
|
<!-- <xsl:text>NORME INTERNATIONALE</xsl:text> -->
|
|
1153
|
-
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(
|
|
1259
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(//iec:iec-standard/iec:bibdata/iec:ext/iec:doctype[@language = $lang_second]))"/>
|
|
1154
1260
|
</xsl:if>
|
|
1155
1261
|
</fo:block>
|
|
1156
1262
|
</fo:block-container>
|
|
@@ -1161,7 +1267,7 @@
|
|
|
1161
1267
|
<fo:block-container margin-left="0mm">
|
|
1162
1268
|
<fo:block-container height="6mm">
|
|
1163
1269
|
<fo:block text-align="right" margin-top="-4.5mm" margin-right="-1mm">
|
|
1164
|
-
<xsl:if test="
|
|
1270
|
+
<xsl:if test="//iec:iec-standard/iec:bibdata/iec:ext/iec:accessibility-color-inside = 'true'">
|
|
1165
1271
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Colour-Inside))}" width="19mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo IEC"/>
|
|
1166
1272
|
</xsl:if>
|
|
1167
1273
|
</fo:block>
|
|
@@ -1169,11 +1275,11 @@
|
|
|
1169
1275
|
<fo:block-container border-bottom="0.5pt solid {$color_gray}" margin-top="4mm" margin-bottom="16pt" height="14mm" display-align="center">
|
|
1170
1276
|
<fo:block font-size="10pt" color="{$color_blue}" margin-bottom="4pt">
|
|
1171
1277
|
<xsl:choose>
|
|
1172
|
-
<xsl:when test="
|
|
1173
|
-
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(
|
|
1278
|
+
<xsl:when test="//iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal = 'true'">
|
|
1279
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(//iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal[@language = $lang]))"/>
|
|
1174
1280
|
</xsl:when>
|
|
1175
1281
|
<xsl:otherwise><!-- horizontal is false -->
|
|
1176
|
-
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(
|
|
1282
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(//iec:iec-standard/iec:bibdata/iec:ext/iec:function[@language = $lang]))"/>
|
|
1177
1283
|
</xsl:otherwise>
|
|
1178
1284
|
</xsl:choose>
|
|
1179
1285
|
<!-- Example: BASIC EMC PUBLICATION -->
|
|
@@ -1183,14 +1289,14 @@
|
|
|
1183
1289
|
Basic Environment Publication
|
|
1184
1290
|
Basic Quality Assurance Publication -->
|
|
1185
1291
|
</fo:block>
|
|
1186
|
-
<xsl:if test="
|
|
1292
|
+
<xsl:if test="//iec:iec-standard/iec:bibdata/iec:title[@language = $lang_second]">
|
|
1187
1293
|
<fo:block font-size="10pt" margin-bottom="10pt">
|
|
1188
1294
|
<xsl:choose>
|
|
1189
|
-
<xsl:when test="
|
|
1190
|
-
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(
|
|
1295
|
+
<xsl:when test="//iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal = 'true'">
|
|
1296
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(//iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal[@language = $lang_second]))"/>
|
|
1191
1297
|
</xsl:when>
|
|
1192
1298
|
<xsl:otherwise><!-- horizontal is false -->
|
|
1193
|
-
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(
|
|
1299
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(//iec:iec-standard/iec:bibdata/iec:ext/iec:function[@language = $lang_second]))"/>
|
|
1194
1300
|
</xsl:otherwise>
|
|
1195
1301
|
</xsl:choose>
|
|
1196
1302
|
<!-- Example: PUBLICATION FONDAMENTALE EN CEM -->
|
|
@@ -1207,42 +1313,62 @@
|
|
|
1207
1313
|
Electromagnetic compatibility (EMC) –
|
|
1208
1314
|
Part 4-5: Testing and measurement techniques – Surge immunity test
|
|
1209
1315
|
-->
|
|
1316
|
+
<xsl:variable name="title-intro" select="//iec:iec-standard/iec:bibdata/iec:title[@language = $lang and @type = 'title-intro']"/>
|
|
1210
1317
|
<xsl:value-of select="$title-intro"/>
|
|
1318
|
+
<xsl:variable name="title-main" select="//iec:iec-standard/iec:bibdata/iec:title[@language = $lang and @type = 'title-main']"/>
|
|
1211
1319
|
<xsl:if test="$title-main != ''">
|
|
1212
1320
|
<xsl:text> — </xsl:text>
|
|
1213
1321
|
<xsl:value-of select="$title-main"/>
|
|
1214
1322
|
</xsl:if>
|
|
1215
|
-
<xsl:variable name="part
|
|
1216
|
-
<xsl:if test="$part
|
|
1323
|
+
<xsl:variable name="title-part" select="//iec:iec-standard/iec:bibdata/iec:title[@language = $lang and @type = 'title-part']"/>
|
|
1324
|
+
<xsl:if test="$title-part != ''">
|
|
1217
1325
|
<xsl:text> — </xsl:text>
|
|
1218
1326
|
<xsl:value-of select="$linebreak"/>
|
|
1219
1327
|
<xsl:if test="$part != ''">
|
|
1220
|
-
<xsl:
|
|
1328
|
+
<xsl:variable name="localized_part" select="(//iec:iec-standard)[1]/iec:localized-strings/iec:localized-string[@key='locality.part' and @language=$lang]"/>
|
|
1329
|
+
<!-- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($localized_part),'#',$part)"/> -->
|
|
1330
|
+
<xsl:value-of select="concat($localized_part ,' ',$part, ': ')"/>
|
|
1221
1331
|
<!-- <xsl:text>Part </xsl:text><xsl:value-of select="$part"/>
|
|
1222
1332
|
<xsl:text>: </xsl:text> -->
|
|
1223
1333
|
</xsl:if>
|
|
1224
|
-
<xsl:value-of select="$part
|
|
1334
|
+
<xsl:value-of select="$title-part"/>
|
|
1225
1335
|
</xsl:if>
|
|
1226
1336
|
</fo:block>
|
|
1227
1337
|
<fo:block font-size="12pt" font-weight="bold">
|
|
1228
1338
|
<!-- Example: Compatibilité électromagnétique (CEM) –
|
|
1229
1339
|
Partie 4-5: Techniques d'essai et de mesure – Essai d'immunité aux ondes de
|
|
1230
1340
|
choc -->
|
|
1231
|
-
<xsl:
|
|
1232
|
-
<xsl:
|
|
1341
|
+
<xsl:variable name="title-intro-second" select="//iec:iec-standard/iec:bibdata/iec:title[@language = $lang_second and @type = 'title-intro']"/>
|
|
1342
|
+
<xsl:value-of select="$title-intro-second"/>
|
|
1343
|
+
<xsl:variable name="title-main-second" select="//iec:iec-standard/iec:bibdata/iec:title[@language = $lang_second and @type = 'title-main']"/>
|
|
1344
|
+
<xsl:if test="$title-main-second != ''">
|
|
1233
1345
|
<xsl:text> — </xsl:text>
|
|
1234
|
-
<xsl:value-of select="$title-main-
|
|
1346
|
+
<xsl:value-of select="$title-main-second"/>
|
|
1235
1347
|
</xsl:if>
|
|
1236
|
-
<xsl:variable name="part-
|
|
1237
|
-
<xsl:if test="$part-
|
|
1348
|
+
<xsl:variable name="part-second" select="//iec:iec-standard/iec:bibdata/iec:title[@language = $lang_second and @type = 'title-part']"/>
|
|
1349
|
+
<xsl:if test="$part-second != ''">
|
|
1238
1350
|
<xsl:text> — </xsl:text>
|
|
1239
1351
|
<xsl:value-of select="$linebreak"/>
|
|
1240
1352
|
<xsl:if test="$part != ''">
|
|
1241
|
-
|
|
1353
|
+
|
|
1354
|
+
<xsl:choose>
|
|
1355
|
+
<xsl:when test="(//iec:iec-standard)[2]/iec:localized-strings/iec:localized-string[@key='locality.part' and @language=$lang_second]">
|
|
1356
|
+
<xsl:variable name="localized_part">
|
|
1357
|
+
<xsl:value-of select="(//iec:iec-standard)[2]/iec:localized-strings/iec:localized-string[@key='locality.part' and @language=$lang_second]"/>
|
|
1358
|
+
</xsl:variable>
|
|
1359
|
+
<xsl:value-of select="concat($localized_part ,' ',$part, ': ')"/>
|
|
1360
|
+
</xsl:when>
|
|
1361
|
+
<xsl:otherwise>
|
|
1362
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang = $lang_second]),'#',$part)"/>
|
|
1363
|
+
</xsl:otherwise>
|
|
1364
|
+
</xsl:choose>
|
|
1365
|
+
|
|
1366
|
+
<!-- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($localized_part),'#',$part)"/> -->
|
|
1367
|
+
|
|
1242
1368
|
<!-- <xsl:text>Part </xsl:text><xsl:value-of select="$part"/>
|
|
1243
1369
|
<xsl:text>: </xsl:text> -->
|
|
1244
1370
|
</xsl:if>
|
|
1245
|
-
<xsl:value-of select="$part-
|
|
1371
|
+
<xsl:value-of select="$part-second"/>
|
|
1246
1372
|
</xsl:if>
|
|
1247
1373
|
</fo:block>
|
|
1248
1374
|
</fo:block-container>
|
|
@@ -1364,7 +1490,8 @@
|
|
|
1364
1490
|
<xsl:param name="lang" select="$lang"/>
|
|
1365
1491
|
<fo:block break-after="page"/>
|
|
1366
1492
|
<fo:block-container font-size="12pt" text-align="center" margin-bottom="18pt">
|
|
1367
|
-
<fo:block><xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:contributor/iec:organization/iec:name))"/></fo:block>
|
|
1493
|
+
<!-- <fo:block><xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:contributor/iec:organization/iec:name))"/></fo:block> -->
|
|
1494
|
+
<fo:block><xsl:value-of select="/iec:iec-standard/iec:localized-strings/iec:localized-string[@key='IEC' and @language=$lang]"/></fo:block>
|
|
1368
1495
|
<fo:block>___________</fo:block>
|
|
1369
1496
|
<fo:block> </fo:block>
|
|
1370
1497
|
<fo:block font-weight="bold">
|
|
@@ -1379,7 +1506,9 @@
|
|
|
1379
1506
|
<fo:block>
|
|
1380
1507
|
<xsl:if test="$part != ''">
|
|
1381
1508
|
<!-- Example: Part 1: Riz -->
|
|
1382
|
-
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang = $lang]),'#',$part)"/>
|
|
1509
|
+
<!-- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang = $lang]),'#',$part)"/> -->
|
|
1510
|
+
<xsl:variable name="localized_part" select="//iec:iec-standard/iec:localized-strings/iec:localized-string[@key='locality.part' and @language = $lang]"/>
|
|
1511
|
+
<xsl:value-of select="concat($localized_part ,' ',$part, ': ')"/>
|
|
1383
1512
|
</xsl:if>
|
|
1384
1513
|
<xsl:value-of select="$title-part"/>
|
|
1385
1514
|
</fo:block>
|
|
@@ -1419,7 +1548,9 @@
|
|
|
1419
1548
|
<fo:block>
|
|
1420
1549
|
<xsl:if test="$part != ''">
|
|
1421
1550
|
<!-- Example: Part 1: Rice -->
|
|
1422
|
-
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang = $lang]),'#',$part)"/>
|
|
1551
|
+
<!-- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang = $lang]),'#',$part)"/> -->
|
|
1552
|
+
<xsl:variable name="localized_part" select="//iec:iec-standard/iec:localized-strings/iec:localized-string[@key='locality.part' and @language = $lang]"/>
|
|
1553
|
+
<xsl:value-of select="concat($localized_part ,' ',$part, ': ')"/>
|
|
1423
1554
|
</xsl:if>
|
|
1424
1555
|
<xsl:value-of select="$title-part"/>
|
|
1425
1556
|
</fo:block>
|
|
@@ -1825,9 +1956,9 @@
|
|
|
1825
1956
|
<fo:inline id="{$lang}_footnote_{@reference}" keep-with-next.within-line="always" baseline-shift="15%" padding-right="3mm"> <!-- padding-right="3mm" font-size="60%" alignment-baseline="hanging" -->
|
|
1826
1957
|
<xsl:value-of select="$number + count(//iec:bibitem/iec:note)"/><!-- <xsl:text>)</xsl:text> -->
|
|
1827
1958
|
</fo:inline>
|
|
1828
|
-
<xsl:for-each select="iec:p">
|
|
1829
|
-
|
|
1830
|
-
</xsl:for-each>
|
|
1959
|
+
<!-- <xsl:for-each select="iec:p"> -->
|
|
1960
|
+
<xsl:apply-templates/>
|
|
1961
|
+
<!-- </xsl:for-each> -->
|
|
1831
1962
|
</fo:block>
|
|
1832
1963
|
</fo:footnote-body>
|
|
1833
1964
|
</fo:footnote>
|
|
@@ -2612,6 +2743,7 @@
|
|
|
2612
2743
|
|
|
2613
2744
|
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
|
2614
2745
|
|
|
2746
|
+
|
|
2615
2747
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
|
2616
2748
|
|
|
2617
2749
|
|
|
@@ -3709,7 +3841,9 @@
|
|
|
3709
3841
|
</xsl:template><xsl:template match="*[local-name()='dl']">
|
|
3710
3842
|
<fo:block-container>
|
|
3711
3843
|
|
|
3712
|
-
<xsl:
|
|
3844
|
+
<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
|
|
3845
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
3846
|
+
</xsl:if>
|
|
3713
3847
|
|
|
3714
3848
|
|
|
3715
3849
|
<xsl:if test="parent::*[local-name() = 'note']">
|
|
@@ -3724,6 +3858,7 @@
|
|
|
3724
3858
|
<fo:block-container>
|
|
3725
3859
|
|
|
3726
3860
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
3861
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
3727
3862
|
|
|
3728
3863
|
|
|
3729
3864
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
@@ -3923,12 +4058,32 @@
|
|
|
3923
4058
|
</xsl:otherwise>
|
|
3924
4059
|
</xsl:choose>
|
|
3925
4060
|
</xsl:template><xsl:template name="getMaxLength_dt">
|
|
3926
|
-
<xsl:
|
|
3927
|
-
<xsl:
|
|
3928
|
-
|
|
3929
|
-
<xsl:
|
|
3930
|
-
|
|
3931
|
-
|
|
4061
|
+
<xsl:variable name="lengths">
|
|
4062
|
+
<xsl:for-each select="*[local-name()='dt']">
|
|
4063
|
+
<xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
|
|
4064
|
+
<xsl:variable name="attributes">
|
|
4065
|
+
<xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
|
|
4066
|
+
<xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
|
|
4067
|
+
</xsl:variable>
|
|
4068
|
+
<length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
|
|
4069
|
+
</xsl:for-each>
|
|
4070
|
+
</xsl:variable>
|
|
4071
|
+
<xsl:variable name="maxLength">
|
|
4072
|
+
<!-- <xsl:for-each select="*[local-name()='dt']">
|
|
4073
|
+
<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
|
|
4074
|
+
<xsl:if test="position() = 1">
|
|
4075
|
+
<xsl:value-of select="string-length(normalize-space(.))"/>
|
|
4076
|
+
</xsl:if>
|
|
4077
|
+
</xsl:for-each> -->
|
|
4078
|
+
<xsl:for-each select="xalan:nodeset($lengths)/length">
|
|
4079
|
+
<xsl:sort select="." data-type="number" order="descending"/>
|
|
4080
|
+
<xsl:if test="position() = 1">
|
|
4081
|
+
<xsl:value-of select="."/>
|
|
4082
|
+
</xsl:if>
|
|
4083
|
+
</xsl:for-each>
|
|
4084
|
+
</xsl:variable>
|
|
4085
|
+
<!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
|
|
4086
|
+
<xsl:value-of select="$maxLength"/>
|
|
3932
4087
|
</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
|
|
3933
4088
|
<xsl:param name="key_iso"/>
|
|
3934
4089
|
|
|
@@ -4735,6 +4890,8 @@
|
|
|
4735
4890
|
<xsl:variable name="bookmark-title_">
|
|
4736
4891
|
<xsl:call-template name="getLangVersion">
|
|
4737
4892
|
<xsl:with-param name="lang" select="@lang"/>
|
|
4893
|
+
<xsl:with-param name="doctype" select="@doctype"/>
|
|
4894
|
+
<xsl:with-param name="title" select="@title-part"/>
|
|
4738
4895
|
</xsl:call-template>
|
|
4739
4896
|
</xsl:variable>
|
|
4740
4897
|
<xsl:choose>
|
|
@@ -4752,13 +4909,34 @@
|
|
|
4752
4909
|
</xsl:choose>
|
|
4753
4910
|
</fo:bookmark-title>
|
|
4754
4911
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
|
4912
|
+
|
|
4913
|
+
<xsl:call-template name="insertFigureBookmarks">
|
|
4914
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4915
|
+
</xsl:call-template>
|
|
4916
|
+
|
|
4917
|
+
<xsl:call-template name="insertTableBookmarks">
|
|
4918
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4919
|
+
<xsl:with-param name="lang" select="@lang"/>
|
|
4920
|
+
</xsl:call-template>
|
|
4921
|
+
|
|
4755
4922
|
</fo:bookmark>
|
|
4756
4923
|
|
|
4757
4924
|
</xsl:for-each>
|
|
4758
4925
|
</xsl:when>
|
|
4759
4926
|
<xsl:otherwise>
|
|
4760
4927
|
<xsl:for-each select="xalan:nodeset($contents)/doc">
|
|
4928
|
+
|
|
4761
4929
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
|
4930
|
+
|
|
4931
|
+
<xsl:call-template name="insertFigureBookmarks">
|
|
4932
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4933
|
+
</xsl:call-template>
|
|
4934
|
+
|
|
4935
|
+
<xsl:call-template name="insertTableBookmarks">
|
|
4936
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4937
|
+
<xsl:with-param name="lang" select="@lang"/>
|
|
4938
|
+
</xsl:call-template>
|
|
4939
|
+
|
|
4762
4940
|
</xsl:for-each>
|
|
4763
4941
|
</xsl:otherwise>
|
|
4764
4942
|
</xsl:choose>
|
|
@@ -4770,42 +4948,51 @@
|
|
|
4770
4948
|
|
|
4771
4949
|
|
|
4772
4950
|
|
|
4773
|
-
<xsl:if test="//*[local-name() = 'figure'][@id and *[local-name() = 'name']]">
|
|
4774
|
-
<fo:bookmark internal-destination="{//*[local-name() = 'figure'][@id and *[local-name() = 'name']][1]/@id}" starting-state="hide">
|
|
4775
|
-
<fo:bookmark-title>Figures</fo:bookmark-title>
|
|
4776
|
-
<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name']]">
|
|
4777
|
-
<fo:bookmark internal-destination="{@id}">
|
|
4778
|
-
<fo:bookmark-title><xsl:apply-templates select="*[local-name() = 'name']/text()" mode="bookmarks"/></fo:bookmark-title>
|
|
4779
|
-
</fo:bookmark>
|
|
4780
|
-
</xsl:for-each>
|
|
4781
|
-
</fo:bookmark>
|
|
4782
|
-
</xsl:if>
|
|
4783
|
-
|
|
4784
4951
|
|
|
4785
|
-
|
|
4786
|
-
<xsl:if test="//*[local-name() = 'table'][@id and *[local-name() = 'name']]">
|
|
4787
|
-
<fo:bookmark internal-destination="{//*[local-name() = 'table'][@id and *[local-name() = 'name']][1]/@id}" starting-state="hide">
|
|
4788
|
-
<fo:bookmark-title>
|
|
4789
|
-
<xsl:choose>
|
|
4790
|
-
<xsl:when test="@lang = 'fr'">Tableaux</xsl:when>
|
|
4791
|
-
<xsl:otherwise>Tables</xsl:otherwise>
|
|
4792
|
-
</xsl:choose>
|
|
4793
|
-
</fo:bookmark-title>
|
|
4794
|
-
<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name']]">
|
|
4795
|
-
<fo:bookmark internal-destination="{@id}">
|
|
4796
|
-
<fo:bookmark-title><xsl:apply-templates select="*[local-name() = 'name']//text()" mode="bookmarks"/></fo:bookmark-title>
|
|
4797
|
-
</fo:bookmark>
|
|
4798
|
-
</xsl:for-each>
|
|
4799
|
-
</fo:bookmark>
|
|
4800
|
-
</xsl:if>
|
|
4801
4952
|
|
|
4802
4953
|
|
|
4803
4954
|
|
|
4804
4955
|
|
|
4805
4956
|
</fo:bookmark-tree>
|
|
4806
4957
|
</xsl:if>
|
|
4958
|
+
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
4959
|
+
<xsl:param name="contents"/>
|
|
4960
|
+
<xsl:if test="xalan:nodeset($contents)/figure">
|
|
4961
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
|
|
4962
|
+
<fo:bookmark-title>Figures</fo:bookmark-title>
|
|
4963
|
+
<xsl:for-each select="xalan:nodeset($contents)/figure">
|
|
4964
|
+
<fo:bookmark internal-destination="{@id}">
|
|
4965
|
+
<fo:bookmark-title>
|
|
4966
|
+
<xsl:value-of select="normalize-space(title)"/>
|
|
4967
|
+
</fo:bookmark-title>
|
|
4968
|
+
</fo:bookmark>
|
|
4969
|
+
</xsl:for-each>
|
|
4970
|
+
</fo:bookmark>
|
|
4971
|
+
</xsl:if>
|
|
4972
|
+
</xsl:template><xsl:template name="insertTableBookmarks">
|
|
4973
|
+
<xsl:param name="contents"/>
|
|
4974
|
+
<xsl:param name="lang"/>
|
|
4975
|
+
<xsl:if test="xalan:nodeset($contents)/table">
|
|
4976
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
|
|
4977
|
+
<fo:bookmark-title>
|
|
4978
|
+
<xsl:choose>
|
|
4979
|
+
<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
|
|
4980
|
+
<xsl:otherwise>Tables</xsl:otherwise>
|
|
4981
|
+
</xsl:choose>
|
|
4982
|
+
</fo:bookmark-title>
|
|
4983
|
+
<xsl:for-each select="xalan:nodeset($contents)/table">
|
|
4984
|
+
<fo:bookmark internal-destination="{@id}">
|
|
4985
|
+
<fo:bookmark-title>
|
|
4986
|
+
<xsl:value-of select="normalize-space(title)"/>
|
|
4987
|
+
</fo:bookmark-title>
|
|
4988
|
+
</fo:bookmark>
|
|
4989
|
+
</xsl:for-each>
|
|
4990
|
+
</fo:bookmark>
|
|
4991
|
+
</xsl:if>
|
|
4807
4992
|
</xsl:template><xsl:template name="getLangVersion">
|
|
4808
4993
|
<xsl:param name="lang"/>
|
|
4994
|
+
<xsl:param name="doctype" select="''"/>
|
|
4995
|
+
<xsl:param name="title" select="''"/>
|
|
4809
4996
|
<xsl:choose>
|
|
4810
4997
|
<xsl:when test="$lang = 'en'">
|
|
4811
4998
|
English
|
|
@@ -5301,7 +5488,8 @@
|
|
|
5301
5488
|
<fo:block-container margin-left="0mm">
|
|
5302
5489
|
|
|
5303
5490
|
<fo:block xsl:use-attribute-sets="quote-style">
|
|
5304
|
-
<xsl:apply-templates select=".//*[local-name() = 'p']"/>
|
|
5491
|
+
<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
|
|
5492
|
+
<xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
|
5305
5493
|
</fo:block>
|
|
5306
5494
|
<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
|
|
5307
5495
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
|
@@ -18,6 +18,17 @@ module Metanorma
|
|
|
18
18
|
)
|
|
19
19
|
end
|
|
20
20
|
|
|
21
|
+
def fonts_manifest
|
|
22
|
+
{
|
|
23
|
+
"Arial" => nil,
|
|
24
|
+
"Times New Roman" => nil,
|
|
25
|
+
"STIX Two Math" => nil,
|
|
26
|
+
"Source Han Sans" => nil,
|
|
27
|
+
"Courier" => nil,
|
|
28
|
+
"Courier New" => nil,
|
|
29
|
+
}
|
|
30
|
+
end
|
|
31
|
+
|
|
21
32
|
def version
|
|
22
33
|
"Metanorma::Iec #{Metanorma::Iec::VERSION}"
|
|
23
34
|
end
|
data/metanorma-iec.gemspec
CHANGED
|
@@ -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.6.0"
|
|
32
32
|
|
|
33
33
|
spec.add_development_dependency "byebug"
|
|
34
34
|
spec.add_development_dependency "sassc", "2.4.0"
|
|
@@ -93,6 +93,7 @@ RSpec.describe Asciidoctor::Iec do
|
|
|
93
93
|
:library-ics: 1,2,3
|
|
94
94
|
:accessibility-color-inside: true
|
|
95
95
|
:price-code: XC
|
|
96
|
+
:cen-processing: true
|
|
96
97
|
INPUT
|
|
97
98
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
98
99
|
<iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
|
|
@@ -169,6 +170,7 @@ RSpec.describe Asciidoctor::Iec do
|
|
|
169
170
|
<stagename>New work item proposal</stagename>
|
|
170
171
|
<accessibility-color-inside>true</accessibility-color-inside>
|
|
171
172
|
<price-code>XC</price-code>
|
|
173
|
+
<cen-processing>true</cen-processing>
|
|
172
174
|
</ext>
|
|
173
175
|
</bibdata>
|
|
174
176
|
#{UNPUBLISHED_BOILERPLATE}
|
|
@@ -191,7 +193,7 @@ RSpec.describe Asciidoctor::Iec do
|
|
|
191
193
|
:tc-docnumber: 2000
|
|
192
194
|
:language: el
|
|
193
195
|
:script: Grek
|
|
194
|
-
:publisher: IEC
|
|
196
|
+
:publisher: IEC;IETF;ISO
|
|
195
197
|
:copyright-year: 2001
|
|
196
198
|
:docstage: A2CD
|
|
197
199
|
:doctype: technical-specification
|
|
@@ -104,7 +104,7 @@ RSpec.describe Asciidoctor::Iec do
|
|
|
104
104
|
OUTPUT
|
|
105
105
|
end
|
|
106
106
|
|
|
107
|
-
it "
|
|
107
|
+
it "keeps any initial boilerplate from terms and definitions" do
|
|
108
108
|
expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
109
109
|
#{ASCIIDOC_BLANK_HDR}
|
|
110
110
|
== Terms and Definitions
|
|
@@ -123,7 +123,12 @@ RSpec.describe Asciidoctor::Iec do
|
|
|
123
123
|
<p id="_">For the purposes of this document,
|
|
124
124
|
the following terms and definitions apply.</p>
|
|
125
125
|
#{TERMS_BOILERPLATE}
|
|
126
|
-
|
|
126
|
+
<p id='_'>I am boilerplate</p>
|
|
127
|
+
<ul id='_'>
|
|
128
|
+
<li>
|
|
129
|
+
<p id='_'>So am I</p>
|
|
130
|
+
</li>
|
|
131
|
+
</ul>
|
|
127
132
|
<term id="term-time">
|
|
128
133
|
<preferred>Time</preferred>
|
|
129
134
|
<definition><p id="_">This paragraph is extraneous</p></definition>
|
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.11
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-12-
|
|
11
|
+
date: 2020-12-28 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.6.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.6.0
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: byebug
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -249,7 +249,6 @@ files:
|
|
|
249
249
|
- lib/isodoc/iec/xref.rb
|
|
250
250
|
- lib/metanorma-iec.rb
|
|
251
251
|
- lib/metanorma/iec.rb
|
|
252
|
-
- lib/metanorma/iec/fonts_manifest.yaml
|
|
253
252
|
- lib/metanorma/iec/processor.rb
|
|
254
253
|
- lib/metanorma/iec/version.rb
|
|
255
254
|
- metanorma-iec.gemspec
|