metanorma-iec 1.2.2 → 1.2.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iec/basicdoc.rng +31 -1
  3. data/lib/asciidoctor/iec/isodoc.rng +112 -9
  4. data/lib/isodoc/iec/base_convert.rb +0 -20
  5. data/lib/isodoc/iec/html/isodoc.css +16 -4
  6. data/lib/isodoc/iec/html/isodoc.scss +19 -4
  7. data/lib/isodoc/iec/html/wordstyle.css +10 -10
  8. data/lib/isodoc/iec/html/wordstyle.scss +15 -10
  9. data/lib/isodoc/iec/iec.international-standard.xsl +643 -307
  10. data/lib/metanorma/iec/version.rb +1 -1
  11. data/spec/asciidoctor-iec/cleanup_spec.rb +30 -6
  12. data/spec/asciidoctor-iec/inline_spec.rb +7 -1
  13. data/spec/isodoc/iev_spec.rb +0 -4
  14. data/spec/isodoc/ref_spec.rb +12 -12
  15. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 45688db5644887e9b7ac5dc95fb4af57229a3c0d4b0cb1d931f19657e4473af7
4
- data.tar.gz: b0d43cd6942cc0eb05c847406b0ab971b11bc76973e271c7b533ce99d86072c9
3
+ metadata.gz: 9b5b65151b0f1bdda67f0206c9e02f13dbbadefe58e8a63ccbafea9bf61af540
4
+ data.tar.gz: a37b42bed9ac34b9a52b34f49742f0e37d2cf640517dc99ea991fef86b0b4b9e
5
5
  SHA512:
6
- metadata.gz: 3e7eec9b4315b9471bc74160b53c8317858f24b0fd9f4ea302798fd93d15dd05fc61717ea657555b67d7d790664bda8e0f93919aafbd53e9e531e97a6f0811a9
7
- data.tar.gz: 4304df37874a6fce41f69d88d85ada2e201a809137af439cad37ff76626a045367e8fb812b4c3fff639107bea49ba8bb545f61e69e4522476fe651fc6cf2f460
6
+ metadata.gz: 6f38bd62a85f6ad02553c35af8cba7c77d65d484f114d7a7b5090b1562765164e91f06109ba48f3ec5a1953e166d22a947061bfa26865b9ff27bee83fa170cff
7
+ data.tar.gz: 276a2c079699f9cfb02bad08dfcf5825a4e11b48cfc66c0c54256b1fa76089c8bb7039e2334a7656c21e84a10b6b535421ec9213df4f7b92d7de7e4fd44a3e81
data/lib/asciidoctor/iec/basicdoc.rng CHANGED
@@ -158,7 +158,17 @@
158
158
  <data type="ID"/>
159
159
  </attribute>
160
160
  <oneOrMore>
161
- <ref name="paragraph"/>
161
+ <choice>
162
+ <ref name="formula"/>
163
+ <ref name="ul"/>
164
+ <ref name="ol"/>
165
+ <ref name="dl"/>
166
+ <ref name="quote"/>
167
+ <ref name="sourcecode"/>
168
+ <ref name="paragraph"/>
169
+ <ref name="table"/>
170
+ <ref name="figure"/>
171
+ </choice>
162
172
  </oneOrMore>
163
173
  </element>
164
174
  </define>
@@ -402,6 +412,16 @@
402
412
  </choice>
403
413
  </attribute>
404
414
  </optional>
415
+ <optional>
416
+ <attribute name="valign">
417
+ <choice>
418
+ <value>top</value>
419
+ <value>middle</value>
420
+ <value>bottom</value>
421
+ <value>baseline</value>
422
+ </choice>
423
+ </attribute>
424
+ </optional>
405
425
  <choice>
406
426
  <zeroOrMore>
407
427
  <ref name="TextElement"/>
@@ -429,6 +449,16 @@
429
449
  </choice>
430
450
  </attribute>
431
451
  </optional>
452
+ <optional>
453
+ <attribute name="valign">
454
+ <choice>
455
+ <value>top</value>
456
+ <value>middle</value>
457
+ <value>bottom</value>
458
+ <value>baseline</value>
459
+ </choice>
460
+ </attribute>
461
+ </optional>
432
462
  <choice>
433
463
  <zeroOrMore>
434
464
  <ref name="TextElement"/>
data/lib/asciidoctor/iec/isodoc.rng CHANGED
@@ -42,8 +42,11 @@
42
42
  </define>
43
43
  <define name="xref">
44
44
  <element name="xref">
45
+ <!-- attribute target { xsd:IDREF }, -->
45
46
  <attribute name="target">
46
- <data type="IDREF"/>
47
+ <data type="string">
48
+ <param name="pattern">\i\c*|\c+#\c+</param>
49
+ </data>
47
50
  </attribute>
48
51
  <optional>
49
52
  <attribute name="type">
@@ -578,6 +581,8 @@
578
581
  <ref name="ol"/>
579
582
  <ref name="dl"/>
580
583
  <ref name="formula"/>
584
+ <ref name="quote"/>
585
+ <ref name="sourcecode"/>
581
586
  </choice>
582
587
  </oneOrMore>
583
588
  </element>
@@ -661,6 +666,16 @@
661
666
  </choice>
662
667
  </attribute>
663
668
  </optional>
669
+ <optional>
670
+ <attribute name="valign">
671
+ <choice>
672
+ <value>top</value>
673
+ <value>middle</value>
674
+ <value>bottom</value>
675
+ <value>baseline</value>
676
+ </choice>
677
+ </attribute>
678
+ </optional>
664
679
  <choice>
665
680
  <zeroOrMore>
666
681
  <choice>
@@ -697,6 +712,16 @@
697
712
  </choice>
698
713
  </attribute>
699
714
  </optional>
715
+ <optional>
716
+ <attribute name="valign">
717
+ <choice>
718
+ <value>top</value>
719
+ <value>middle</value>
720
+ <value>bottom</value>
721
+ <value>baseline</value>
722
+ </choice>
723
+ </attribute>
724
+ </optional>
700
725
  <choice>
701
726
  <zeroOrMore>
702
727
  <choice>
@@ -1049,14 +1074,17 @@
1049
1074
  <ref name="section-title"/>
1050
1075
  </optional>
1051
1076
  <group>
1052
- <group>
1053
- <zeroOrMore>
1054
- <ref name="BasicBlock"/>
1055
- </zeroOrMore>
1056
- <zeroOrMore>
1057
- <ref name="note"/>
1058
- </zeroOrMore>
1059
- </group>
1077
+ <choice>
1078
+ <group>
1079
+ <zeroOrMore>
1080
+ <ref name="BasicBlock"/>
1081
+ </zeroOrMore>
1082
+ <zeroOrMore>
1083
+ <ref name="note"/>
1084
+ </zeroOrMore>
1085
+ </group>
1086
+ <ref name="amend"/>
1087
+ </choice>
1060
1088
  <zeroOrMore>
1061
1089
  <choice>
1062
1090
  <ref name="clause-subsection"/>
@@ -1507,4 +1535,79 @@
1507
1535
  <ref name="CitationType"/>
1508
1536
  </element>
1509
1537
  </define>
1538
+ <define name="amend">
1539
+ <element name="amend">
1540
+ <optional>
1541
+ <attribute name="id">
1542
+ <data type="ID"/>
1543
+ </attribute>
1544
+ </optional>
1545
+ <attribute name="change">
1546
+ <choice>
1547
+ <value>add</value>
1548
+ <value>modify</value>
1549
+ <value>delete</value>
1550
+ </choice>
1551
+ </attribute>
1552
+ <optional>
1553
+ <attribute name="path"/>
1554
+ </optional>
1555
+ <optional>
1556
+ <attribute name="path_end"/>
1557
+ </optional>
1558
+ <optional>
1559
+ <attribute name="title"/>
1560
+ </optional>
1561
+ <optional>
1562
+ <element name="location">
1563
+ <zeroOrMore>
1564
+ <ref name="locality"/>
1565
+ </zeroOrMore>
1566
+ </element>
1567
+ </optional>
1568
+ <zeroOrMore>
1569
+ <ref name="autonumber"/>
1570
+ </zeroOrMore>
1571
+ <optional>
1572
+ <element name="description">
1573
+ <zeroOrMore>
1574
+ <ref name="BasicBlock"/>
1575
+ </zeroOrMore>
1576
+ </element>
1577
+ </optional>
1578
+ <optional>
1579
+ <element name="newcontent">
1580
+ <zeroOrMore>
1581
+ <ref name="BasicBlock"/>
1582
+ </zeroOrMore>
1583
+ </element>
1584
+ </optional>
1585
+ <optional>
1586
+ <element name="description">
1587
+ <zeroOrMore>
1588
+ <ref name="BasicBlock"/>
1589
+ </zeroOrMore>
1590
+ </element>
1591
+ </optional>
1592
+ </element>
1593
+ </define>
1594
+ <define name="autonumber">
1595
+ <element name="autonumber">
1596
+ <attribute name="type">
1597
+ <choice>
1598
+ <value>requirement</value>
1599
+ <value>recommendation</value>
1600
+ <value>permission</value>
1601
+ <value>table</value>
1602
+ <value>figure</value>
1603
+ <value>admonition</value>
1604
+ <value>formula</value>
1605
+ <value>sourcecode</value>
1606
+ <value>example</value>
1607
+ <value>note</value>
1608
+ </choice>
1609
+ </attribute>
1610
+ <text/>
1611
+ </element>
1612
+ </define>
1510
1613
  </grammar>
data/lib/isodoc/iec/base_convert.rb CHANGED
@@ -52,21 +52,6 @@ module IsoDoc
52
52
  out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
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
data/lib/isodoc/iec/html/isodoc.css CHANGED
@@ -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; }
data/lib/isodoc/iec/html/isodoc.scss CHANGED
@@ -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;
data/lib/isodoc/iec/html/wordstyle.css CHANGED
@@ -277,7 +277,6 @@ h1
277
277
  text-indent: -31.2pt;
278
278
  mso-pagination: widow-orphan;
279
279
  page-break-after: avoid;
280
- mso-outline-level: 2;
281
280
  mso-hyphenate: none;
282
281
  tab-stops: list 31.2pt;
283
282
  layout-grid-mode: char;
@@ -289,7 +288,8 @@ h1
289
288
  font-weight: bold; }
290
289
 
291
290
  h2 {
292
- mso-list: l26 level2 lfo40; }
291
+ mso-list: l26 level2 lfo40;
292
+ mso-outline-level: 2; }
293
293
 
294
294
  .h3Annex, h3 {
295
295
  mso-style-unhide: no;
@@ -304,7 +304,6 @@ h2 {
304
304
  text-indent: -42.55pt;
305
305
  mso-pagination: widow-orphan;
306
306
  page-break-after: avoid;
307
- mso-outline-level: 3;
308
307
  mso-hyphenate: none;
309
308
  tab-stops: list 42.55pt;
310
309
  layout-grid-mode: char;
@@ -316,7 +315,8 @@ h2 {
316
315
  font-weight: bold; }
317
316
 
318
317
  h3 {
319
- mso-list: l26 level3 lfo40; }
318
+ mso-list: l26 level3 lfo40;
319
+ mso-outline-level: 3; }
320
320
 
321
321
  .h4Annex, h4 {
322
322
  mso-style-unhide: no;
@@ -331,7 +331,6 @@ h3 {
331
331
  text-indent: -53.85pt;
332
332
  mso-pagination: widow-orphan;
333
333
  page-break-after: avoid;
334
- mso-outline-level: 4;
335
334
  mso-hyphenate: none;
336
335
  tab-stops: list 53.85pt;
337
336
  layout-grid-mode: char;
@@ -343,7 +342,8 @@ h3 {
343
342
  font-weight: bold; }
344
343
 
345
344
  h4 {
346
- mso-list: l26 level2 lfo40; }
345
+ mso-list: l26 level2 lfo40;
346
+ mso-outline-level: 4; }
347
347
 
348
348
  .h5Annex, h5 {
349
349
  mso-style-unhide: no;
@@ -358,7 +358,6 @@ h4 {
358
358
  text-indent: -65.2pt;
359
359
  mso-pagination: widow-orphan;
360
360
  page-break-after: avoid;
361
- mso-outline-level: 5;
362
361
  mso-hyphenate: none;
363
362
  tab-stops: list 65.2pt;
364
363
  layout-grid-mode: char;
@@ -370,7 +369,8 @@ h4 {
370
369
  font-weight: bold; }
371
370
 
372
371
  h5 {
373
- mso-list: l26 level5 lfo40; }
372
+ mso-list: l26 level5 lfo40;
373
+ mso-outline-level: 5; }
374
374
 
375
375
  h6 {
376
376
  mso-style-unhide: no;
@@ -385,7 +385,6 @@ h6 {
385
385
  text-indent: -76.55pt;
386
386
  mso-pagination: widow-orphan;
387
387
  page-break-after: avoid;
388
- mso-outline-level: 6;
389
388
  mso-hyphenate: none;
390
389
  tab-stops: list 76.55pt;
391
390
  layout-grid-mode: char;
@@ -397,7 +396,8 @@ h6 {
397
396
  font-weight: bold; }
398
397
 
399
398
  h6 {
400
- mso-list: l26 level6 lfo40; }
399
+ mso-list: l26 level6 lfo40;
400
+ mso-outline-level: 6; }
401
401
 
402
402
  p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 {
403
403
  mso-style-unhide: no;
data/lib/isodoc/iec/html/wordstyle.scss CHANGED
@@ -258,7 +258,6 @@ h1
258
258
  text-indent:-31.2pt;
259
259
  mso-pagination:widow-orphan;
260
260
  page-break-after:avoid;
261
- mso-outline-level:2;
262
261
  mso-hyphenate:none;
263
262
  tab-stops:list 31.2pt;
264
263
  layout-grid-mode:char;
@@ -269,7 +268,9 @@ h1
269
268
  mso-fareast-language:ZH-CN;
270
269
  font-weight:bold;}
271
270
  h2
272
- { mso-list:l26 level2 lfo40;}
271
+ { mso-list:l26 level2 lfo40;
272
+ mso-outline-level:2;
273
+ }
273
274
  .h3Annex, h3
274
275
  {mso-style-unhide:no;
275
276
  mso-style-qformat:yes;
@@ -283,7 +284,6 @@ h2
283
284
  text-indent:-42.55pt;
284
285
  mso-pagination:widow-orphan;
285
286
  page-break-after:avoid;
286
- mso-outline-level:3;
287
287
  mso-hyphenate:none;
288
288
  tab-stops:list 42.55pt;
289
289
  layout-grid-mode:char;
@@ -293,7 +293,9 @@ h2
293
293
  mso-ansi-language:EN-GB;
294
294
  mso-fareast-language:ZH-CN;
295
295
  font-weight:bold;}
296
- h3 {mso-list:l26 level3 lfo40;}
296
+ h3 {mso-list:l26 level3 lfo40;
297
+ mso-outline-level:3;
298
+ }
297
299
  .h4Annex, h4
298
300
  {mso-style-unhide:no;
299
301
  mso-style-qformat:yes;
@@ -307,7 +309,6 @@ h3 {mso-list:l26 level3 lfo40;}
307
309
  text-indent:-53.85pt;
308
310
  mso-pagination:widow-orphan;
309
311
  page-break-after:avoid;
310
- mso-outline-level:4;
311
312
  mso-hyphenate:none;
312
313
  tab-stops:list 53.85pt;
313
314
  layout-grid-mode:char;
@@ -317,7 +318,9 @@ h3 {mso-list:l26 level3 lfo40;}
317
318
  mso-ansi-language:EN-GB;
318
319
  mso-fareast-language:ZH-CN;
319
320
  font-weight:bold;}
320
- h4 {mso-list:l26 level2 lfo40;}
321
+ h4 {mso-list:l26 level2 lfo40;
322
+ mso-outline-level:4;
323
+ }
321
324
  .h5Annex, h5
322
325
  {mso-style-unhide:no;
323
326
  mso-style-qformat:yes;
@@ -331,7 +334,6 @@ h4 {mso-list:l26 level2 lfo40;}
331
334
  text-indent:-65.2pt;
332
335
  mso-pagination:widow-orphan;
333
336
  page-break-after:avoid;
334
- mso-outline-level:5;
335
337
  mso-hyphenate:none;
336
338
  tab-stops:list 65.2pt;
337
339
  layout-grid-mode:char;
@@ -341,7 +343,9 @@ h4 {mso-list:l26 level2 lfo40;}
341
343
  mso-ansi-language:EN-GB;
342
344
  mso-fareast-language:ZH-CN;
343
345
  font-weight:bold;}
344
- h5 {mso-list:l26 level5 lfo40;}
346
+ h5 {mso-list:l26 level5 lfo40;
347
+ mso-outline-level:5;
348
+ }
345
349
  h6
346
350
  {mso-style-unhide:no;
347
351
  mso-style-qformat:yes;
@@ -355,7 +359,6 @@ h6
355
359
  text-indent:-76.55pt;
356
360
  mso-pagination:widow-orphan;
357
361
  page-break-after:avoid;
358
- mso-outline-level:6;
359
362
  mso-hyphenate:none;
360
363
  tab-stops:list 76.55pt;
361
364
  layout-grid-mode:char;
@@ -365,7 +368,9 @@ h6
365
368
  mso-ansi-language:EN-GB;
366
369
  mso-fareast-language:ZH-CN;
367
370
  font-weight:bold;}
368
- h6 {mso-list:l26 level6 lfo40;}
371
+ h6 {mso-list:l26 level6 lfo40;
372
+ mso-outline-level:6;
373
+ }
369
374
  p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
370
375
  {mso-style-unhide:no;
371
376
  mso-style-qformat:yes;