metanorma-iec 1.2.0 → 1.2.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/iec/basicdoc.rng +23 -0
- data/lib/asciidoctor/iec/front.rb +9 -7
- data/lib/asciidoctor/iec/iec.rng +7 -0
- data/lib/asciidoctor/iec/isodoc.rng +124 -15
- data/lib/asciidoctor/iec/isostandard.rng +8 -1
- data/lib/isodoc/iec/base_convert.rb +0 -20
- data/lib/isodoc/iec/html/htmlstyle.css +1 -1
- data/lib/isodoc/iec/html/isodoc.css +16 -4
- data/lib/isodoc/iec/html/isodoc.scss +19 -4
- data/lib/isodoc/iec/html/wordstyle.css +10 -10
- data/lib/isodoc/iec/html/wordstyle.scss +15 -10
- data/lib/isodoc/iec/iec.international-standard.xsl +2462 -1555
- data/lib/metanorma/iec/version.rb +1 -1
- data/metanorma-iec.gemspec +1 -1
- data/spec/asciidoctor-iec/base_spec.rb +5 -5
- data/spec/asciidoctor-iec/cleanup_spec.rb +30 -6
- data/spec/asciidoctor-iec/iev_spec.rb +3 -3
- data/spec/asciidoctor-iec/inline_spec.rb +7 -1
- data/spec/asciidoctor-iec/validate_spec.rb +21 -1
- data/spec/assets/xref_error.adoc +7 -0
- data/spec/isodoc/blocks_spec.rb +1 -1
- data/spec/isodoc/i18n_spec.rb +13 -3
- data/spec/isodoc/iev_spec.rb +60 -8
- data/spec/isodoc/inline_spec.rb +1 -1
- data/spec/isodoc/metadata_spec.rb +2 -21
- data/spec/isodoc/ref_spec.rb +16 -13
- data/spec/isodoc/section_spec.rb +2 -2
- data/spec/isodoc/terms_spec.rb +1 -1
- data/spec/spec_helper.rb +5 -1
- metadata +5 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bc326d356e558e21523ffcc8690c5170fcfdf0fa18814ab0fb9164321f6fcea9
|
4
|
+
data.tar.gz: 46ead1e820327d2c8470bf0128e910003e19b6089dc78d3788e91f8721138afc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 160e78ca27fc0e649fc0e60a1932fe5fd18ea10e3f812c6bee16646032b8fd40f046d244466b3a8ba143cec6716ee88a2eae695ffc46d9816f92bc0b99072138
|
7
|
+
data.tar.gz: ef5fa5a588ff0593f32830103c897f98173cdcb07b1ca1913c7b4e084f561439292983512ac7d00f6475af12d0c5c8b001161caf510ed87a1f6d316c0ebc2738
|
@@ -402,6 +402,16 @@
|
|
402
402
|
</choice>
|
403
403
|
</attribute>
|
404
404
|
</optional>
|
405
|
+
<optional>
|
406
|
+
<attribute name="valign">
|
407
|
+
<choice>
|
408
|
+
<value>top</value>
|
409
|
+
<value>middle</value>
|
410
|
+
<value>bottom</value>
|
411
|
+
<value>baseline</value>
|
412
|
+
</choice>
|
413
|
+
</attribute>
|
414
|
+
</optional>
|
405
415
|
<choice>
|
406
416
|
<zeroOrMore>
|
407
417
|
<ref name="TextElement"/>
|
@@ -429,6 +439,16 @@
|
|
429
439
|
</choice>
|
430
440
|
</attribute>
|
431
441
|
</optional>
|
442
|
+
<optional>
|
443
|
+
<attribute name="valign">
|
444
|
+
<choice>
|
445
|
+
<value>top</value>
|
446
|
+
<value>middle</value>
|
447
|
+
<value>bottom</value>
|
448
|
+
<value>baseline</value>
|
449
|
+
</choice>
|
450
|
+
</attribute>
|
451
|
+
</optional>
|
432
452
|
<choice>
|
433
453
|
<zeroOrMore>
|
434
454
|
<ref name="TextElement"/>
|
@@ -998,6 +1018,9 @@
|
|
998
1018
|
<value>alphabet_upper</value>
|
999
1019
|
</choice>
|
1000
1020
|
</attribute>
|
1021
|
+
<optional>
|
1022
|
+
<attribute name="start"/>
|
1023
|
+
</optional>
|
1001
1024
|
<oneOrMore>
|
1002
1025
|
<ref name="li"/>
|
1003
1026
|
</oneOrMore>
|
@@ -3,31 +3,33 @@ module Asciidoctor
|
|
3
3
|
class Converter < ISO::Converter
|
4
4
|
def metadata_author(node, xml)
|
5
5
|
publishers = node.attr("publisher") || "IEC"
|
6
|
-
publishers
|
6
|
+
csv_split(publishers)&.each do |p|
|
7
7
|
xml.contributor do |c|
|
8
8
|
c.role **{ type: "author" }
|
9
|
-
c.organization { |a| organization(a, p) }
|
9
|
+
c.organization { |a| organization(a, p, node, !node.attr("publisher")) }
|
10
10
|
end
|
11
11
|
end
|
12
12
|
end
|
13
13
|
|
14
14
|
def metadata_publisher(node, xml)
|
15
15
|
publishers = node.attr("publisher") || "IEC"
|
16
|
-
publishers
|
16
|
+
csv_split(publishers)&.each do |p|
|
17
17
|
xml.contributor do |c|
|
18
18
|
c.role **{ type: "publisher" }
|
19
|
-
c.organization { |a| organization(a, p) }
|
19
|
+
c.organization { |a| organization(a, p, node, !node.attr("publisher")) }
|
20
20
|
end
|
21
21
|
end
|
22
22
|
end
|
23
23
|
|
24
24
|
def metadata_copyright(node, xml)
|
25
|
-
publishers = node.attr("publisher") || "IEC"
|
26
|
-
publishers
|
25
|
+
publishers = node.attr("copyright-holder") || node.attr("publisher") || "IEC"
|
26
|
+
csv_split(publishers)&.each do |p|
|
27
27
|
xml.copyright do |c|
|
28
28
|
c.from (node.attr("copyright-year") || Date.today.year)
|
29
29
|
c.owner do |owner|
|
30
|
-
owner.organization
|
30
|
+
owner.organization do |o|
|
31
|
+
organization(o, p, node, !node.attr("copyright-holder") || node.attr("publisher"))
|
32
|
+
end
|
31
33
|
end
|
32
34
|
end
|
33
35
|
end
|
data/lib/asciidoctor/iec/iec.rng
CHANGED
@@ -23,6 +23,13 @@
|
|
23
23
|
-->
|
24
24
|
<define name="iec-standard">
|
25
25
|
<element name="iec-standard">
|
26
|
+
<attribute name="version"/>
|
27
|
+
<attribute name="type">
|
28
|
+
<choice>
|
29
|
+
<value>semantic</value>
|
30
|
+
<value>presentation</value>
|
31
|
+
</choice>
|
32
|
+
</attribute>
|
26
33
|
<ref name="bibdata"/>
|
27
34
|
<zeroOrMore>
|
28
35
|
<ref name="termdocsource"/>
|
@@ -43,7 +43,9 @@
|
|
43
43
|
<define name="xref">
|
44
44
|
<element name="xref">
|
45
45
|
<attribute name="target">
|
46
|
-
<data type="
|
46
|
+
<data type="string">
|
47
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
48
|
+
</data>
|
47
49
|
</attribute>
|
48
50
|
<optional>
|
49
51
|
<attribute name="type">
|
@@ -61,6 +63,11 @@
|
|
61
63
|
</choice>
|
62
64
|
</attribute>
|
63
65
|
</optional>
|
66
|
+
<optional>
|
67
|
+
<attribute name="droploc">
|
68
|
+
<data type="boolean"/>
|
69
|
+
</attribute>
|
70
|
+
</optional>
|
64
71
|
<text/>
|
65
72
|
</element>
|
66
73
|
</define>
|
@@ -578,6 +585,8 @@
|
|
578
585
|
<ref name="ol"/>
|
579
586
|
<ref name="dl"/>
|
580
587
|
<ref name="formula"/>
|
588
|
+
<ref name="quote"/>
|
589
|
+
<ref name="sourcecode"/>
|
581
590
|
</choice>
|
582
591
|
</oneOrMore>
|
583
592
|
</element>
|
@@ -661,6 +670,16 @@
|
|
661
670
|
</choice>
|
662
671
|
</attribute>
|
663
672
|
</optional>
|
673
|
+
<optional>
|
674
|
+
<attribute name="valign">
|
675
|
+
<choice>
|
676
|
+
<value>top</value>
|
677
|
+
<value>middle</value>
|
678
|
+
<value>bottom</value>
|
679
|
+
<value>baseline</value>
|
680
|
+
</choice>
|
681
|
+
</attribute>
|
682
|
+
</optional>
|
664
683
|
<choice>
|
665
684
|
<zeroOrMore>
|
666
685
|
<choice>
|
@@ -697,6 +716,16 @@
|
|
697
716
|
</choice>
|
698
717
|
</attribute>
|
699
718
|
</optional>
|
719
|
+
<optional>
|
720
|
+
<attribute name="valign">
|
721
|
+
<choice>
|
722
|
+
<value>top</value>
|
723
|
+
<value>middle</value>
|
724
|
+
<value>bottom</value>
|
725
|
+
<value>baseline</value>
|
726
|
+
</choice>
|
727
|
+
</attribute>
|
728
|
+
</optional>
|
700
729
|
<choice>
|
701
730
|
<zeroOrMore>
|
702
731
|
<choice>
|
@@ -834,6 +863,13 @@
|
|
834
863
|
</define>
|
835
864
|
<define name="standard-document">
|
836
865
|
<element name="standard-document">
|
866
|
+
<attribute name="version"/>
|
867
|
+
<attribute name="type">
|
868
|
+
<choice>
|
869
|
+
<value>semantic</value>
|
870
|
+
<value>presentation</value>
|
871
|
+
</choice>
|
872
|
+
</attribute>
|
837
873
|
<ref name="bibdata"/>
|
838
874
|
<optional>
|
839
875
|
<ref name="boilerplate"/>
|
@@ -855,7 +891,7 @@
|
|
855
891
|
<oneOrMore>
|
856
892
|
<choice>
|
857
893
|
<ref name="content"/>
|
858
|
-
<ref name="
|
894
|
+
<ref name="abstract"/>
|
859
895
|
<ref name="foreword"/>
|
860
896
|
<ref name="introduction"/>
|
861
897
|
<ref name="acknowledgements"/>
|
@@ -1049,14 +1085,17 @@
|
|
1049
1085
|
<ref name="section-title"/>
|
1050
1086
|
</optional>
|
1051
1087
|
<group>
|
1052
|
-
<
|
1053
|
-
<
|
1054
|
-
<
|
1055
|
-
|
1056
|
-
|
1057
|
-
<
|
1058
|
-
|
1059
|
-
|
1088
|
+
<choice>
|
1089
|
+
<group>
|
1090
|
+
<zeroOrMore>
|
1091
|
+
<ref name="BasicBlock"/>
|
1092
|
+
</zeroOrMore>
|
1093
|
+
<zeroOrMore>
|
1094
|
+
<ref name="note"/>
|
1095
|
+
</zeroOrMore>
|
1096
|
+
</group>
|
1097
|
+
<ref name="amend"/>
|
1098
|
+
</choice>
|
1060
1099
|
<zeroOrMore>
|
1061
1100
|
<choice>
|
1062
1101
|
<ref name="clause-subsection"/>
|
@@ -1453,11 +1492,6 @@
|
|
1453
1492
|
</optional>
|
1454
1493
|
</element>
|
1455
1494
|
</define>
|
1456
|
-
<define name="preface_abstract">
|
1457
|
-
<element name="abstract">
|
1458
|
-
<ref name="Basic-Section"/>
|
1459
|
-
</element>
|
1460
|
-
</define>
|
1461
1495
|
<define name="term-clause">
|
1462
1496
|
<element name="clause">
|
1463
1497
|
<optional>
|
@@ -1507,4 +1541,79 @@
|
|
1507
1541
|
<ref name="CitationType"/>
|
1508
1542
|
</element>
|
1509
1543
|
</define>
|
1544
|
+
<define name="amend">
|
1545
|
+
<element name="amend">
|
1546
|
+
<optional>
|
1547
|
+
<attribute name="id">
|
1548
|
+
<data type="ID"/>
|
1549
|
+
</attribute>
|
1550
|
+
</optional>
|
1551
|
+
<attribute name="change">
|
1552
|
+
<choice>
|
1553
|
+
<value>add</value>
|
1554
|
+
<value>modify</value>
|
1555
|
+
<value>delete</value>
|
1556
|
+
</choice>
|
1557
|
+
</attribute>
|
1558
|
+
<optional>
|
1559
|
+
<attribute name="path"/>
|
1560
|
+
</optional>
|
1561
|
+
<optional>
|
1562
|
+
<attribute name="path_end"/>
|
1563
|
+
</optional>
|
1564
|
+
<optional>
|
1565
|
+
<attribute name="title"/>
|
1566
|
+
</optional>
|
1567
|
+
<optional>
|
1568
|
+
<element name="location">
|
1569
|
+
<zeroOrMore>
|
1570
|
+
<ref name="locality"/>
|
1571
|
+
</zeroOrMore>
|
1572
|
+
</element>
|
1573
|
+
</optional>
|
1574
|
+
<zeroOrMore>
|
1575
|
+
<ref name="autonumber"/>
|
1576
|
+
</zeroOrMore>
|
1577
|
+
<optional>
|
1578
|
+
<element name="description">
|
1579
|
+
<zeroOrMore>
|
1580
|
+
<ref name="BasicBlock"/>
|
1581
|
+
</zeroOrMore>
|
1582
|
+
</element>
|
1583
|
+
</optional>
|
1584
|
+
<optional>
|
1585
|
+
<element name="newcontent">
|
1586
|
+
<zeroOrMore>
|
1587
|
+
<ref name="BasicBlock"/>
|
1588
|
+
</zeroOrMore>
|
1589
|
+
</element>
|
1590
|
+
</optional>
|
1591
|
+
<optional>
|
1592
|
+
<element name="description">
|
1593
|
+
<zeroOrMore>
|
1594
|
+
<ref name="BasicBlock"/>
|
1595
|
+
</zeroOrMore>
|
1596
|
+
</element>
|
1597
|
+
</optional>
|
1598
|
+
</element>
|
1599
|
+
</define>
|
1600
|
+
<define name="autonumber">
|
1601
|
+
<element name="autonumber">
|
1602
|
+
<attribute name="type">
|
1603
|
+
<choice>
|
1604
|
+
<value>requirement</value>
|
1605
|
+
<value>recommendation</value>
|
1606
|
+
<value>permission</value>
|
1607
|
+
<value>table</value>
|
1608
|
+
<value>figure</value>
|
1609
|
+
<value>admonition</value>
|
1610
|
+
<value>formula</value>
|
1611
|
+
<value>sourcecode</value>
|
1612
|
+
<value>example</value>
|
1613
|
+
<value>note</value>
|
1614
|
+
</choice>
|
1615
|
+
</attribute>
|
1616
|
+
<text/>
|
1617
|
+
</element>
|
1618
|
+
</define>
|
1510
1619
|
</grammar>
|
@@ -253,7 +253,7 @@
|
|
253
253
|
<define name="preface">
|
254
254
|
<element name="preface">
|
255
255
|
<optional>
|
256
|
-
<ref name="
|
256
|
+
<ref name="abstract"/>
|
257
257
|
</optional>
|
258
258
|
<ref name="foreword"/>
|
259
259
|
<optional>
|
@@ -405,6 +405,13 @@
|
|
405
405
|
-->
|
406
406
|
<define name="iso-standard">
|
407
407
|
<element name="iso-standard">
|
408
|
+
<attribute name="version"/>
|
409
|
+
<attribute name="type">
|
410
|
+
<choice>
|
411
|
+
<value>semantic</value>
|
412
|
+
<value>presentation</value>
|
413
|
+
</choice>
|
414
|
+
</attribute>
|
408
415
|
<ref name="bibdata"/>
|
409
416
|
<zeroOrMore>
|
410
417
|
<ref name="termdocsource"/>
|
@@ -52,21 +52,6 @@ module IsoDoc
|
|
52
52
|
out.p(**{ class: "zzSTDTitle1" }) { |p| p << " " }
|
53
53
|
end
|
54
54
|
|
55
|
-
=begin
|
56
|
-
def introduction(isoxml, out)
|
57
|
-
return super unless @is_iev
|
58
|
-
f = isoxml.at(ns("//introduction")) || return
|
59
|
-
title_attr = { class: "IntroTitle" }
|
60
|
-
page_break(out)
|
61
|
-
out.div **{ class: "Section3", id: f["id"] } do |div|
|
62
|
-
clause_name(nil, @i18n.get["introduction_iev"], div, title_attr)
|
63
|
-
f.elements.each do |e|
|
64
|
-
parse(e, div) unless e.name == "title"
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
68
|
-
=end
|
69
|
-
|
70
55
|
def bibliography(isoxml, out)
|
71
56
|
return super unless @is_iev
|
72
57
|
end
|
@@ -137,11 +122,6 @@ module IsoDoc
|
|
137
122
|
term_suffix(node, p)
|
138
123
|
end
|
139
124
|
end
|
140
|
-
|
141
|
-
def biblio_list(f, div, biblio)
|
142
|
-
biblio = false
|
143
|
-
super
|
144
|
-
end
|
145
125
|
end
|
146
126
|
end
|
147
127
|
end
|
@@ -16,7 +16,7 @@ fieldset, form, label, legend,
|
|
16
16
|
table, caption, tbody, tfoot, thead, tr, th, td,
|
17
17
|
article, aside, canvas, details, embed,
|
18
18
|
figure, figcaption, footer, header, hgroup,
|
19
|
-
menu,
|
19
|
+
menu, output, ruby, section, summary,
|
20
20
|
time, mark, audio, video {
|
21
21
|
margin: 0;
|
22
22
|
padding: 0; }
|
@@ -634,7 +634,7 @@ table.figdl {
|
|
634
634
|
margin-left: 0cm;
|
635
635
|
margin-right: 0cm; }
|
636
636
|
|
637
|
-
table.MsoISOTable {
|
637
|
+
table.MsoISOTable, table.MsoISOTableBig {
|
638
638
|
mso-style-name: "Table ISO";
|
639
639
|
mso-tstyle-rowband-size: 0;
|
640
640
|
mso-tstyle-colband-size: 0;
|
@@ -655,17 +655,17 @@ table.MsoISOTable {
|
|
655
655
|
font-size: 10.0pt;
|
656
656
|
font-family: {{bodyfont}}; }
|
657
657
|
|
658
|
-
table.MsoISOTable th {
|
658
|
+
table.MsoISOTable th, table.MsoISOTableBig th {
|
659
659
|
border: solid windowtext 1pt;
|
660
660
|
mso-border-alt: solid windowtext 1pt;
|
661
661
|
padding: 0cm 2.85pt 0cm 2.85pt; }
|
662
662
|
|
663
|
-
table.MsoISOTable td {
|
663
|
+
table.MsoISOTable td, table.MsoISOTableBig td {
|
664
664
|
border: solid windowtext 1pt;
|
665
665
|
mso-border-alt: solid windowtext 1pt;
|
666
666
|
padding: 0cm 2.85pt 0cm 2.85pt; }
|
667
667
|
|
668
|
-
table.MsoISOTable p {
|
668
|
+
table.MsoISOTable p, table.MsoISOTableBig p {
|
669
669
|
font-size: 10.0pt; }
|
670
670
|
|
671
671
|
table.MsoTableGrid {
|
@@ -830,8 +830,20 @@ div.example p.MsoListParagraph {
|
|
830
830
|
font-size: 10.0pt; }
|
831
831
|
|
832
832
|
div.Note p.MsoListParagraph {
|
833
|
+
font-size: 8.0pt;
|
834
|
+
margin-left: 1.0cm; }
|
835
|
+
|
836
|
+
div.Note span.stem {
|
833
837
|
font-size: 8.0pt; }
|
834
838
|
|
839
|
+
div.Note p.Sourcecode, div.Note pre.Sourcecode {
|
840
|
+
font-size: 8.0pt;
|
841
|
+
margin-left: 1.0cm; }
|
842
|
+
|
843
|
+
div.Note table.dl {
|
844
|
+
font-size: 8.0pt;
|
845
|
+
margin-left: 1.0cm; }
|
846
|
+
|
835
847
|
div.example, td.example {
|
836
848
|
margin: 0in;
|
837
849
|
margin-bottom: 12.0pt; }
|
@@ -608,7 +608,7 @@ table.figdl
|
|
608
608
|
margin-right: 0cm;
|
609
609
|
}
|
610
610
|
|
611
|
-
table.MsoISOTable
|
611
|
+
table.MsoISOTable, table.MsoISOTableBig
|
612
612
|
{mso-style-name:"Table ISO";
|
613
613
|
mso-tstyle-rowband-size:0;
|
614
614
|
mso-tstyle-colband-size:0;
|
@@ -628,15 +628,15 @@ table.MsoISOTable
|
|
628
628
|
mso-border-insidev:.75pt solid windowtext;
|
629
629
|
font-size:10.0pt;
|
630
630
|
font-family:$bodyfont;}
|
631
|
-
table.MsoISOTable th
|
631
|
+
table.MsoISOTable th, table.MsoISOTableBig th
|
632
632
|
{border:solid windowtext 1pt;
|
633
633
|
mso-border-alt:solid windowtext 1pt;
|
634
634
|
padding:0cm 2.85pt 0cm 2.85pt;}
|
635
|
-
table.MsoISOTable td
|
635
|
+
table.MsoISOTable td, table.MsoISOTableBig td
|
636
636
|
{border:solid windowtext 1pt;
|
637
637
|
mso-border-alt:solid windowtext 1pt;
|
638
638
|
padding:0cm 2.85pt 0cm 2.85pt;}
|
639
|
-
table.MsoISOTable p
|
639
|
+
table.MsoISOTable p, table.MsoISOTableBig p
|
640
640
|
{font-size:10.0pt; }
|
641
641
|
table.MsoTableGrid
|
642
642
|
{mso-style-name:"Table Grid";
|
@@ -816,8 +816,23 @@ div.example p.MsoListParagraph {
|
|
816
816
|
|
817
817
|
div.Note p.MsoListParagraph {
|
818
818
|
font-size: 8.0pt;
|
819
|
+
margin-left: 1.0cm;
|
819
820
|
}
|
820
821
|
|
822
|
+
div.Note span.stem {
|
823
|
+
font-size: 8.0pt; }
|
824
|
+
|
825
|
+
div.Note p.Sourcecode, div.Note pre.Sourcecode {
|
826
|
+
font-size: 8.0pt;
|
827
|
+
margin-left: 1.0cm;
|
828
|
+
}
|
829
|
+
|
830
|
+
div.Note table.dl {
|
831
|
+
font-size: 8.0pt;
|
832
|
+
margin-left: 1.0cm;
|
833
|
+
}
|
834
|
+
|
835
|
+
|
821
836
|
div.example, td.example {
|
822
837
|
margin:0in;
|
823
838
|
margin-bottom:12.0pt;
|