metanorma-iec 2.7.5 → 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 +1 -1
- data/lib/isodoc/iec/html/htmlstyle.scss +1 -1
- data/lib/isodoc/iec/iec.international-standard.xsl +148 -161
- data/lib/isodoc/iec/init.rb +3 -2
- data/lib/isodoc/iec/presentation_xml_convert.rb +0 -43
- 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
|
|
@@ -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>
|
|
@@ -3924,7 +3934,6 @@
|
|
|
3924
3934
|
</xsl:attribute-set> <!-- feedback-statement-title-style -->
|
|
3925
3935
|
|
|
3926
3936
|
<xsl:template name="refine_feedback-statement-title-style">
|
|
3927
|
-
|
|
3928
3937
|
</xsl:template>
|
|
3929
3938
|
|
|
3930
3939
|
<xsl:attribute-set name="feedback-statement-p-style">
|
|
@@ -9811,18 +9820,25 @@
|
|
|
9811
9820
|
</xsl:attribute-set> <!-- quote-style -->
|
|
9812
9821
|
|
|
9813
9822
|
<xsl:template name="refine_quote-style">
|
|
9814
|
-
</xsl:template>
|
|
9823
|
+
</xsl:template> <!-- refine_quote-style -->
|
|
9815
9824
|
|
|
9816
9825
|
<xsl:attribute-set name="quote-source-style">
|
|
9817
9826
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
9818
9827
|
<xsl:attribute name="margin-top">15pt</xsl:attribute>
|
|
9819
9828
|
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
|
9820
9829
|
<xsl:attribute name="margin-right">12mm</xsl:attribute>
|
|
9821
|
-
</xsl:attribute-set>
|
|
9830
|
+
</xsl:attribute-set> <!-- quote-source-style -->
|
|
9822
9831
|
|
|
9823
9832
|
<xsl:template name="refine_quote-source-style">
|
|
9824
9833
|
</xsl:template>
|
|
9825
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
|
+
|
|
9826
9842
|
<!-- ====== -->
|
|
9827
9843
|
<!-- quote -->
|
|
9828
9844
|
<!-- source -->
|
|
@@ -9870,7 +9886,9 @@
|
|
|
9870
9886
|
</xsl:if>
|
|
9871
9887
|
<xsl:choose>
|
|
9872
9888
|
<xsl:when test="not(parent::quote)">
|
|
9873
|
-
<fo:block>
|
|
9889
|
+
<fo:block xsl:use-attribute-sets="source-style">
|
|
9890
|
+
<xsl:call-template name="refine_source-style"/>
|
|
9891
|
+
|
|
9874
9892
|
<xsl:call-template name="insert_basic_link">
|
|
9875
9893
|
<xsl:with-param name="element">
|
|
9876
9894
|
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
@@ -11988,7 +12006,7 @@
|
|
|
11988
12006
|
<xsl:attribute name="baseline-shift">15%</xsl:attribute>
|
|
11989
12007
|
</xsl:if>
|
|
11990
12008
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
|
11991
|
-
<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> -->
|
|
11992
12010
|
</xsl:template> <!-- refine_fn-reference-style -->
|
|
11993
12011
|
|
|
11994
12012
|
<xsl:attribute-set name="fn-style">
|
|
@@ -11999,7 +12017,9 @@
|
|
|
11999
12017
|
</xsl:template>
|
|
12000
12018
|
|
|
12001
12019
|
<xsl:attribute-set name="fn-num-style">
|
|
12020
|
+
<xsl:attribute name="role">Reference</xsl:attribute>
|
|
12002
12021
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
12022
|
+
<xsl:attribute name="font-size">65%</xsl:attribute>
|
|
12003
12023
|
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
12004
12024
|
<xsl:attribute name="baseline-shift">15%</xsl:attribute>
|
|
12005
12025
|
</xsl:attribute-set> <!-- fn-num-style -->
|
|
@@ -12072,33 +12092,16 @@
|
|
|
12072
12092
|
<xsl:variable name="ref_id" select="@target"/>
|
|
12073
12093
|
|
|
12074
12094
|
<xsl:variable name="footnote_inline">
|
|
12075
|
-
<fo:inline
|
|
12095
|
+
<fo:inline xsl:use-attribute-sets="fn-num-style">
|
|
12076
12096
|
|
|
12077
|
-
<xsl:
|
|
12078
|
-
<xsl:choose>
|
|
12079
|
-
<xsl:when test="ancestor::mn:bibitem">
|
|
12080
|
-
<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
|
|
12081
|
-
<xsl:call-template name="refine_bibitem-note-fn-style"/>
|
|
12082
|
-
</fn_styles>
|
|
12083
|
-
</xsl:when>
|
|
12084
|
-
<xsl:otherwise>
|
|
12085
|
-
<fn_styles xsl:use-attribute-sets="fn-num-style">
|
|
12086
|
-
<xsl:call-template name="refine_fn-num-style"/>
|
|
12087
|
-
</fn_styles>
|
|
12088
|
-
</xsl:otherwise>
|
|
12089
|
-
</xsl:choose>
|
|
12090
|
-
</xsl:variable>
|
|
12091
|
-
|
|
12092
|
-
<xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*">
|
|
12093
|
-
<xsl:copy-of select="."/>
|
|
12094
|
-
</xsl:for-each>
|
|
12097
|
+
<xsl:call-template name="refine_fn-num-style"/>
|
|
12095
12098
|
|
|
12096
12099
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
|
12097
12100
|
<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
|
|
12098
12101
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
|
12099
12102
|
</xsl:if> -->
|
|
12100
12103
|
|
|
12101
|
-
<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>
|
|
12102
12105
|
|
|
12103
12106
|
<xsl:call-template name="insert_basic_link">
|
|
12104
12107
|
<xsl:with-param name="element">
|
|
@@ -12402,33 +12405,6 @@
|
|
|
12402
12405
|
<xsl:template name="refine_bibitem-non-normative-list-body-style">
|
|
12403
12406
|
</xsl:template>
|
|
12404
12407
|
|
|
12405
|
-
<!-- footnote reference number for bibitem, in the text -->
|
|
12406
|
-
<xsl:attribute-set name="bibitem-note-fn-style">
|
|
12407
|
-
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
12408
|
-
<xsl:attribute name="font-size">65%</xsl:attribute>
|
|
12409
|
-
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
12410
|
-
<xsl:attribute name="baseline-shift">15%</xsl:attribute>
|
|
12411
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-style -->
|
|
12412
|
-
|
|
12413
|
-
<xsl:template name="refine_bibitem-note-fn-style">
|
|
12414
|
-
</xsl:template>
|
|
12415
|
-
|
|
12416
|
-
<!-- footnote number on the page bottom -->
|
|
12417
|
-
<xsl:attribute-set name="bibitem-note-fn-number-style">
|
|
12418
|
-
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
|
12419
|
-
<xsl:attribute name="baseline-shift">15%</xsl:attribute>
|
|
12420
|
-
<xsl:attribute name="padding-right">3mm</xsl:attribute>
|
|
12421
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
|
|
12422
|
-
|
|
12423
|
-
<!-- footnote body (text) on the page bottom -->
|
|
12424
|
-
<xsl:attribute-set name="bibitem-note-fn-body-style">
|
|
12425
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
12426
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
12427
|
-
<xsl:attribute name="start-indent">0pt</xsl:attribute>
|
|
12428
|
-
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
12429
|
-
<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
|
|
12430
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
|
|
12431
|
-
|
|
12432
12408
|
<xsl:attribute-set name="references-non-normative-style">
|
|
12433
12409
|
</xsl:attribute-set> <!-- references-non-normative-style -->
|
|
12434
12410
|
|
|
@@ -14833,6 +14809,17 @@
|
|
|
14833
14809
|
</xsl:attribute-set>
|
|
14834
14810
|
|
|
14835
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> -->
|
|
14836
14823
|
</xsl:template>
|
|
14837
14824
|
|
|
14838
14825
|
<!-- main sections -->
|
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)
|
|
@@ -67,24 +67,6 @@ module IsoDoc
|
|
|
67
67
|
CLAUSE
|
|
68
68
|
end
|
|
69
69
|
|
|
70
|
-
# KILL
|
|
71
|
-
def insert_middle_titlex(docxml)
|
|
72
|
-
ins = docxml.at(ns("//preface/clause[@type = 'toc']")) or return
|
|
73
|
-
title1, title2 = middle_title_parts
|
|
74
|
-
title2out = ""
|
|
75
|
-
title2 and title2out = <<~OUTPUT
|
|
76
|
-
<p class="zzSTDTitle1"> </p>
|
|
77
|
-
<p class="zzSTDTitle2"><strong>#{title2}</strong></p>
|
|
78
|
-
OUTPUT
|
|
79
|
-
title1 &&= Metanorma::Utils.case_transform_xml(title1, :upcase)
|
|
80
|
-
ins.next = <<~OUTPUT
|
|
81
|
-
<pagebreak/><p class="zzSTDTitle1">#{@i18n.get['IEC']}</p>
|
|
82
|
-
<p class="zzSTDTitle1">____________</p><p class="zzSTDTitle1"> </p>
|
|
83
|
-
<p class="zzSTDTitle1"><strong>#{title1}</strong></p>#{title2out}
|
|
84
|
-
<p class="zzSTDTitle1"> </p>
|
|
85
|
-
OUTPUT
|
|
86
|
-
end
|
|
87
|
-
|
|
88
70
|
def insert_middle_title(docxml)
|
|
89
71
|
ins = docxml.at(ns("//preface/clause[@type = 'toc']")) or return
|
|
90
72
|
title = populate_template(preface_title_template, nil) or return
|
|
@@ -105,16 +87,6 @@ module IsoDoc
|
|
|
105
87
|
OUTPUT
|
|
106
88
|
end
|
|
107
89
|
|
|
108
|
-
# KILL
|
|
109
|
-
def middle_title_parts
|
|
110
|
-
title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
|
|
111
|
-
@meta.get[:doctitleintro] and
|
|
112
|
-
title1 = "#{@meta.get[:doctitleintro]} \u2014 #{title1}"
|
|
113
|
-
title1, title2 = middle_title_part(title1, nil)
|
|
114
|
-
title1&.empty? and title1 = nil
|
|
115
|
-
[title1, title2]
|
|
116
|
-
end
|
|
117
|
-
|
|
118
90
|
def middle_title_part(title1, title2)
|
|
119
91
|
if @meta.get[:doctitlepart]
|
|
120
92
|
title1 += " \u2014"
|
|
@@ -125,21 +97,6 @@ module IsoDoc
|
|
|
125
97
|
[title1, title2]
|
|
126
98
|
end
|
|
127
99
|
|
|
128
|
-
# KILL
|
|
129
|
-
def middle_titlex(docxml)
|
|
130
|
-
s = docxml.at(ns("//sections")) or return
|
|
131
|
-
title1, title2 = middle_title_parts
|
|
132
|
-
title1 || title2 or return
|
|
133
|
-
ret = ""
|
|
134
|
-
title1 and ret = "<p class='zzSTDTitle1'><strong>#{title1}</strong></p>"
|
|
135
|
-
title2 and ret += <<~TITLE
|
|
136
|
-
<p class='zzSTDTitle1'> </p>
|
|
137
|
-
<p class='zzSTDTitle2'><strong>#{title2}</strong><p>
|
|
138
|
-
TITLE
|
|
139
|
-
ret += "<p class='zzSTDTitle1'> </p>"
|
|
140
|
-
s.add_first_child ret
|
|
141
|
-
end
|
|
142
|
-
|
|
143
100
|
def middle_title_template
|
|
144
101
|
<<~OUTPUT
|
|
145
102
|
<p class='zzSTDTitle1'><strong>{% if doctitleintro %}{{ doctitleintro -}}
|
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
|