metanorma-iec 1.2.8 → 1.2.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +4 -5
  3. data/lib/asciidoctor/iec/converter.rb +5 -1
  4. data/lib/asciidoctor/iec/front.rb +6 -0
  5. data/lib/asciidoctor/iec/iec.rng +36 -1
  6. data/lib/asciidoctor/iec/iec_intro_en.xml +82 -53
  7. data/lib/asciidoctor/iec/iec_intro_fr.xml +44 -20
  8. data/lib/asciidoctor/iec/isostandard.rng +8 -0
  9. data/lib/isodoc/iec/html/htmlstyle.css +5 -5
  10. data/lib/isodoc/iec/html/htmlstyle.scss +4 -4
  11. data/lib/isodoc/iec/html/isodoc.css +79 -79
  12. data/lib/isodoc/iec/html/isodoc.scss +79 -79
  13. data/lib/isodoc/iec/html/wordstyle.css +120 -120
  14. data/lib/isodoc/iec/html/wordstyle.scss +120 -120
  15. data/lib/isodoc/iec/html_convert.rb +8 -0
  16. data/lib/isodoc/iec/i18n-en.yaml +16 -0
  17. data/lib/isodoc/iec/i18n-fr.yaml +17 -0
  18. data/lib/isodoc/iec/iec.international-standard.xsl +313 -213
  19. data/lib/isodoc/iec/metadata.rb +33 -0
  20. data/lib/isodoc/iec/presentation_xml_convert.rb +12 -0
  21. data/lib/isodoc/iec/word_convert.rb +10 -0
  22. data/lib/metanorma/iec/fonts_manifest.yaml +5 -0
  23. data/lib/metanorma/iec/processor.rb +0 -8
  24. data/lib/metanorma/iec/version.rb +1 -1
  25. data/metanorma-iec.gemspec +0 -1
  26. data/spec/asciidoctor-iec/base_spec.rb +8 -0
  27. data/spec/asciidoctor-iec/blocks_spec.rb +1 -1
  28. data/spec/asciidoctor-iec/iev_spec.rb +3 -0
  29. data/spec/asciidoctor-iec/lists_spec.rb +6 -6
  30. data/spec/asciidoctor-iec/validate_spec.rb +15 -0
  31. data/spec/isodoc/i18n_spec.rb +30 -0
  32. data/spec/isodoc/iso_spec.rb +2 -2
  33. data/spec/isodoc/metadata_spec.rb +23 -1
  34. data/spec/spec_helper.rb +4 -1
  35. metadata +3 -16
data/lib/isodoc/iec/html_convert.rb CHANGED
@@ -16,6 +16,8 @@ module IsoDoc
16
16
  bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
17
17
  headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
18
18
  monospacefont: ('"Courier New",monospace'),
19
+ monospacefontsize: "1.0em",
20
+ footnotefontsize: "0.9em",
19
21
  }
20
22
  end
21
23
 
@@ -36,6 +38,12 @@ module IsoDoc
36
38
  docxml
37
39
  end
38
40
 
41
+ def authority_cleanup(docxml)
42
+ auth = docxml.at("//div[@id = 'boilerplate-feedback' or @class = 'boilerplate-feedback']")
43
+ auth&.remove
44
+ super
45
+ end
46
+
39
47
  include BaseConvert
40
48
  include Init
41
49
  end
data/lib/isodoc/iec/i18n-en.yaml CHANGED
@@ -16,3 +16,19 @@ term_def_boilerplate: |
16
16
  <li> <p>ISO Online browsing platform: available at
17
17
  <link target="http://www.iso.org/obp"/></p> </li>
18
18
  </ul>
19
+ doctype_dict:
20
+ international-standard: International Standard
21
+ technical-specification: Technical Specification
22
+ technical-report: Technical Report
23
+ publicly-available-specification: Publicly Available Specification
24
+ international-workshop-agreement: International Workshop Agreement
25
+ guide: Guide
26
+ interpretation-sheet: Interpretation Sheet
27
+ function_dict:
28
+ emc: Basic EMC Publication
29
+ safety: Basic Safety Publication
30
+ environment: Basic Environment Publication
31
+ quality-assurance: Basic Quality Assurance Publication
32
+ horizontal_dict:
33
+ "true": Horizontal Standard
34
+ "false":
data/lib/isodoc/iec/i18n-fr.yaml CHANGED
@@ -16,3 +16,20 @@ term_def_boilerplate: |
16
16
  <li> <p>ISO Online browsing platform: disponible à l'adresse
17
17
  <link target="http://www.iso.org/obp"/></p> </li>
18
18
  </ul>
19
+ doctype_dict:
20
+ international-standard: Norme international
21
+ technical-specification: Spécification technique
22
+ technical-report: Rapport technique
23
+ publicly-available-specification: Spécification disponible publiquement
24
+ international-workshop-agreement: Accord internationale d’atelier
25
+ guide: Guide
26
+ interpretation-sheet: Feuille d’interprétation
27
+ function_dict:
28
+ emc: Publication fondamentale en CEM
29
+ safety: Publication fondamentale de sécurité
30
+ environment: Publication fondamentale sur l’environnement
31
+ quality-assurance: Publication fondamentale sur l’assurance de la qualité
32
+ horizontal_dict:
33
+ "true": Norme horizontale
34
+ "false":
35
+
data/lib/isodoc/iec/iec.international-standard.xsl CHANGED
@@ -32,7 +32,7 @@
32
32
  <xsl:variable name="title-main-fr" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr' and @type = 'title-main']"/>
33
33
  <xsl:variable name="part" select="/iec:iec-standard/iec:bibdata/iec:ext/iec:structuredidentifier/iec:project-number/@part"/>
34
34
 
35
- <xsl:variable name="doctype_uppercased" select="java:toUpperCase(java:java.lang.String.new(translate(/iec:iec-standard/iec:bibdata/iec:ext/iec:doctype,'-',' ')))"/>
35
+ <xsl:variable name="doctype_uppercased" select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:doctype[@language = $lang]))"/>
36
36
 
37
37
 
38
38
 
@@ -136,7 +136,7 @@
136
136
  <xsl:call-template name="namespaceCheck"/>
137
137
  <!-- https://stackoverflow.com/questions/25261949/xsl-fo-letter-spacing-with-text-align -->
138
138
  <!-- https://xmlgraphics.apache.org/fop/knownissues.html -->
139
- <fo:root font-family="Arial, Times New Roman, STIX Two Math, HanSans" font-size="10pt" xml:lang="{$lang}">
139
+ <fo:root font-family="Arial, Times New Roman, STIX Two Math, Source Han Sans" font-size="10pt" xml:lang="{$lang}">
140
140
  <fo:layout-master-set>
141
141
  <!-- cover pages -->
142
142
  <fo:simple-page-master master-name="cover" page-width="{$pageWidth}" page-height="{$pageHeight}">
@@ -146,6 +146,13 @@
146
146
  <fo:region-start region-name="left-region" extent="18mm"/>
147
147
  <fo:region-end region-name="right-region" extent="20.5mm"/>
148
148
  </fo:simple-page-master>
149
+ <fo:simple-page-master master-name="cover_2nd" page-width="{$pageWidth}" page-height="{$pageHeight}">
150
+ <fo:region-body margin-top="17.5mm" margin-bottom="12.5mm" margin-left="25mm" margin-right="25mm" column-count="2" column-gap="5mm"/>
151
+ <fo:region-before region-name="header" extent="17.5mm"/>
152
+ <fo:region-after region-name="footer" extent="12.5mm" precedence="true"/>
153
+ <fo:region-start region-name="left-region" extent="25mm"/>
154
+ <fo:region-end region-name="right-region" extent="25mm"/>
155
+ </fo:simple-page-master>
149
156
 
150
157
  <fo:simple-page-master master-name="cover-FDIS" page-width="{$pageWidth}" page-height="{$pageHeight}">
151
158
  <fo:region-body margin-top="17.5mm" margin-bottom="29mm" margin-left="18mm" margin-right="19mm"/>
@@ -218,222 +225,230 @@
218
225
  </fo:page-sequence>
219
226
 
220
227
  <!-- 2nd Cover Page -->
221
- <fo:page-sequence master-reference="cover" force-page-count="no-force">
228
+ <fo:page-sequence master-reference="cover_2nd" force-page-count="no-force" font-size="8pt">
222
229
  <fo:flow flow-name="xsl-region-body">
223
- <fo:block-container margin-left="7mm" margin-right="4.5mm" border="0.5pt solid black" margin-top="7mm">
224
- <fo:block-container margin-left="2.5mm" margin-right="2.5mm" margin-top="1mm" margin-bottom="1mm">
225
- <fo:block-container margin-left="0mm" margin-right="0mm">
226
- <fo:table table-layout="fixed" width="100%">
227
- <fo:table-column column-width="20mm"/>
228
- <fo:table-column column-width="130mm"/>
229
- <fo:table-body>
230
- <fo:table-row>
231
- <fo:table-cell>
232
- <fo:block>
233
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="17.8mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
234
- </fo:block>
235
- </fo:table-cell>
236
- <fo:table-cell font-size="10pt" font-weight="bold" display-align="after">
237
- <fo:block margin-bottom="3pt">THIS PUBLICATION IS COPYRIGHT PROTECTED</fo:block>
238
- <fo:block margin-bottom="10pt">
239
- <!-- Example: Copyright © 2014 IEC, Geneva, Switzerland -->
240
- <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-year']"/>
241
- </fo:block>
242
- </fo:table-cell>
243
- </fo:table-row>
244
- </fo:table-body>
245
- </fo:table>
246
- <fo:block font-size="8pt">
247
- <fo:block margin-bottom="8pt" text-align="justify">
248
- <!-- Example: All rights reserved. Unless otherwise specified, no part of this publication may be reproduced or utilized in any form
249
- or by any means, electronic or mechanical, including photocopying and microfilm, without permission in writing from
250
- either IEC or IEC's member National Committee in the country of the requester. If you have any questions about IEC
251
- copyright or have an enquiry about obtaining additional rights to this publication, please contact the address below or
252
- your local IEC member National Committee for further information. -->
253
- <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-message']"/>
254
- </fo:block>
255
- <fo:block margin-bottom="8pt" text-align="justify">Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne peut être reproduite
256
- ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique ou mécanique, y compris la photocopie
257
- 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
258
- questions sur le copyright de l'IEC ou si vous désirez obtenir des droits supplémentaires sur cette publication, utilisez
259
- les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pays de résidence.</fo:block>
260
-
261
- <xsl:variable name="telpos" select="count(/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/text()[contains(., 'Tel.')]/preceding-sibling::node())"/>
230
+ <fo:block span="all">
231
+ <fo:block-container border="0.5pt solid black" margin-top="7mm">
232
+ <fo:block-container margin-left="2.5mm" margin-right="2.5mm" margin-top="1mm" margin-bottom="1mm">
233
+ <fo:block-container margin-left="0mm" margin-right="0mm">
262
234
  <fo:table table-layout="fixed" width="100%">
263
- <fo:table-column column-width="59mm"/>
264
- <fo:table-column column-width="90mm"/>
235
+ <fo:table-column column-width="20mm"/>
236
+ <fo:table-column column-width="130mm"/>
265
237
  <fo:table-body>
266
238
  <fo:table-row>
267
239
  <fo:table-cell>
268
240
  <fo:block>
269
- <!-- Example: IEC Central Office
270
- 3, rue de Varembé
271
- CH-1211 Geneva 20
272
- Switzerland -->
273
- <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-name']" mode="coverpage"/>
274
- <xsl:choose>
275
- <xsl:when test="$telpos != 0">
276
- <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/node()[position() &lt; $telpos]" mode="coverpage"/>
277
- </xsl:when>
278
- <xsl:otherwise>
279
- <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']" mode="coverpage"/>
280
- </xsl:otherwise>
281
- </xsl:choose>
241
+ <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="17.8mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
282
242
  </fo:block>
283
243
  </fo:table-cell>
284
- <fo:table-cell>
285
- <fo:block>
286
- <!-- Example: Tel.: +41 22 919 02 11
287
- Fax: +41 22 919 0
288
- info@iec.ch
289
- www.iec.ch -->
290
- <xsl:choose>
291
- <xsl:when test="$telpos != 0">
292
- <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/node()[position() &gt; $telpos]" mode="coverpage"/>
293
- </xsl:when>
294
- <xsl:otherwise> </xsl:otherwise>
295
- </xsl:choose>
244
+ <fo:table-cell font-size="10pt" font-weight="bold" display-align="after">
245
+ <fo:block margin-bottom="3pt">THIS PUBLICATION IS COPYRIGHT PROTECTED</fo:block>
246
+ <fo:block margin-bottom="10pt">
247
+ <!-- Example: Copyright © 2014 IEC, Geneva, Switzerland -->
248
+ <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-year']"/>
296
249
  </fo:block>
297
250
  </fo:table-cell>
298
251
  </fo:table-row>
299
252
  </fo:table-body>
300
253
  </fo:table>
301
-
302
- </fo:block>
254
+ <fo:block>
255
+ <fo:block margin-bottom="8pt" text-align="justify">
256
+ <!-- Example: All rights reserved. Unless otherwise specified, no part of this publication may be reproduced or utilized in any form
257
+ or by any means, electronic or mechanical, including photocopying and microfilm, without permission in writing from
258
+ either IEC or IEC's member National Committee in the country of the requester. If you have any questions about IEC
259
+ copyright or have an enquiry about obtaining additional rights to this publication, please contact the address below or
260
+ your local IEC member National Committee for further information. -->
261
+ <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-message']"/>
262
+ </fo:block>
263
+ <fo:block margin-bottom="8pt" text-align="justify">Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne peut être reproduite
264
+ ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique ou mécanique, y compris la photocopie
265
+ 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
+ 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.</fo:block>
268
+
269
+ <xsl:variable name="telpos" select="count(/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/text()[contains(., 'Tel.')]/preceding-sibling::node())"/>
270
+ <fo:table table-layout="fixed" width="100%">
271
+ <fo:table-column column-width="59mm"/>
272
+ <fo:table-column column-width="90mm"/>
273
+ <fo:table-body>
274
+ <fo:table-row>
275
+ <fo:table-cell>
276
+ <fo:block>
277
+ <!-- Example: IEC Central Office
278
+ 3, rue de Varembé
279
+ CH-1211 Geneva 20
280
+ Switzerland -->
281
+ <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-name']" mode="coverpage"/>
282
+ <xsl:choose>
283
+ <xsl:when test="$telpos != 0">
284
+ <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/node()[position() &lt; $telpos]" mode="coverpage"/>
285
+ </xsl:when>
286
+ <xsl:otherwise>
287
+ <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']" mode="coverpage"/>
288
+ </xsl:otherwise>
289
+ </xsl:choose>
290
+ </fo:block>
291
+ </fo:table-cell>
292
+ <fo:table-cell>
293
+ <fo:block>
294
+ <!-- Example: Tel.: +41 22 919 02 11
295
+ Fax: +41 22 919 0
296
+ info@iec.ch
297
+ www.iec.ch -->
298
+ <xsl:choose>
299
+ <xsl:when test="$telpos != 0">
300
+ <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/node()[position() &gt; $telpos]" mode="coverpage"/>
301
+ </xsl:when>
302
+ <xsl:otherwise> </xsl:otherwise>
303
+ </xsl:choose>
304
+ </fo:block>
305
+ </fo:table-cell>
306
+ </fo:table-row>
307
+ </fo:table-body>
308
+ </fo:table>
309
+
310
+ </fo:block>
311
+ </fo:block-container>
303
312
  </fo:block-container>
304
313
  </fo:block-container>
305
- </fo:block-container>
314
+ </fo:block>
306
315
 
307
- <fo:block-container margin-left="7mm" margin-right="4.5mm" margin-top="6pt">
308
- <fo:block-container font-size="8pt" text-align="justify" margin-left="0mm" margin-right="0mm">
309
-
310
- <fo:block font-weight="bold">About the IEC</fo:block>
311
- <fo:block margin-bottom="6pt">The International Electrotechnical Commission (IEC) is the leading global organization that prepares and publishes
312
- International Standards for all electrical, electronic and related technologies.</fo:block>
313
-
314
- <fo:block font-weight="bold">About IEC publications</fo:block>
315
- <fo:block margin-bottom="6pt">The technical content of IEC publications is kept under constant review by the IEC. Please make sure that you have the
316
- latest edition, a corrigenda or an amendment might have been published.</fo:block>
317
-
318
- <fo:table table-layout="fixed" width="100%" margin-bottom="12pt">
319
- <fo:table-column column-width="82mm"/>
320
- <fo:table-column column-width="78mm"/>
321
- <fo:table-body>
322
- <fo:table-row border-bottom="0.5pt solid black">
323
- <fo:table-cell padding-right="5mm">
324
- <fo:block font-weight="bold">IEC Catalogue - <fo:inline color="blue">webstore.iec.ch/catalogue</fo:inline></fo:block>
325
- <fo:block margin-bottom="6pt">
326
- <xsl:text>The stand-alone application for consulting the entire
327
- bibliographical information on IEC International Standards,
328
- Technical Specifications, Technical Reports and other
329
- documents. Available for PC, Mac OS, Android Tablets and
330
- iPad.</xsl:text>
331
- </fo:block>
332
- <fo:block font-weight="bold">IEC publications search - <fo:inline color="blue">www.iec.ch/searchpub</fo:inline></fo:block>
333
- <fo:block margin-bottom="6pt">
334
- <xsl:text>The advanced search enables to find IEC publications by a
335
- variety of criteria (reference number, text, technical
336
- committee,…). It also gives information on projects, replaced
337
- and withdrawn publications.</xsl:text>
338
- </fo:block>
339
- <fo:block font-weight="bold">IEC Just Published - <fo:inline color="blue">webstore.iec.ch/justpublished</fo:inline></fo:block>
340
- <fo:block margin-bottom="6pt">
341
- <xsl:text>Stay up to date on all new IEC publications. Just Published
342
- details all new publications released. Available online and
343
- also once a month by email.</xsl:text>
344
- </fo:block>
345
- </fo:table-cell>
346
- <fo:table-cell>
347
- <fo:block font-weight="bold">Electropedia - <fo:inline color="blue">www.electropedia.org</fo:inline></fo:block>
348
- <fo:block margin-bottom="6pt">
349
- <xsl:text>The world's leading online dictionary of electronic and
350
- electrical terms containing more than 30 000 terms and
351
- definitions in English and French, with equivalent terms in 14
352
- additional languages. Also known as the International
353
- Electrotechnical Vocabulary (IEV) online.</xsl:text>
354
- </fo:block>
355
- <fo:block font-weight="bold">IEC Glossary - <fo:inline color="blue">std.iec.ch/glossary</fo:inline></fo:block>
356
- <fo:block margin-bottom="6pt">
357
- <xsl:text>More than 55 000 electrotechnical terminology entries in
358
- English and French extracted from the Terms and Definitions
359
- clause of IEC publications issued since 2002. Some entries
360
- have been collected from earlier publications of IEC TC 37,
361
- 77, 86 and CISPR.</xsl:text>
362
- </fo:block>
363
- <fo:block font-weight="bold">IEC Customer Service Centre - <fo:inline color="blue">webstore.iec.ch/csc</fo:inline></fo:block>
364
- <fo:block margin-bottom="6pt">
365
- <xsl:text>If you wish to give us your feedback on this publication or
366
- need further assistance, please contact the Customer Service
367
- Centre: </xsl:text><fo:inline color="blue">csc@iec.ch</fo:inline>.
368
- </fo:block>
369
- </fo:table-cell>
370
- </fo:table-row>
371
- </fo:table-body>
372
- </fo:table>
373
- <fo:block font-weight="bold">A propos de l'IEC</fo:block>
374
- <fo:block margin-bottom="6pt">La Commission Electrotechnique Internationale (IEC) est la première organisation mondiale qui élabore et publie des
375
- Normes internationales pour tout ce qui a trait à l'électricité, à l'électronique et aux technologies apparentées.</fo:block>
316
+ <xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:feedback-statement"/>
317
+ <fo:block span="all" border-bottom="0.5pt solid black"/>
318
+
319
+ <!-- <fo:block span="all">
320
+ <fo:block-container margin-top="6pt">
321
+ <fo:block-container text-align="justify" margin-left="0mm" margin-right="0mm">
322
+
323
+ <fo:block font-weight="bold">About the IEC</fo:block>
324
+ <fo:block margin-bottom="6pt">The International Electrotechnical Commission (IEC) is the leading global organization that prepares and publishes
325
+ International Standards for all electrical, electronic and related technologies.</fo:block>
376
326
 
377
- <fo:block font-weight="bold">A propos des publications IEC</fo:block>
378
- <fo:block margin-bottom="6pt">Le contenu technique des publications IEC est constamment revu. Veuillez vous assurer que vous possédez l’édition la
379
- plus récente, un corrigendum ou amendement peut avoir été publié.</fo:block>
327
+ <fo:block font-weight="bold">About IEC publications</fo:block>
328
+ <fo:block margin-bottom="6pt">The technical content of IEC publications is kept under constant review by the IEC. Please make sure that you have the
329
+ latest edition, a corrigenda or an amendment might have been published.</fo:block>
330
+
331
+ <fo:table table-layout="fixed" width="100%" margin-bottom="12pt">
332
+ <fo:table-column column-width="82mm"/>
333
+ <fo:table-column column-width="78mm"/>
334
+ <fo:table-body>
335
+ <fo:table-row border-bottom="0.5pt solid black">
336
+ <fo:table-cell padding-right="5mm">
337
+ <fo:block font-weight="bold">IEC Catalogue - <fo:inline color="blue">webstore.iec.ch/catalogue</fo:inline></fo:block>
338
+ <fo:block margin-bottom="6pt">
339
+ <xsl:text>The stand-alone application for consulting the entire
340
+ bibliographical information on IEC International Standards,
341
+ Technical Specifications, Technical Reports and other
342
+ documents. Available for PC, Mac OS, Android Tablets and
343
+ iPad.</xsl:text>
344
+ </fo:block>
345
+ <fo:block font-weight="bold">IEC publications search - <fo:inline color="blue">www.iec.ch/searchpub</fo:inline></fo:block>
346
+ <fo:block margin-bottom="6pt">
347
+ <xsl:text>The advanced search enables to find IEC publications by a
348
+ variety of criteria (reference number, text, technical
349
+ committee,…). It also gives information on projects, replaced
350
+ and withdrawn publications.</xsl:text>
351
+ </fo:block>
352
+ <fo:block font-weight="bold">IEC Just Published - <fo:inline color="blue">webstore.iec.ch/justpublished</fo:inline></fo:block>
353
+ <fo:block margin-bottom="6pt">
354
+ <xsl:text>Stay up to date on all new IEC publications. Just Published
355
+ details all new publications released. Available online and
356
+ also once a month by email.</xsl:text>
357
+ </fo:block>
358
+ </fo:table-cell>
359
+ <fo:table-cell>
360
+ <fo:block font-weight="bold">Electropedia - <fo:inline color="blue">www.electropedia.org</fo:inline></fo:block>
361
+ <fo:block margin-bottom="6pt">
362
+ <xsl:text>The world's leading online dictionary of electronic and
363
+ electrical terms containing more than 30 000 terms and
364
+ definitions in English and French, with equivalent terms in 14
365
+ additional languages. Also known as the International
366
+ Electrotechnical Vocabulary (IEV) online.</xsl:text>
367
+ </fo:block>
368
+ <fo:block font-weight="bold">IEC Glossary - <fo:inline color="blue">std.iec.ch/glossary</fo:inline></fo:block>
369
+ <fo:block margin-bottom="6pt">
370
+ <xsl:text>More than 55 000 electrotechnical terminology entries in
371
+ English and French extracted from the Terms and Definitions
372
+ clause of IEC publications issued since 2002. Some entries
373
+ have been collected from earlier publications of IEC TC 37,
374
+ 77, 86 and CISPR.</xsl:text>
375
+ </fo:block>
376
+ <fo:block font-weight="bold">IEC Customer Service Centre - <fo:inline color="blue">webstore.iec.ch/csc</fo:inline></fo:block>
377
+ <fo:block margin-bottom="6pt">
378
+ <xsl:text>If you wish to give us your feedback on this publication or
379
+ need further assistance, please contact the Customer Service
380
+ Centre: </xsl:text><fo:inline color="blue">csc@iec.ch</fo:inline>.
381
+ </fo:block>
382
+ </fo:table-cell>
383
+ </fo:table-row>
384
+ </fo:table-body>
385
+ </fo:table>
386
+
387
+ <fo:block font-weight="bold">A propos de l'IEC</fo:block>
388
+ <fo:block margin-bottom="6pt">La Commission Electrotechnique Internationale (IEC) est la première organisation mondiale qui élabore et publie des
389
+ Normes internationales pour tout ce qui a trait à l'électricité, à l'électronique et aux technologies apparentées.</fo:block>
390
+
391
+ <fo:block font-weight="bold">A propos des publications IEC</fo:block>
392
+ <fo:block margin-bottom="6pt">Le contenu technique des publications IEC est constamment revu. Veuillez vous assurer que vous possédez l’édition la
393
+ plus récente, un corrigendum ou amendement peut avoir été publié.</fo:block>
380
394
 
381
- <fo:table table-layout="fixed" width="100%">
382
- <fo:table-column column-width="82mm"/>
383
- <fo:table-column column-width="78mm"/>
384
- <fo:table-body>
385
- <fo:table-row>
386
- <fo:table-cell padding-right="5mm">
387
- <fo:block font-weight="bold">Catalogue IEC - <fo:inline color="blue">webstore.iec.ch/catalogue</fo:inline></fo:block>
388
- <fo:block margin-bottom="6pt">
389
- <xsl:text>Application autonome pour consulter tous les renseignements
390
- bibliographiques sur les Normes internationales,
391
- Spécifications techniques, Rapports techniques et autres
392
- documents de l'IEC. Disponible pour PC, Mac OS, tablettes
393
- Android et iPad.</xsl:text>
394
- </fo:block>
395
- <fo:block font-weight="bold">Recherche de publications IEC - <fo:inline color="blue">www.iec.ch/searchpub</fo:inline></fo:block>
396
- <fo:block margin-bottom="6pt">
397
- <xsl:text>La recherche avancée permet de trouver des publications IEC
398
- en utilisant différents critères (numéro de référence, texte,
399
- comité d’études,…). Elle donne aussi des informations sur les
400
- projets et les publications remplacées ou retirées.</xsl:text>
401
- </fo:block>
402
- <fo:block font-weight="bold">IEC Just Published - <fo:inline color="blue">webstore.iec.ch/justpublished</fo:inline></fo:block>
403
- <fo:block margin-bottom="6pt">
404
- <xsl:text>Restez informé sur les nouvelles publications IEC. Just
405
- Published détaille les nouvelles publications parues.
406
- Disponible en ligne et aussi une fois par mois par email.</xsl:text>
407
- </fo:block>
408
- </fo:table-cell>
409
- <fo:table-cell>
410
- <fo:block font-weight="bold">Electropedia - <fo:inline color="blue">www.electropedia.org</fo:inline></fo:block>
411
- <fo:block margin-bottom="6pt">
412
- <xsl:text>Le premier dictionnaire en ligne de termes électroniques et
413
- électriques. Il contient plus de 30 000 termes et définitions en
414
- anglais et en français, ainsi que les termes équivalents dans
415
- 14 langues additionnelles. Egalement appelé Vocabulaire
416
- Electrotechnique International (IEV) en ligne.</xsl:text>
417
- </fo:block>
418
- <fo:block font-weight="bold">Glossaire IEC - <fo:inline color="blue">std.iec.ch/glossary</fo:inline></fo:block>
419
- <fo:block margin-bottom="6pt">
420
- <xsl:text>Plus de 55 000 entrées terminologiques électrotechniques, en
421
- anglais et en français, extraites des articles Termes et
422
- Définitions des publications IEC parues depuis 2002. Plus
423
- certaines entrées antérieures extraites des publications des
424
- CE 37, 77, 86 et CISPR de l'IEC.</xsl:text>
425
- </fo:block>
426
- <fo:block font-weight="bold">Service Clients - <fo:inline color="blue">webstore.iec.ch/csc</fo:inline></fo:block>
427
- <fo:block margin-bottom="6pt">
428
- <xsl:text>Si vous désirez nous donner des commentaires sur cette
429
- publication ou si vous avez des questions contactez-nous: </xsl:text><fo:inline color="blue">csc@iec.ch</fo:inline>.
430
- </fo:block>
431
- </fo:table-cell>
432
- </fo:table-row>
433
- </fo:table-body>
434
- </fo:table>
395
+ <fo:table table-layout="fixed" width="100%">
396
+ <fo:table-column column-width="82mm"/>
397
+ <fo:table-column column-width="78mm"/>
398
+ <fo:table-body>
399
+ <fo:table-row>
400
+ <fo:table-cell padding-right="5mm">
401
+ <fo:block font-weight="bold">Catalogue IEC - <fo:inline color="blue">webstore.iec.ch/catalogue</fo:inline></fo:block>
402
+ <fo:block margin-bottom="6pt">
403
+ <xsl:text>Application autonome pour consulter tous les renseignements
404
+ bibliographiques sur les Normes internationales,
405
+ Spécifications techniques, Rapports techniques et autres
406
+ documents de l'IEC. Disponible pour PC, Mac OS, tablettes
407
+ Android et iPad.</xsl:text>
408
+ </fo:block>
409
+ <fo:block font-weight="bold">Recherche de publications IEC - <fo:inline color="blue">www.iec.ch/searchpub</fo:inline></fo:block>
410
+ <fo:block margin-bottom="6pt">
411
+ <xsl:text>La recherche avancée permet de trouver des publications IEC
412
+ en utilisant différents critères (numéro de référence, texte,
413
+ comité d’études,…). Elle donne aussi des informations sur les
414
+ projets et les publications remplacées ou retirées.</xsl:text>
415
+ </fo:block>
416
+ <fo:block font-weight="bold">IEC Just Published - <fo:inline color="blue">webstore.iec.ch/justpublished</fo:inline></fo:block>
417
+ <fo:block margin-bottom="6pt">
418
+ <xsl:text>Restez informé sur les nouvelles publications IEC. Just
419
+ Published détaille les nouvelles publications parues.
420
+ Disponible en ligne et aussi une fois par mois par email.</xsl:text>
421
+ </fo:block>
422
+ </fo:table-cell>
423
+ <fo:table-cell>
424
+ <fo:block font-weight="bold">Electropedia - <fo:inline color="blue">www.electropedia.org</fo:inline></fo:block>
425
+ <fo:block margin-bottom="6pt">
426
+ <xsl:text>Le premier dictionnaire en ligne de termes électroniques et
427
+ électriques. Il contient plus de 30 000 termes et définitions en
428
+ anglais et en français, ainsi que les termes équivalents dans
429
+ 14 langues additionnelles. Egalement appelé Vocabulaire
430
+ Electrotechnique International (IEV) en ligne.</xsl:text>
431
+ </fo:block>
432
+ <fo:block font-weight="bold">Glossaire IEC - <fo:inline color="blue">std.iec.ch/glossary</fo:inline></fo:block>
433
+ <fo:block margin-bottom="6pt">
434
+ <xsl:text>Plus de 55 000 entrées terminologiques électrotechniques, en
435
+ anglais et en français, extraites des articles Termes et
436
+ Définitions des publications IEC parues depuis 2002. Plus
437
+ certaines entrées antérieures extraites des publications des
438
+ CE 37, 77, 86 et CISPR de l'IEC.</xsl:text>
439
+ </fo:block>
440
+ <fo:block font-weight="bold">Service Clients - <fo:inline color="blue">webstore.iec.ch/csc</fo:inline></fo:block>
441
+ <fo:block margin-bottom="6pt">
442
+ <xsl:text>Si vous désirez nous donner des commentaires sur cette
443
+ publication ou si vous avez des questions contactez-nous: </xsl:text><fo:inline color="blue">csc@iec.ch</fo:inline>.
444
+ </fo:block>
445
+ </fo:table-cell>
446
+ </fo:table-row>
447
+ </fo:table-body>
448
+ </fo:table>
449
+ </fo:block-container>
435
450
  </fo:block-container>
436
- </fo:block-container>
451
+ </fo:block> -->
437
452
  </fo:flow>
438
453
  </fo:page-sequence>
439
454
  </xsl:if>
@@ -490,8 +505,10 @@
490
505
  <xsl:text> </xsl:text>
491
506
  <fo:inline keep-together.within-line="always"><fo:leader leader-pattern="space"/>
492
507
  <xsl:text> </xsl:text>
493
- <!-- <xsl:value-of select="/iec:iec-standard/iec:bibdata/iec:isbn"/> -->
494
- <xsl:text>Example: ISBN 978-2-8322-1532-6</xsl:text>
508
+ <xsl:if test="/iec:iec-standard/iec:bibdata/iec:docidentifier[@type='ISBN']">
509
+ <!-- <xsl:text>Example: ISBN 978-2-8322-1532-6</xsl:text> -->
510
+ <xsl:value-of select="/iec:iec-standard/iec:bibdata/iec:docidentifier[@type='ISBN']"/>
511
+ </xsl:if>
495
512
  </fo:inline>
496
513
  </fo:block>
497
514
  <fo:block-container margin-left="1.5mm">
@@ -746,13 +763,28 @@
746
763
  <xsl:with-param name="text" select="'Functions concerned:'"/>
747
764
  </xsl:call-template>
748
765
  </fo:block>
766
+ <!-- function: { emc | safety | environment | quality-assurance } -->
749
767
  <fo:block font-size="6.5pt">
750
- <xsl:call-template name="insertCheckBoxOff"/>
768
+ <xsl:choose>
769
+ <xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'emc'">
770
+ <xsl:call-template name="insertCheckBoxOn"/>
771
+ </xsl:when>
772
+ <xsl:otherwise>
773
+ <xsl:call-template name="insertCheckBoxOff"/>
774
+ </xsl:otherwise>
775
+ </xsl:choose>
751
776
  <xsl:call-template name="addLetterSpacingSmallCaps">
752
777
  <xsl:with-param name="text" select="'EMC'"/>
753
778
  </xsl:call-template>
754
779
  <fo:inline padding-right="33mm"> </fo:inline>
755
- <xsl:call-template name="insertCheckBoxOff"/>
780
+ <xsl:choose>
781
+ <xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'environment'">
782
+ <xsl:call-template name="insertCheckBoxOn"/>
783
+ </xsl:when>
784
+ <xsl:otherwise>
785
+ <xsl:call-template name="insertCheckBoxOff"/>
786
+ </xsl:otherwise>
787
+ </xsl:choose>
756
788
  <xsl:call-template name="addLetterSpacingSmallCaps">
757
789
  <xsl:with-param name="text" select="'Environment'"/>
758
790
  </xsl:call-template>
@@ -761,12 +793,26 @@
761
793
  <fo:table-cell padding="1.5mm" padding-bottom="0mm">
762
794
  <fo:block font-size="6.5pt" margin-bottom="6pt"> </fo:block>
763
795
  <fo:block font-size="6.5pt">
764
- <xsl:call-template name="insertCheckBoxOff"/>
796
+ <xsl:choose>
797
+ <xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'quality-assurance'">
798
+ <xsl:call-template name="insertCheckBoxOn"/>
799
+ </xsl:when>
800
+ <xsl:otherwise>
801
+ <xsl:call-template name="insertCheckBoxOff"/>
802
+ </xsl:otherwise>
803
+ </xsl:choose>
765
804
  <xsl:call-template name="addLetterSpacingSmallCaps">
766
805
  <xsl:with-param name="text" select="'Quality assurance'"/>
767
806
  </xsl:call-template>
768
807
  <fo:inline padding-right="13mm"> </fo:inline>
769
- <xsl:call-template name="insertCheckBoxOn"/>
808
+ <xsl:choose>
809
+ <xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'safety'">
810
+ <xsl:call-template name="insertCheckBoxOn"/>
811
+ </xsl:when>
812
+ <xsl:otherwise>
813
+ <xsl:call-template name="insertCheckBoxOff"/>
814
+ </xsl:otherwise>
815
+ </xsl:choose>
770
816
  <xsl:call-template name="addLetterSpacingSmallCaps">
771
817
  <xsl:with-param name="text" select="'Safety'"/>
772
818
  </xsl:call-template>
@@ -1086,14 +1132,15 @@
1086
1132
 
1087
1133
  </fo:block>
1088
1134
  </fo:block-container>
1089
- <xsl:if test="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr']">
1135
+ <xsl:if test="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr'] and $lang != 'fr'">
1090
1136
  <fo:block-container height="26mm" margin-top="10pt" display-align="after">
1091
1137
  <xsl:if test="$stage &gt;= 60">
1092
1138
  <xsl:attribute name="width">100mm</xsl:attribute>
1093
1139
  </xsl:if>
1094
1140
  <fo:block color="{$color_gray}">
1095
1141
  <xsl:if test="$stage &gt;= 60">
1096
- <xsl:text>NORME INTERNATIONALE</xsl:text>
1142
+ <!-- <xsl:text>NORME INTERNATIONALE</xsl:text> -->
1143
+ <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:doctype[@language = 'fr']))"/>
1097
1144
  </xsl:if>
1098
1145
  </fo:block>
1099
1146
  </fo:block-container>
@@ -1109,16 +1156,32 @@
1109
1156
  </fo:block-container>
1110
1157
  <fo:block-container border-bottom="0.5pt solid {$color_gray}" margin-top="4mm" margin-bottom="16pt" height="14mm" display-align="center">
1111
1158
  <fo:block font-size="10pt" color="{$color_blue}" margin-bottom="4pt">
1112
- Example: BASIC EMC PUBLICATION
1159
+ <xsl:choose>
1160
+ <xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal = 'true'">
1161
+ <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal[@language = $lang]))"/>
1162
+ </xsl:when>
1163
+ <xsl:otherwise><!-- horizontal is false -->
1164
+ <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:function[@language = $lang]))"/>
1165
+ </xsl:otherwise>
1166
+ </xsl:choose>
1167
+ <!-- Example: BASIC EMC PUBLICATION -->
1113
1168
  <!-- HORIZONTAL STANDARD -->
1114
1169
  <!-- Basic EMC Publication
1115
1170
  Basic Safety Publication
1116
1171
  Basic Environment Publication
1117
1172
  Basic Quality Assurance Publication -->
1118
1173
  </fo:block>
1119
- <xsl:if test="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr']">
1174
+ <xsl:if test="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr'] and $lang != 'fr'">
1120
1175
  <fo:block font-size="10pt" margin-bottom="10pt">
1121
- Example: PUBLICATION FONDAMENTALE EN CEM
1176
+ <xsl:choose>
1177
+ <xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal = 'true'">
1178
+ <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal[@language = 'fr']))"/>
1179
+ </xsl:when>
1180
+ <xsl:otherwise><!-- horizontal is false -->
1181
+ <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:function[@language = 'fr']))"/>
1182
+ </xsl:otherwise>
1183
+ </xsl:choose>
1184
+ <!-- Example: PUBLICATION FONDAMENTALE EN CEM -->
1122
1185
  <!-- NORME HORIZONTALE -->
1123
1186
  </fo:block>
1124
1187
  </xsl:if>
@@ -1367,6 +1430,35 @@
1367
1430
  <xsl:apply-templates/>
1368
1431
  </xsl:template>
1369
1432
 
1433
+
1434
+ <xsl:template match="iec:feedback-statement//iec:clause/iec:title" priority="2">
1435
+ <fo:block font-weight="bold" keep-with-next="always"><xsl:apply-templates/></fo:block>
1436
+ </xsl:template>
1437
+
1438
+ <xsl:template match="iec:feedback-statement//iec:clause/iec:p" priority="2">
1439
+ <fo:block margin-bottom="6pt"><xsl:apply-templates/></fo:block>
1440
+ </xsl:template>
1441
+
1442
+ <xsl:template match="iec:feedback-statement/iec:clause[not(iec:clause)]" priority="2">
1443
+ <fo:block span="all" text-align="justify">
1444
+ <xsl:if test="not(preceding-sibling::iec:clause)">
1445
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
1446
+ </xsl:if>
1447
+ <xsl:apply-templates/>
1448
+ </fo:block>
1449
+ </xsl:template>
1450
+
1451
+ <xsl:template match="iec:feedback-statement/iec:clause[iec:clause]" priority="2">
1452
+ <fo:block text-align="justify">
1453
+ <xsl:apply-templates/>
1454
+ </fo:block>
1455
+ </xsl:template>
1456
+ <xsl:template match="iec:feedback-statement/iec:clause/iec:clause" priority="3">
1457
+ <fo:block text-align="justify">
1458
+ <xsl:apply-templates/>
1459
+ </fo:block>
1460
+ </xsl:template>
1461
+
1370
1462
  <!-- ============================= -->
1371
1463
  <!-- CONTENTS -->
1372
1464
  <!-- ============================= -->
@@ -2545,6 +2637,7 @@
2545
2637
  </xsl:attribute-set><xsl:attribute-set name="term-style">
2546
2638
 
2547
2639
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
2640
+
2548
2641
 
2549
2642
 
2550
2643
 
@@ -3907,6 +4000,7 @@
3907
4000
  </fo:inline>
3908
4001
  </xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
3909
4002
  <fo:inline font-weight="bold">
4003
+
3910
4004
  <xsl:apply-templates/>
3911
4005
  </fo:inline>
3912
4006
  </xsl:template><xsl:template match="*[local-name()='sup']">
@@ -4311,6 +4405,11 @@
4311
4405
  </xsl:choose>
4312
4406
  </xsl:variable>
4313
4407
  <fo:inline xsl:use-attribute-sets="link-style">
4408
+
4409
+ <xsl:if test="ancestor::*[local-name()='feedback-statement']">
4410
+ <xsl:attribute name="color">blue</xsl:attribute>
4411
+ </xsl:if>
4412
+
4314
4413
  <xsl:choose>
4315
4414
  <xsl:when test="$target = ''">
4316
4415
  <xsl:apply-templates/>
@@ -4524,7 +4623,8 @@
4524
4623
  </fo:inline>
4525
4624
  </xsl:if>
4526
4625
  </xsl:template><xsl:template match="*[local-name() = 'figure']">
4527
- <fo:block-container id="{@id}">
4626
+ <fo:block-container id="{@id}">
4627
+
4528
4628
  <fo:block>
4529
4629
  <xsl:apply-templates/>
4530
4630
  </fo:block>
@@ -4575,7 +4675,7 @@
4575
4675
  <xsl:apply-templates mode="bookmarks"/>
4576
4676
  </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
4577
4677
  <xsl:apply-templates select="."/>
4578
- </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
4678
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
4579
4679
  <xsl:apply-templates mode="bookmarks"/>
4580
4680
  </xsl:template><xsl:template name="addBookmarks">
4581
4681
  <xsl:param name="contents"/>
@@ -5337,7 +5437,7 @@
5337
5437
  <fo:block id="{@id}">
5338
5438
  <xsl:apply-templates/>
5339
5439
  </fo:block>
5340
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
5440
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
5341
5441
 
5342
5442
  <fo:block id="{@id}">
5343
5443
  <xsl:apply-templates/>