metanorma-iec 2.7.4 → 2.7.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/iec/html/htmlstyle.css +22 -26
- data/lib/isodoc/iec/html/htmlstyle.scss +1 -1
- data/lib/isodoc/iec/iec.international-standard.xsl +190 -166
- data/lib/isodoc/iec/init.rb +3 -2
- data/lib/isodoc/iec/presentation_xml_convert.rb +23 -31
- data/lib/metanorma/iec/isodoc.rng +26 -19
- data/lib/metanorma/iec/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7657516c73cdbcac39c1faefe064527fb6414912ebde3cb96098764356e77dac
|
|
4
|
+
data.tar.gz: 7cc1780a198f0dafaf443225aef25bcee9ef60d077942c5d766137260c69b9c1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: da90f5be747b0a499ff0cc43c868c1bdef3ede6a4c43743d6b2199cd1610b9d7072de64b9317d5f1974fea29678e34e9eb00301764518aed6552074e8c2d0ff2
|
|
7
|
+
data.tar.gz: 7f939a47044e4c1d2fe22304f543f415c7fdd66f7e52067339859225341f483121736e45b7aa297c75d7f3f338e999c6fb25ef57c1cf803a806777430dbbf8f0
|
|
@@ -145,16 +145,6 @@ div.document-stage-band, div.document-type-band {
|
|
|
145
145
|
background-color: #333333;
|
|
146
146
|
}
|
|
147
147
|
|
|
148
|
-
a.FootnoteRef + a.FootnoteRef::before {
|
|
149
|
-
content: ", ";
|
|
150
|
-
vertical-align: super;
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
|
154
|
-
content: ", ";
|
|
155
|
-
vertical-align: super;
|
|
156
|
-
}
|
|
157
|
-
|
|
158
148
|
a.TableFootnoteRef, span.TableFootnoteRef,
|
|
159
149
|
a.FootnoteRef, span.FootnoteRef {
|
|
160
150
|
vertical-align: super;
|
|
@@ -699,10 +689,6 @@ p.TermNum {
|
|
|
699
689
|
}
|
|
700
690
|
}
|
|
701
691
|
|
|
702
|
-
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
703
|
-
font-family: {{bodyfont}};
|
|
704
|
-
font-weight: 400;
|
|
705
|
-
}
|
|
706
692
|
#toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
|
|
707
693
|
margin: 0;
|
|
708
694
|
padding: 0;
|
|
@@ -754,6 +740,10 @@ p.TermNum {
|
|
|
754
740
|
color: black;
|
|
755
741
|
}
|
|
756
742
|
}
|
|
743
|
+
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
744
|
+
font-family: {{bodyfont}};
|
|
745
|
+
font-weight: 400;
|
|
746
|
+
}
|
|
757
747
|
@media screen and (max-width: 768px) {
|
|
758
748
|
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
759
749
|
padding: 0 1.5em;
|
|
@@ -1165,6 +1155,13 @@ p.NormRef {
|
|
|
1165
1155
|
/*
|
|
1166
1156
|
3.6 Source Code + figures
|
|
1167
1157
|
*/
|
|
1158
|
+
.figure .SourceTitle,
|
|
1159
|
+
pre .SourceTitle,
|
|
1160
|
+
.pseudocode .SourceTitle {
|
|
1161
|
+
font-weight: 700;
|
|
1162
|
+
font-size: 1em;
|
|
1163
|
+
text-align: center;
|
|
1164
|
+
}
|
|
1168
1165
|
.figure,
|
|
1169
1166
|
pre,
|
|
1170
1167
|
.pseudocode {
|
|
@@ -1176,13 +1173,6 @@ pre,
|
|
|
1176
1173
|
overflow: auto;
|
|
1177
1174
|
font-size: {{monospacefontsize}};
|
|
1178
1175
|
}
|
|
1179
|
-
.figure .SourceTitle,
|
|
1180
|
-
pre .SourceTitle,
|
|
1181
|
-
.pseudocode .SourceTitle {
|
|
1182
|
-
font-weight: 700;
|
|
1183
|
-
font-size: 1em;
|
|
1184
|
-
text-align: center;
|
|
1185
|
-
}
|
|
1186
1176
|
|
|
1187
1177
|
pre {
|
|
1188
1178
|
font-family: {{monospacefont}};
|
|
@@ -1250,18 +1240,22 @@ pre {
|
|
|
1250
1240
|
padding: 0.5em;
|
|
1251
1241
|
margin: 2em 0 1em 0;
|
|
1252
1242
|
text-align: left;
|
|
1253
|
-
color: #424242;
|
|
1254
|
-
padding-left: 2em;
|
|
1255
|
-
text-align: left;
|
|
1256
1243
|
}
|
|
1257
1244
|
.example p {
|
|
1258
1245
|
margin: 0;
|
|
1259
1246
|
}
|
|
1247
|
+
.example {
|
|
1248
|
+
color: #424242;
|
|
1249
|
+
padding-left: 2em;
|
|
1250
|
+
}
|
|
1260
1251
|
.example .example-title {
|
|
1261
1252
|
font-weight: 700;
|
|
1262
1253
|
text-transform: uppercase;
|
|
1263
1254
|
margin-left: -1.5em;
|
|
1264
1255
|
}
|
|
1256
|
+
.example {
|
|
1257
|
+
text-align: left;
|
|
1258
|
+
}
|
|
1265
1259
|
.example .example-title {
|
|
1266
1260
|
margin-top: 0;
|
|
1267
1261
|
}
|
|
@@ -1283,7 +1277,6 @@ table {
|
|
|
1283
1277
|
margin-left: auto;
|
|
1284
1278
|
margin-right: auto;
|
|
1285
1279
|
padding-right: 2em;
|
|
1286
|
-
text-align: center;
|
|
1287
1280
|
}
|
|
1288
1281
|
table, table th, table td {
|
|
1289
1282
|
border: 1px solid black;
|
|
@@ -1295,6 +1288,9 @@ table th, table td {
|
|
|
1295
1288
|
table td.header {
|
|
1296
1289
|
font-weight: 400;
|
|
1297
1290
|
}
|
|
1291
|
+
table {
|
|
1292
|
+
text-align: center;
|
|
1293
|
+
}
|
|
1298
1294
|
table td,
|
|
1299
1295
|
table th {
|
|
1300
1296
|
font-size: 0.95em;
|
|
@@ -1324,7 +1320,7 @@ a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
|
|
|
1324
1320
|
font-size: {{footnotefontsize}};
|
|
1325
1321
|
}
|
|
1326
1322
|
|
|
1327
|
-
sup
|
|
1323
|
+
sup {
|
|
1328
1324
|
vertical-align: super;
|
|
1329
1325
|
font-size: 0.8em;
|
|
1330
1326
|
}
|
|
@@ -338,116 +338,12 @@
|
|
|
338
338
|
</fo:flow>
|
|
339
339
|
</fo:page-sequence> <!-- END: 1st Cover Page -->
|
|
340
340
|
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
<
|
|
344
|
-
|
|
345
|
-
<fo:block-container border="0.5pt solid black" margin-top="7mm">
|
|
346
|
-
<fo:block-container margin-left="2.5mm" margin-right="2.5mm" margin-top="1mm" margin-bottom="1mm">
|
|
347
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
348
|
-
<fo:table table-layout="fixed" width="100%">
|
|
349
|
-
<fo:table-column column-width="20mm"/>
|
|
350
|
-
<fo:table-column column-width="130mm"/>
|
|
351
|
-
<fo:table-body>
|
|
352
|
-
<fo:table-row>
|
|
353
|
-
<fo:table-cell>
|
|
354
|
-
<fo:block>
|
|
355
|
-
<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"/>
|
|
356
|
-
</fo:block>
|
|
357
|
-
</fo:table-cell>
|
|
358
|
-
<fo:table-cell font-size="10pt" font-weight="bold" display-align="after">
|
|
359
|
-
<fo:block margin-bottom="3pt">THIS PUBLICATION IS COPYRIGHT PROTECTED</fo:block>
|
|
360
|
-
<fo:block margin-bottom="10pt">
|
|
361
|
-
<!-- Example: Copyright © 2014 IEC, Geneva, Switzerland -->
|
|
362
|
-
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-year')]"/>
|
|
363
|
-
</fo:block>
|
|
364
|
-
</fo:table-cell>
|
|
365
|
-
</fo:table-row>
|
|
366
|
-
</fo:table-body>
|
|
367
|
-
</fo:table>
|
|
368
|
-
<fo:block>
|
|
369
|
-
<fo:block margin-bottom="8pt" text-align="justify">
|
|
370
|
-
<!-- Example: All rights reserved. Unless otherwise specified, no part of this publication may be reproduced or utilized in any form
|
|
371
|
-
or by any means, electronic or mechanical, including photocopying and microfilm, without permission in writing from
|
|
372
|
-
either IEC or IEC's member National Committee in the country of the requester. If you have any questions about IEC
|
|
373
|
-
copyright or have an enquiry about obtaining additional rights to this publication, please contact the address below or
|
|
374
|
-
your local IEC member National Committee for further information. -->
|
|
375
|
-
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-message')]"/>
|
|
376
|
-
</fo:block>
|
|
377
|
-
<!-- Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne peut être reproduite
|
|
378
|
-
ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique ou mécanique, y compris la photocopie
|
|
379
|
-
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
|
|
380
|
-
questions sur le copyright de l'IEC ou si vous désirez obtenir des droits supplémentaires sur cette publication, utilisez
|
|
381
|
-
les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pays de résidence. -->
|
|
382
|
-
<fo:block margin-bottom="8pt" text-align="justify">
|
|
383
|
-
<xsl:apply-templates select="$updated_document2_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-message')]"/>
|
|
384
|
-
</fo:block>
|
|
385
|
-
|
|
386
|
-
<xsl:variable name="telpos" select="count($updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-address')]/text()[contains(., 'Tel.')]/preceding-sibling::node())"/>
|
|
387
|
-
<fo:table table-layout="fixed" width="100%">
|
|
388
|
-
<fo:table-column column-width="59mm"/>
|
|
389
|
-
<fo:table-column column-width="90mm"/>
|
|
390
|
-
<fo:table-body>
|
|
391
|
-
<fo:table-row>
|
|
392
|
-
<fo:table-cell>
|
|
393
|
-
<fo:block>
|
|
394
|
-
<!-- Example: IEC Central Office
|
|
395
|
-
3, rue de Varembé
|
|
396
|
-
CH-1211 Geneva 20
|
|
397
|
-
Switzerland -->
|
|
398
|
-
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-name')]" mode="coverpage"/>
|
|
399
|
-
<xsl:choose>
|
|
400
|
-
<xsl:when test="$telpos != 0">
|
|
401
|
-
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-address')]/node()[position() < $telpos]" mode="coverpage"/>
|
|
402
|
-
</xsl:when>
|
|
403
|
-
<xsl:otherwise>
|
|
404
|
-
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-address')]" mode="coverpage"/>
|
|
405
|
-
</xsl:otherwise>
|
|
406
|
-
</xsl:choose>
|
|
407
|
-
</fo:block>
|
|
408
|
-
</fo:table-cell>
|
|
409
|
-
<fo:table-cell>
|
|
410
|
-
<fo:block>
|
|
411
|
-
<!-- Example: Tel.: +41 22 919 02 11
|
|
412
|
-
Fax: +41 22 919 0
|
|
413
|
-
info@iec.ch
|
|
414
|
-
www.iec.ch -->
|
|
415
|
-
<xsl:choose>
|
|
416
|
-
<xsl:when test="$telpos != 0">
|
|
417
|
-
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-address')]/node()[position() > $telpos]" mode="coverpage"/>
|
|
418
|
-
</xsl:when>
|
|
419
|
-
<xsl:otherwise> </xsl:otherwise>
|
|
420
|
-
</xsl:choose>
|
|
421
|
-
</fo:block>
|
|
422
|
-
</fo:table-cell>
|
|
423
|
-
</fo:table-row>
|
|
424
|
-
</fo:table-body>
|
|
425
|
-
</fo:table>
|
|
426
|
-
|
|
427
|
-
</fo:block>
|
|
428
|
-
</fo:block-container>
|
|
429
|
-
</fo:block-container>
|
|
430
|
-
</fo:block-container>
|
|
431
|
-
</fo:block>
|
|
432
|
-
|
|
433
|
-
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:feedback-statement"/> <!-- //mn:clause[not(@id) or @id != 'boilerplate-cenelec-attention'] -->
|
|
434
|
-
<fo:block span="all" border-bottom="0.5pt solid black"/>
|
|
435
|
-
<!-- About the IEC
|
|
436
|
-
The International Electrotechnical Commission (IEC) is the leading global organization that prepares and publishes
|
|
437
|
-
International Standards for all electrical, electronic and related technologies.
|
|
438
|
-
About IEC publications
|
|
439
|
-
The technical content of IEC publications is kept under constant review by the IEC. Please make sure that you have the
|
|
440
|
-
latest edition, a corrigenda or an amendment might have been published.
|
|
441
|
-
...
|
|
442
|
-
-->
|
|
443
|
-
<xsl:if test="$updated_document2_boilerplate/mn:boilerplate/mn:feedback-statement">
|
|
444
|
-
<xsl:apply-templates select="$updated_document2_boilerplate/mn:boilerplate/mn:feedback-statement"/>
|
|
445
|
-
<fo:block span="all"/>
|
|
446
|
-
</xsl:if>
|
|
447
|
-
|
|
448
|
-
</fo:flow>
|
|
449
|
-
</fo:page-sequence> <!-- END: 2nd Cover Page -->
|
|
341
|
+
<xsl:call-template name="inner-cover-page">
|
|
342
|
+
<xsl:with-param name="updated_document1_boilerplate" select="$updated_document1_boilerplate"/>
|
|
343
|
+
<xsl:with-param name="updated_document2_boilerplate" select="$updated_document2_boilerplate"/>
|
|
344
|
+
</xsl:call-template>
|
|
450
345
|
</xsl:if>
|
|
346
|
+
|
|
451
347
|
<xsl:variable name="lang_second" select="(//mn:metanorma)[2]/mn:bibdata/mn:language[@current = 'true']"/>
|
|
452
348
|
<!-- For 'Published' documents insert 3rd Cover Page
|
|
453
349
|
OR insert first Cover Page for FDIS -->
|
|
@@ -986,6 +882,120 @@
|
|
|
986
882
|
</xsl:if>
|
|
987
883
|
</xsl:template>
|
|
988
884
|
|
|
885
|
+
<xsl:template name="inner-cover-page">
|
|
886
|
+
<xsl:param name="updated_document1_boilerplate"/>
|
|
887
|
+
<xsl:param name="updated_document2_boilerplate"/>
|
|
888
|
+
<!-- 2nd Cover Page -->
|
|
889
|
+
<fo:page-sequence master-reference="cover_2nd" force-page-count="no-force" font-size="8pt">
|
|
890
|
+
<fo:flow flow-name="xsl-region-body">
|
|
891
|
+
<fo:block span="all">
|
|
892
|
+
<fo:block-container border="0.5pt solid black" margin-top="7mm">
|
|
893
|
+
<fo:block-container margin-left="2.5mm" margin-right="2.5mm" margin-top="1mm" margin-bottom="1mm">
|
|
894
|
+
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
895
|
+
<fo:table table-layout="fixed" width="100%">
|
|
896
|
+
<fo:table-column column-width="20mm"/>
|
|
897
|
+
<fo:table-column column-width="130mm"/>
|
|
898
|
+
<fo:table-body>
|
|
899
|
+
<fo:table-row>
|
|
900
|
+
<fo:table-cell>
|
|
901
|
+
<fo:block>
|
|
902
|
+
<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"/>
|
|
903
|
+
</fo:block>
|
|
904
|
+
</fo:table-cell>
|
|
905
|
+
<fo:table-cell font-size="10pt" font-weight="bold" display-align="after">
|
|
906
|
+
<fo:block margin-bottom="3pt">THIS PUBLICATION IS COPYRIGHT PROTECTED</fo:block>
|
|
907
|
+
<fo:block margin-bottom="10pt">
|
|
908
|
+
<!-- Example: Copyright © 2014 IEC, Geneva, Switzerland -->
|
|
909
|
+
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-year')]"/>
|
|
910
|
+
</fo:block>
|
|
911
|
+
</fo:table-cell>
|
|
912
|
+
</fo:table-row>
|
|
913
|
+
</fo:table-body>
|
|
914
|
+
</fo:table>
|
|
915
|
+
<fo:block>
|
|
916
|
+
<fo:block margin-bottom="8pt" text-align="justify">
|
|
917
|
+
<!-- Example: All rights reserved. Unless otherwise specified, no part of this publication may be reproduced or utilized in any form
|
|
918
|
+
or by any means, electronic or mechanical, including photocopying and microfilm, without permission in writing from
|
|
919
|
+
either IEC or IEC's member National Committee in the country of the requester. If you have any questions about IEC
|
|
920
|
+
copyright or have an enquiry about obtaining additional rights to this publication, please contact the address below or
|
|
921
|
+
your local IEC member National Committee for further information. -->
|
|
922
|
+
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-message')]"/>
|
|
923
|
+
</fo:block>
|
|
924
|
+
<!-- Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne peut être reproduite
|
|
925
|
+
ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique ou mécanique, y compris la photocopie
|
|
926
|
+
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
|
|
927
|
+
questions sur le copyright de l'IEC ou si vous désirez obtenir des droits supplémentaires sur cette publication, utilisez
|
|
928
|
+
les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pays de résidence. -->
|
|
929
|
+
<fo:block margin-bottom="8pt" text-align="justify">
|
|
930
|
+
<xsl:apply-templates select="$updated_document2_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-message')]"/>
|
|
931
|
+
</fo:block>
|
|
932
|
+
|
|
933
|
+
<xsl:variable name="telpos" select="count($updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-address')]/text()[contains(., 'Tel.')]/preceding-sibling::node())"/>
|
|
934
|
+
<fo:table table-layout="fixed" width="100%">
|
|
935
|
+
<fo:table-column column-width="59mm"/>
|
|
936
|
+
<fo:table-column column-width="90mm"/>
|
|
937
|
+
<fo:table-body>
|
|
938
|
+
<fo:table-row>
|
|
939
|
+
<fo:table-cell>
|
|
940
|
+
<fo:block>
|
|
941
|
+
<!-- Example: IEC Central Office
|
|
942
|
+
3, rue de Varembé
|
|
943
|
+
CH-1211 Geneva 20
|
|
944
|
+
Switzerland -->
|
|
945
|
+
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-name')]" mode="coverpage"/>
|
|
946
|
+
<xsl:choose>
|
|
947
|
+
<xsl:when test="$telpos != 0">
|
|
948
|
+
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-address')]/node()[position() < $telpos]" mode="coverpage"/>
|
|
949
|
+
</xsl:when>
|
|
950
|
+
<xsl:otherwise>
|
|
951
|
+
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-address')]" mode="coverpage"/>
|
|
952
|
+
</xsl:otherwise>
|
|
953
|
+
</xsl:choose>
|
|
954
|
+
</fo:block>
|
|
955
|
+
</fo:table-cell>
|
|
956
|
+
<fo:table-cell>
|
|
957
|
+
<fo:block>
|
|
958
|
+
<!-- Example: Tel.: +41 22 919 02 11
|
|
959
|
+
Fax: +41 22 919 0
|
|
960
|
+
info@iec.ch
|
|
961
|
+
www.iec.ch -->
|
|
962
|
+
<xsl:choose>
|
|
963
|
+
<xsl:when test="$telpos != 0">
|
|
964
|
+
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:copyright-statement/mn:clause/mn:p[contains(@id, 'boilerplate-address')]/node()[position() > $telpos]" mode="coverpage"/>
|
|
965
|
+
</xsl:when>
|
|
966
|
+
<xsl:otherwise> </xsl:otherwise>
|
|
967
|
+
</xsl:choose>
|
|
968
|
+
</fo:block>
|
|
969
|
+
</fo:table-cell>
|
|
970
|
+
</fo:table-row>
|
|
971
|
+
</fo:table-body>
|
|
972
|
+
</fo:table>
|
|
973
|
+
|
|
974
|
+
</fo:block>
|
|
975
|
+
</fo:block-container>
|
|
976
|
+
</fo:block-container>
|
|
977
|
+
</fo:block-container>
|
|
978
|
+
</fo:block>
|
|
979
|
+
|
|
980
|
+
<xsl:apply-templates select="$updated_document1_boilerplate/mn:boilerplate/mn:feedback-statement"/> <!-- //mn:clause[not(@id) or @id != 'boilerplate-cenelec-attention'] -->
|
|
981
|
+
<fo:block span="all" border-bottom="0.5pt solid black"/>
|
|
982
|
+
<!-- About the IEC
|
|
983
|
+
The International Electrotechnical Commission (IEC) is the leading global organization that prepares and publishes
|
|
984
|
+
International Standards for all electrical, electronic and related technologies.
|
|
985
|
+
About IEC publications
|
|
986
|
+
The technical content of IEC publications is kept under constant review by the IEC. Please make sure that you have the
|
|
987
|
+
latest edition, a corrigenda or an amendment might have been published.
|
|
988
|
+
...
|
|
989
|
+
-->
|
|
990
|
+
<xsl:if test="$updated_document2_boilerplate/mn:boilerplate/mn:feedback-statement">
|
|
991
|
+
<xsl:apply-templates select="$updated_document2_boilerplate/mn:boilerplate/mn:feedback-statement"/>
|
|
992
|
+
<fo:block span="all"/>
|
|
993
|
+
</xsl:if>
|
|
994
|
+
|
|
995
|
+
</fo:flow>
|
|
996
|
+
</fo:page-sequence> <!-- END: 2nd Cover Page -->
|
|
997
|
+
</xsl:template> <!-- END: inner-cover-page -->
|
|
998
|
+
|
|
989
999
|
<xsl:template match="mn:pagebreak" priority="2">
|
|
990
1000
|
<xsl:copy-of select="."/>
|
|
991
1001
|
</xsl:template>
|
|
@@ -2514,6 +2524,7 @@
|
|
|
2514
2524
|
<xsl:variable name="en_dash">–</xsl:variable>
|
|
2515
2525
|
<xsl:variable name="em_dash">—</xsl:variable>
|
|
2516
2526
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
|
2527
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
|
2517
2528
|
<xsl:variable name="cr"> </xsl:variable>
|
|
2518
2529
|
<xsl:variable name="lf">
|
|
2519
2530
|
</xsl:variable>
|
|
@@ -3056,6 +3067,7 @@
|
|
|
3056
3067
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
|
3057
3068
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
|
3058
3069
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3070
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3059
3071
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
|
3060
3072
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
|
3061
3073
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
|
@@ -3070,10 +3082,10 @@
|
|
|
3070
3082
|
|
|
3071
3083
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
|
3072
3084
|
|
|
3073
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
|
3085
|
+
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
|
|
3074
3086
|
<xsl:copy>
|
|
3075
3087
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
|
3076
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
|
3088
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
|
3077
3089
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
|
3078
3090
|
</xsl:copy>
|
|
3079
3091
|
</xsl:template>
|
|
@@ -3922,7 +3934,6 @@
|
|
|
3922
3934
|
</xsl:attribute-set> <!-- feedback-statement-title-style -->
|
|
3923
3935
|
|
|
3924
3936
|
<xsl:template name="refine_feedback-statement-title-style">
|
|
3925
|
-
|
|
3926
3937
|
</xsl:template>
|
|
3927
3938
|
|
|
3928
3939
|
<xsl:attribute-set name="feedback-statement-p-style">
|
|
@@ -4187,6 +4198,12 @@
|
|
|
4187
4198
|
<xsl:template name="refine_sourcecode-style">
|
|
4188
4199
|
</xsl:template> <!-- refine_sourcecode-style -->
|
|
4189
4200
|
|
|
4201
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
|
4202
|
+
</xsl:attribute-set>
|
|
4203
|
+
|
|
4204
|
+
<xsl:template name="refine_sourcecode-number-style">
|
|
4205
|
+
</xsl:template>
|
|
4206
|
+
|
|
4190
4207
|
<xsl:attribute-set name="sourcecode-name-style">
|
|
4191
4208
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
4192
4209
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -5574,6 +5591,12 @@
|
|
|
5574
5591
|
<xsl:template name="refine_term-name-style">
|
|
5575
5592
|
</xsl:template>
|
|
5576
5593
|
|
|
5594
|
+
<xsl:attribute-set name="preferred-style">
|
|
5595
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
|
5596
|
+
|
|
5597
|
+
<xsl:template name="refine_preferred-style">
|
|
5598
|
+
</xsl:template>
|
|
5599
|
+
|
|
5577
5600
|
<xsl:attribute-set name="preferred-block-style">
|
|
5578
5601
|
<xsl:attribute name="line-height">1.1</xsl:attribute>
|
|
5579
5602
|
<xsl:attribute name="space-before">14pt</xsl:attribute>
|
|
@@ -6229,6 +6252,12 @@
|
|
|
6229
6252
|
<xsl:call-template name="setBordersTableArray"/>
|
|
6230
6253
|
</xsl:template> <!-- refine_table-style -->
|
|
6231
6254
|
|
|
6255
|
+
<xsl:attribute-set name="table-number-style">
|
|
6256
|
+
</xsl:attribute-set>
|
|
6257
|
+
|
|
6258
|
+
<xsl:template name="refine_table-number-style">
|
|
6259
|
+
</xsl:template>
|
|
6260
|
+
|
|
6232
6261
|
<xsl:attribute-set name="table-name-style">
|
|
6233
6262
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
6234
6263
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -6711,7 +6740,7 @@
|
|
|
6711
6740
|
|
|
6712
6741
|
</fo:block>
|
|
6713
6742
|
|
|
6714
|
-
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
6743
|
+
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
6715
6744
|
<xsl:if test="$continued = 'true'">
|
|
6716
6745
|
|
|
6717
6746
|
<!-- to prevent the error 'THead element may contain only TR elements' -->
|
|
@@ -9791,18 +9820,25 @@
|
|
|
9791
9820
|
</xsl:attribute-set> <!-- quote-style -->
|
|
9792
9821
|
|
|
9793
9822
|
<xsl:template name="refine_quote-style">
|
|
9794
|
-
</xsl:template>
|
|
9823
|
+
</xsl:template> <!-- refine_quote-style -->
|
|
9795
9824
|
|
|
9796
9825
|
<xsl:attribute-set name="quote-source-style">
|
|
9797
9826
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
9798
9827
|
<xsl:attribute name="margin-top">15pt</xsl:attribute>
|
|
9799
9828
|
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
|
9800
9829
|
<xsl:attribute name="margin-right">12mm</xsl:attribute>
|
|
9801
|
-
</xsl:attribute-set>
|
|
9830
|
+
</xsl:attribute-set> <!-- quote-source-style -->
|
|
9802
9831
|
|
|
9803
9832
|
<xsl:template name="refine_quote-source-style">
|
|
9804
9833
|
</xsl:template>
|
|
9805
9834
|
|
|
9835
|
+
<xsl:attribute-set name="source-style">
|
|
9836
|
+
</xsl:attribute-set> <!-- source-style -->
|
|
9837
|
+
|
|
9838
|
+
<xsl:template name="refine_source-style">
|
|
9839
|
+
|
|
9840
|
+
</xsl:template> <!-- refine_source-style -->
|
|
9841
|
+
|
|
9806
9842
|
<!-- ====== -->
|
|
9807
9843
|
<!-- quote -->
|
|
9808
9844
|
<!-- source -->
|
|
@@ -9850,7 +9886,9 @@
|
|
|
9850
9886
|
</xsl:if>
|
|
9851
9887
|
<xsl:choose>
|
|
9852
9888
|
<xsl:when test="not(parent::quote)">
|
|
9853
|
-
<fo:block>
|
|
9889
|
+
<fo:block xsl:use-attribute-sets="source-style">
|
|
9890
|
+
<xsl:call-template name="refine_source-style"/>
|
|
9891
|
+
|
|
9854
9892
|
<xsl:call-template name="insert_basic_link">
|
|
9855
9893
|
<xsl:with-param name="element">
|
|
9856
9894
|
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
@@ -9897,6 +9935,12 @@
|
|
|
9897
9935
|
<xsl:template name="refine_figure-style">
|
|
9898
9936
|
</xsl:template>
|
|
9899
9937
|
|
|
9938
|
+
<xsl:attribute-set name="figure-number-style">
|
|
9939
|
+
</xsl:attribute-set>
|
|
9940
|
+
|
|
9941
|
+
<xsl:template name="refine_figure-number-style">
|
|
9942
|
+
</xsl:template>
|
|
9943
|
+
|
|
9900
9944
|
<xsl:attribute-set name="figure-name-style">
|
|
9901
9945
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
9902
9946
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -11962,7 +12006,7 @@
|
|
|
11962
12006
|
<xsl:attribute name="baseline-shift">15%</xsl:attribute>
|
|
11963
12007
|
</xsl:if>
|
|
11964
12008
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
|
11965
|
-
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]"
|
|
12009
|
+
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
|
|
11966
12010
|
</xsl:template> <!-- refine_fn-reference-style -->
|
|
11967
12011
|
|
|
11968
12012
|
<xsl:attribute-set name="fn-style">
|
|
@@ -11973,7 +12017,9 @@
|
|
|
11973
12017
|
</xsl:template>
|
|
11974
12018
|
|
|
11975
12019
|
<xsl:attribute-set name="fn-num-style">
|
|
12020
|
+
<xsl:attribute name="role">Reference</xsl:attribute>
|
|
11976
12021
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
12022
|
+
<xsl:attribute name="font-size">65%</xsl:attribute>
|
|
11977
12023
|
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
11978
12024
|
<xsl:attribute name="baseline-shift">15%</xsl:attribute>
|
|
11979
12025
|
</xsl:attribute-set> <!-- fn-num-style -->
|
|
@@ -12046,33 +12092,16 @@
|
|
|
12046
12092
|
<xsl:variable name="ref_id" select="@target"/>
|
|
12047
12093
|
|
|
12048
12094
|
<xsl:variable name="footnote_inline">
|
|
12049
|
-
<fo:inline
|
|
12050
|
-
|
|
12051
|
-
<xsl:variable name="fn_styles">
|
|
12052
|
-
<xsl:choose>
|
|
12053
|
-
<xsl:when test="ancestor::mn:bibitem">
|
|
12054
|
-
<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
|
|
12055
|
-
<xsl:call-template name="refine_bibitem-note-fn-style"/>
|
|
12056
|
-
</fn_styles>
|
|
12057
|
-
</xsl:when>
|
|
12058
|
-
<xsl:otherwise>
|
|
12059
|
-
<fn_styles xsl:use-attribute-sets="fn-num-style">
|
|
12060
|
-
<xsl:call-template name="refine_fn-num-style"/>
|
|
12061
|
-
</fn_styles>
|
|
12062
|
-
</xsl:otherwise>
|
|
12063
|
-
</xsl:choose>
|
|
12064
|
-
</xsl:variable>
|
|
12095
|
+
<fo:inline xsl:use-attribute-sets="fn-num-style">
|
|
12065
12096
|
|
|
12066
|
-
<xsl:
|
|
12067
|
-
<xsl:copy-of select="."/>
|
|
12068
|
-
</xsl:for-each>
|
|
12097
|
+
<xsl:call-template name="refine_fn-num-style"/>
|
|
12069
12098
|
|
|
12070
12099
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
|
12071
12100
|
<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
|
|
12072
12101
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
|
12073
12102
|
</xsl:if> -->
|
|
12074
12103
|
|
|
12075
|
-
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]"
|
|
12104
|
+
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
|
|
12076
12105
|
|
|
12077
12106
|
<xsl:call-template name="insert_basic_link">
|
|
12078
12107
|
<xsl:with-param name="element">
|
|
@@ -12376,33 +12405,6 @@
|
|
|
12376
12405
|
<xsl:template name="refine_bibitem-non-normative-list-body-style">
|
|
12377
12406
|
</xsl:template>
|
|
12378
12407
|
|
|
12379
|
-
<!-- footnote reference number for bibitem, in the text -->
|
|
12380
|
-
<xsl:attribute-set name="bibitem-note-fn-style">
|
|
12381
|
-
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
12382
|
-
<xsl:attribute name="font-size">65%</xsl:attribute>
|
|
12383
|
-
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
12384
|
-
<xsl:attribute name="baseline-shift">15%</xsl:attribute>
|
|
12385
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-style -->
|
|
12386
|
-
|
|
12387
|
-
<xsl:template name="refine_bibitem-note-fn-style">
|
|
12388
|
-
</xsl:template>
|
|
12389
|
-
|
|
12390
|
-
<!-- footnote number on the page bottom -->
|
|
12391
|
-
<xsl:attribute-set name="bibitem-note-fn-number-style">
|
|
12392
|
-
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
|
12393
|
-
<xsl:attribute name="baseline-shift">15%</xsl:attribute>
|
|
12394
|
-
<xsl:attribute name="padding-right">3mm</xsl:attribute>
|
|
12395
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
|
|
12396
|
-
|
|
12397
|
-
<!-- footnote body (text) on the page bottom -->
|
|
12398
|
-
<xsl:attribute-set name="bibitem-note-fn-body-style">
|
|
12399
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
12400
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
12401
|
-
<xsl:attribute name="start-indent">0pt</xsl:attribute>
|
|
12402
|
-
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
12403
|
-
<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
|
|
12404
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
|
|
12405
|
-
|
|
12406
12408
|
<xsl:attribute-set name="references-non-normative-style">
|
|
12407
12409
|
</xsl:attribute-set> <!-- references-non-normative-style -->
|
|
12408
12410
|
|
|
@@ -12486,7 +12488,7 @@
|
|
|
12486
12488
|
|
|
12487
12489
|
<fo:list-item>
|
|
12488
12490
|
<fo:list-item-label end-indent="label-end()">
|
|
12489
|
-
<fo:block role="SKIP">
|
|
12491
|
+
<fo:block role="SKIP" id="__internal_layout__bibitem_{@id}_{generate-id()}">
|
|
12490
12492
|
<fo:inline role="SKIP">
|
|
12491
12493
|
<xsl:apply-templates select="mn:biblio-tag">
|
|
12492
12494
|
<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
|
|
@@ -14802,10 +14804,28 @@
|
|
|
14802
14804
|
</xsl:choose>
|
|
14803
14805
|
</xsl:template>
|
|
14804
14806
|
|
|
14807
|
+
<xsl:attribute-set name="clause-style">
|
|
14808
|
+
|
|
14809
|
+
</xsl:attribute-set>
|
|
14810
|
+
|
|
14811
|
+
<xsl:template name="refine_clause-style">
|
|
14812
|
+
<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
|
|
14813
|
+
<!-- <xsl:if test="$namespace = 'rsd'">
|
|
14814
|
+
<xsl:variable name="level">
|
|
14815
|
+
<xsl:call-template name="getLevel">
|
|
14816
|
+
<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
|
|
14817
|
+
</xsl:call-template>
|
|
14818
|
+
</xsl:variable>
|
|
14819
|
+
<xsl:if test="$level >= 4">
|
|
14820
|
+
<xsl:attribute name="margin-left">13mm</xsl:attribute>
|
|
14821
|
+
</xsl:if>
|
|
14822
|
+
</xsl:if> -->
|
|
14823
|
+
</xsl:template>
|
|
14824
|
+
|
|
14805
14825
|
<!-- main sections -->
|
|
14806
14826
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
|
14807
14827
|
<xsl:call-template name="setNamedDestination"/>
|
|
14808
|
-
<fo:block>
|
|
14828
|
+
<fo:block role="Sect">
|
|
14809
14829
|
<xsl:call-template name="setId"/>
|
|
14810
14830
|
|
|
14811
14831
|
<xsl:call-template name="sections_element_style"/>
|
|
@@ -14929,6 +14949,10 @@
|
|
|
14929
14949
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
|
14930
14950
|
</xsl:template>
|
|
14931
14951
|
|
|
14952
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
|
14953
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
|
14954
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
|
14955
|
+
|
|
14932
14956
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
|
14933
14957
|
<xsl:template name="insert_basic_link">
|
|
14934
14958
|
<xsl:param name="element"/>
|
data/lib/isodoc/iec/init.rb
CHANGED
|
@@ -21,8 +21,9 @@ module IsoDoc
|
|
|
21
21
|
end
|
|
22
22
|
|
|
23
23
|
def bibrenderer
|
|
24
|
-
::Relaton::Render::Iec::General
|
|
25
|
-
|
|
24
|
+
::Relaton::Render::Iec::General
|
|
25
|
+
.new(options.merge(language: @lang, script: @script,
|
|
26
|
+
i18nhash: @i18n.get))
|
|
26
27
|
end
|
|
27
28
|
|
|
28
29
|
def convert1(docxml, filename, dir)
|
|
@@ -69,28 +69,22 @@ module IsoDoc
|
|
|
69
69
|
|
|
70
70
|
def insert_middle_title(docxml)
|
|
71
71
|
ins = docxml.at(ns("//preface/clause[@type = 'toc']")) or return
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
title2 and title2out = <<~OUTPUT
|
|
75
|
-
<p class="zzSTDTitle1"> </p>
|
|
76
|
-
<p class="zzSTDTitle2"><strong>#{title2}</strong></p>
|
|
77
|
-
OUTPUT
|
|
78
|
-
title1 &&= Metanorma::Utils.case_transform_xml(title1, :upcase)
|
|
79
|
-
ins.next = <<~OUTPUT
|
|
80
|
-
<pagebreak/><p class="zzSTDTitle1">#{@i18n.get['IEC']}</p>
|
|
81
|
-
<p class="zzSTDTitle1">____________</p><p class="zzSTDTitle1"> </p>
|
|
82
|
-
<p class="zzSTDTitle1"><strong>#{title1}</strong></p>#{title2out}
|
|
83
|
-
<p class="zzSTDTitle1"> </p>
|
|
84
|
-
OUTPUT
|
|
72
|
+
title = populate_template(preface_title_template, nil) or return
|
|
73
|
+
ins.next = title
|
|
85
74
|
end
|
|
86
75
|
|
|
87
|
-
def
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
76
|
+
def preface_title_template
|
|
77
|
+
<<~OUTPUT
|
|
78
|
+
<pagebreak/><p class="zzSTDTitle1">{{ labels["IEC"] }}</p>
|
|
79
|
+
<p class="zzSTDTitle1">____________</p><p class="zzSTDTitle1"> </p>
|
|
80
|
+
<p class='zzSTDTitle1'><strong>{% if doctitleintro %}{{ doctitleintro | upcase -}}
|
|
81
|
+
— {% endif %}{{ doctitlemain | upcase }}{% if doctitlepart %} —{% endif %}</strong></p>
|
|
82
|
+
{% if doctitlepart %}<p class='zzSTDTitle1'> </p>
|
|
83
|
+
<p class='zzSTDTitle2'><strong>{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif -%}
|
|
84
|
+
{{ doctitlepart }}</strong><p>
|
|
85
|
+
{% endif %}
|
|
86
|
+
<p class='zzSTDTitle1'> </p>
|
|
87
|
+
OUTPUT
|
|
94
88
|
end
|
|
95
89
|
|
|
96
90
|
def middle_title_part(title1, title2)
|
|
@@ -103,18 +97,16 @@ module IsoDoc
|
|
|
103
97
|
[title1, title2]
|
|
104
98
|
end
|
|
105
99
|
|
|
106
|
-
def
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
100
|
+
def middle_title_template
|
|
101
|
+
<<~OUTPUT
|
|
102
|
+
<p class='zzSTDTitle1'><strong>{% if doctitleintro %}{{ doctitleintro -}}
|
|
103
|
+
— {% endif %}{{ doctitlemain }}{% if doctitlepart %} —{% endif %}</strong></p>
|
|
104
|
+
{% if doctitlepart %}<p class='zzSTDTitle1'> </p>
|
|
105
|
+
<p class='zzSTDTitle2'><strong>{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif -%}
|
|
106
|
+
{{ doctitlepart }}</strong><p>
|
|
107
|
+
{% endif %}
|
|
113
108
|
<p class='zzSTDTitle1'> </p>
|
|
114
|
-
|
|
115
|
-
TITLE
|
|
116
|
-
ret += "<p class='zzSTDTitle1'> </p>"
|
|
117
|
-
s.add_first_child ret
|
|
109
|
+
OUTPUT
|
|
118
110
|
end
|
|
119
111
|
|
|
120
112
|
def ul_label_list(_elem)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
|
3
|
-
<!-- VERSION v2.1.
|
|
3
|
+
<!-- VERSION v2.1.3 -->
|
|
4
4
|
|
|
5
5
|
<!--
|
|
6
6
|
ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
|
|
@@ -455,14 +455,7 @@ normative or informative references, some split references into sections organiz
|
|
|
455
455
|
</ref>
|
|
456
456
|
</zeroOrMore>
|
|
457
457
|
<zeroOrMore>
|
|
458
|
-
<ref name="
|
|
459
|
-
<a:documentation>Bibliographic item cited in the document</a:documentation>
|
|
460
|
-
</ref>
|
|
461
|
-
<zeroOrMore>
|
|
462
|
-
<ref name="note">
|
|
463
|
-
<a:documentation>Annotation of the bibliographic item</a:documentation>
|
|
464
|
-
</ref>
|
|
465
|
-
</zeroOrMore>
|
|
458
|
+
<ref name="ReferenceEntry"/>
|
|
466
459
|
</zeroOrMore>
|
|
467
460
|
<zeroOrMore>
|
|
468
461
|
<ref name="references">
|
|
@@ -604,18 +597,21 @@ gives an explicit page orientation</a:documentation>
|
|
|
604
597
|
</element>
|
|
605
598
|
</optional>
|
|
606
599
|
</define>
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
<attribute name="hiddenref">
|
|
613
|
-
<a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
|
|
600
|
+
<define name="FnAttributes">
|
|
601
|
+
<ref name="RequiredId"/>
|
|
602
|
+
<optional>
|
|
603
|
+
<attribute name="hiddenref">
|
|
604
|
+
<a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
|
|
614
605
|
This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
|
|
615
|
-
|
|
606
|
+
<data type="boolean"/>
|
|
607
|
+
</attribute>
|
|
608
|
+
</optional>
|
|
609
|
+
<attribute name="reference">
|
|
610
|
+
<a:documentation>The number of the footnote, used to identify it visually</a:documentation>
|
|
616
611
|
</attribute>
|
|
617
|
-
</
|
|
618
|
-
</
|
|
612
|
+
</define>
|
|
613
|
+
</include>
|
|
614
|
+
<!-- end overrides -->
|
|
619
615
|
<define name="TdAttributes" combine="interleave">
|
|
620
616
|
<ref name="RequiredId"/>
|
|
621
617
|
<optional>
|
|
@@ -853,6 +849,17 @@ titlecase, or lowercase</a:documentation>
|
|
|
853
849
|
<value>informative</value>
|
|
854
850
|
</choice>
|
|
855
851
|
</define>
|
|
852
|
+
<define name="ReferenceEntry">
|
|
853
|
+
<a:documentation>Entry in bibliography</a:documentation>
|
|
854
|
+
<ref name="doc_bibitem">
|
|
855
|
+
<a:documentation>Bibliographic item cited in the document</a:documentation>
|
|
856
|
+
</ref>
|
|
857
|
+
<zeroOrMore>
|
|
858
|
+
<ref name="note">
|
|
859
|
+
<a:documentation>Annotation of the bibliographic item</a:documentation>
|
|
860
|
+
</ref>
|
|
861
|
+
</zeroOrMore>
|
|
862
|
+
</define>
|
|
856
863
|
<define name="doc_bibitem">
|
|
857
864
|
<a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
|
|
858
865
|
<element name="bibitem">
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-iec
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.7.
|
|
4
|
+
version: 2.7.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-09-
|
|
11
|
+
date: 2025-09-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-iso
|