metanorma-cc 1.7.12 → 1.7.13
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/asciidoctor/cc/basicdoc.rng +21 -4
- data/lib/asciidoctor/cc/converter.rb +14 -12
- data/lib/asciidoctor/cc/isodoc.rng +192 -50
- data/lib/asciidoctor/cc/reqt.rng +23 -2
- data/lib/isodoc/cc/cc.standard.xsl +12 -2
- data/lib/isodoc/cc/html/wordstyle.css +11 -0
- data/lib/isodoc/cc/html/wordstyle.scss +13 -2
- data/lib/metanorma/cc/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: 937b9e8a5ec27a2e7c496162b85a141c6a55a44cab6b4299a2e6e8bd9a8b9152
|
|
4
|
+
data.tar.gz: 0d64844abfb788670a8441aeca3ea21b3b94f393044c73c7d3a6f4a9fcab755f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 290bffbf41831391fb7c6d5a51b16979ca4e9125f75ba8f04230b0cb69654cc1680f7854064158270e10dff535f40c66fae1ffcea316ff7af2f9d2c325570564
|
|
7
|
+
data.tar.gz: b982c64161905f06770918372ec231686225c511c2645297e4b6ff2695396bef055e9920ace962cb1ad323daef388836dccd10d5a94e64c1e282bf5ed0ba66ff
|
|
@@ -624,6 +624,9 @@
|
|
|
624
624
|
<choice>
|
|
625
625
|
<ref name="PureTextElement"/>
|
|
626
626
|
<ref name="stem"/>
|
|
627
|
+
<ref name="eref"/>
|
|
628
|
+
<ref name="xref"/>
|
|
629
|
+
<ref name="hyperlink"/>
|
|
627
630
|
</choice>
|
|
628
631
|
</zeroOrMore>
|
|
629
632
|
</element>
|
|
@@ -634,6 +637,9 @@
|
|
|
634
637
|
<choice>
|
|
635
638
|
<ref name="PureTextElement"/>
|
|
636
639
|
<ref name="stem"/>
|
|
640
|
+
<ref name="eref"/>
|
|
641
|
+
<ref name="xref"/>
|
|
642
|
+
<ref name="hyperlink"/>
|
|
637
643
|
</choice>
|
|
638
644
|
</zeroOrMore>
|
|
639
645
|
</element>
|
|
@@ -641,7 +647,12 @@
|
|
|
641
647
|
<define name="tt">
|
|
642
648
|
<element name="tt">
|
|
643
649
|
<zeroOrMore>
|
|
644
|
-
<
|
|
650
|
+
<choice>
|
|
651
|
+
<ref name="PureTextElement"/>
|
|
652
|
+
<ref name="eref"/>
|
|
653
|
+
<ref name="xref"/>
|
|
654
|
+
<ref name="hyperlink"/>
|
|
655
|
+
</choice>
|
|
645
656
|
</zeroOrMore>
|
|
646
657
|
</element>
|
|
647
658
|
</define>
|
|
@@ -822,7 +833,9 @@
|
|
|
822
833
|
<attribute name="alt"/>
|
|
823
834
|
</optional>
|
|
824
835
|
<ref name="CitationType"/>
|
|
825
|
-
<
|
|
836
|
+
<oneOrMore>
|
|
837
|
+
<ref name="PureTextElement"/>
|
|
838
|
+
</oneOrMore>
|
|
826
839
|
</define>
|
|
827
840
|
<define name="hyperlink">
|
|
828
841
|
<element name="link">
|
|
@@ -835,7 +848,9 @@
|
|
|
835
848
|
<optional>
|
|
836
849
|
<attribute name="alt"/>
|
|
837
850
|
</optional>
|
|
838
|
-
<
|
|
851
|
+
<oneOrMore>
|
|
852
|
+
<ref name="PureTextElement"/>
|
|
853
|
+
</oneOrMore>
|
|
839
854
|
</element>
|
|
840
855
|
</define>
|
|
841
856
|
<define name="xref">
|
|
@@ -849,7 +864,9 @@
|
|
|
849
864
|
<optional>
|
|
850
865
|
<attribute name="alt"/>
|
|
851
866
|
</optional>
|
|
852
|
-
<
|
|
867
|
+
<oneOrMore>
|
|
868
|
+
<ref name="PureTextElement"/>
|
|
869
|
+
</oneOrMore>
|
|
853
870
|
</element>
|
|
854
871
|
</define>
|
|
855
872
|
<define name="fn">
|
|
@@ -4,7 +4,7 @@ require "isodoc/cc/word_convert"
|
|
|
4
4
|
require "isodoc/cc/presentation_xml_convert"
|
|
5
5
|
require "metanorma/cc"
|
|
6
6
|
require "asciidoctor/standoc/converter"
|
|
7
|
-
require
|
|
7
|
+
require "asciidoctor/generic/converter"
|
|
8
8
|
require_relative "validate_section"
|
|
9
9
|
|
|
10
10
|
module Asciidoctor
|
|
@@ -21,27 +21,28 @@ module Asciidoctor
|
|
|
21
21
|
|
|
22
22
|
def metadata_committee(node, xml)
|
|
23
23
|
return unless node.attr("technical-committee")
|
|
24
|
+
|
|
24
25
|
xml.editorialgroup do |a|
|
|
25
26
|
a.committee node.attr("technical-committee"),
|
|
26
|
-
|
|
27
|
+
**attr_code(type: node.attr("technical-committee-type"))
|
|
27
28
|
i = 2
|
|
28
|
-
while node.attr("technical-committee_#{i}")
|
|
29
|
+
while node.attr("technical-committee_#{i}")
|
|
29
30
|
a.committee node.attr("technical-committee_#{i}"),
|
|
30
|
-
|
|
31
|
+
**attr_code(type: node.attr("technical-committee-type_#{i}"))
|
|
31
32
|
i += 1
|
|
32
33
|
end
|
|
33
34
|
end
|
|
34
35
|
end
|
|
35
36
|
|
|
36
37
|
def outputs(node, ret)
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
38
|
+
File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
|
|
39
|
+
presentation_xml_converter(node).convert(@filename + ".xml")
|
|
40
|
+
html_converter(node).convert(@filename + ".presentation.xml",
|
|
41
|
+
nil, false, "#{@filename}.html")
|
|
42
|
+
doc_converter(node).convert(@filename + ".presentation.xml",
|
|
43
|
+
nil, false, "#{@filename}.doc")
|
|
44
|
+
pdf_converter(node)&.convert(@filename + ".presentation.xml",
|
|
45
|
+
nil, false, "#{@filename}.pdf")
|
|
45
46
|
end
|
|
46
47
|
|
|
47
48
|
def html_converter(node)
|
|
@@ -50,6 +51,7 @@ module Asciidoctor
|
|
|
50
51
|
|
|
51
52
|
def pdf_converter(node)
|
|
52
53
|
return if node.attr("no-pdf")
|
|
54
|
+
|
|
53
55
|
IsoDoc::CC::PdfConvert.new(html_extract_attributes(node))
|
|
54
56
|
end
|
|
55
57
|
|
|
@@ -62,7 +62,9 @@
|
|
|
62
62
|
<data type="boolean"/>
|
|
63
63
|
</attribute>
|
|
64
64
|
</optional>
|
|
65
|
-
<
|
|
65
|
+
<oneOrMore>
|
|
66
|
+
<ref name="PureTextElement"/>
|
|
67
|
+
</oneOrMore>
|
|
66
68
|
</element>
|
|
67
69
|
</define>
|
|
68
70
|
<define name="xref">
|
|
@@ -100,7 +102,9 @@
|
|
|
100
102
|
<data type="boolean"/>
|
|
101
103
|
</attribute>
|
|
102
104
|
</optional>
|
|
103
|
-
<
|
|
105
|
+
<oneOrMore>
|
|
106
|
+
<ref name="PureTextElement"/>
|
|
107
|
+
</oneOrMore>
|
|
104
108
|
</element>
|
|
105
109
|
</define>
|
|
106
110
|
<define name="erefType">
|
|
@@ -130,7 +134,9 @@
|
|
|
130
134
|
</attribute>
|
|
131
135
|
</optional>
|
|
132
136
|
<ref name="CitationType"/>
|
|
133
|
-
<
|
|
137
|
+
<oneOrMore>
|
|
138
|
+
<ref name="PureTextElement"/>
|
|
139
|
+
</oneOrMore>
|
|
134
140
|
</define>
|
|
135
141
|
<define name="ul">
|
|
136
142
|
<element name="ul">
|
|
@@ -147,6 +153,14 @@
|
|
|
147
153
|
<data type="boolean"/>
|
|
148
154
|
</attribute>
|
|
149
155
|
</optional>
|
|
156
|
+
<optional>
|
|
157
|
+
<attribute name="tag"/>
|
|
158
|
+
</optional>
|
|
159
|
+
<optional>
|
|
160
|
+
<attribute name="multilingual-rendering">
|
|
161
|
+
<ref name="MultilingualRenderingType"/>
|
|
162
|
+
</attribute>
|
|
163
|
+
</optional>
|
|
150
164
|
<oneOrMore>
|
|
151
165
|
<ref name="ul_li"/>
|
|
152
166
|
</oneOrMore>
|
|
@@ -170,6 +184,14 @@
|
|
|
170
184
|
<data type="boolean"/>
|
|
171
185
|
</attribute>
|
|
172
186
|
</optional>
|
|
187
|
+
<optional>
|
|
188
|
+
<attribute name="tag"/>
|
|
189
|
+
</optional>
|
|
190
|
+
<optional>
|
|
191
|
+
<attribute name="multilingual-rendering">
|
|
192
|
+
<ref name="MultilingualRenderingType"/>
|
|
193
|
+
</attribute>
|
|
194
|
+
</optional>
|
|
173
195
|
<optional>
|
|
174
196
|
<attribute name="type">
|
|
175
197
|
<choice>
|
|
@@ -209,6 +231,14 @@
|
|
|
209
231
|
<data type="boolean"/>
|
|
210
232
|
</attribute>
|
|
211
233
|
</optional>
|
|
234
|
+
<optional>
|
|
235
|
+
<attribute name="tag"/>
|
|
236
|
+
</optional>
|
|
237
|
+
<optional>
|
|
238
|
+
<attribute name="multilingual-rendering">
|
|
239
|
+
<ref name="MultilingualRenderingType"/>
|
|
240
|
+
</attribute>
|
|
241
|
+
</optional>
|
|
212
242
|
<oneOrMore>
|
|
213
243
|
<ref name="dt"/>
|
|
214
244
|
<ref name="dd"/>
|
|
@@ -256,6 +286,14 @@
|
|
|
256
286
|
<data type="boolean"/>
|
|
257
287
|
</attribute>
|
|
258
288
|
</optional>
|
|
289
|
+
<optional>
|
|
290
|
+
<attribute name="tag"/>
|
|
291
|
+
</optional>
|
|
292
|
+
<optional>
|
|
293
|
+
<attribute name="multilingual-rendering">
|
|
294
|
+
<ref name="MultilingualRenderingType"/>
|
|
295
|
+
</attribute>
|
|
296
|
+
</optional>
|
|
259
297
|
<optional>
|
|
260
298
|
<ref name="tname"/>
|
|
261
299
|
</optional>
|
|
@@ -316,6 +354,14 @@
|
|
|
316
354
|
<optional>
|
|
317
355
|
<attribute name="width"/>
|
|
318
356
|
</optional>
|
|
357
|
+
<optional>
|
|
358
|
+
<attribute name="tag"/>
|
|
359
|
+
</optional>
|
|
360
|
+
<optional>
|
|
361
|
+
<attribute name="multilingual-rendering">
|
|
362
|
+
<ref name="MultilingualRenderingType"/>
|
|
363
|
+
</attribute>
|
|
364
|
+
</optional>
|
|
319
365
|
<optional>
|
|
320
366
|
<ref name="colgroup"/>
|
|
321
367
|
</optional>
|
|
@@ -366,6 +412,14 @@
|
|
|
366
412
|
<optional>
|
|
367
413
|
<attribute name="class"/>
|
|
368
414
|
</optional>
|
|
415
|
+
<optional>
|
|
416
|
+
<attribute name="tag"/>
|
|
417
|
+
</optional>
|
|
418
|
+
<optional>
|
|
419
|
+
<attribute name="multilingual-rendering">
|
|
420
|
+
<ref name="MultilingualRenderingType"/>
|
|
421
|
+
</attribute>
|
|
422
|
+
</optional>
|
|
369
423
|
<optional>
|
|
370
424
|
<ref name="source"/>
|
|
371
425
|
</optional>
|
|
@@ -424,6 +478,14 @@
|
|
|
424
478
|
<optional>
|
|
425
479
|
<attribute name="lang"/>
|
|
426
480
|
</optional>
|
|
481
|
+
<optional>
|
|
482
|
+
<attribute name="tag"/>
|
|
483
|
+
</optional>
|
|
484
|
+
<optional>
|
|
485
|
+
<attribute name="multilingual-rendering">
|
|
486
|
+
<ref name="MultilingualRenderingType"/>
|
|
487
|
+
</attribute>
|
|
488
|
+
</optional>
|
|
427
489
|
<optional>
|
|
428
490
|
<ref name="tname"/>
|
|
429
491
|
</optional>
|
|
@@ -472,6 +534,14 @@
|
|
|
472
534
|
<data type="boolean"/>
|
|
473
535
|
</attribute>
|
|
474
536
|
</optional>
|
|
537
|
+
<optional>
|
|
538
|
+
<attribute name="tag"/>
|
|
539
|
+
</optional>
|
|
540
|
+
<optional>
|
|
541
|
+
<attribute name="multilingual-rendering">
|
|
542
|
+
<ref name="MultilingualRenderingType"/>
|
|
543
|
+
</attribute>
|
|
544
|
+
</optional>
|
|
475
545
|
<ref name="stem"/>
|
|
476
546
|
<optional>
|
|
477
547
|
<ref name="dl"/>
|
|
@@ -500,6 +570,14 @@
|
|
|
500
570
|
<data type="boolean"/>
|
|
501
571
|
</attribute>
|
|
502
572
|
</optional>
|
|
573
|
+
<optional>
|
|
574
|
+
<attribute name="tag"/>
|
|
575
|
+
</optional>
|
|
576
|
+
<optional>
|
|
577
|
+
<attribute name="multilingual-rendering">
|
|
578
|
+
<ref name="MultilingualRenderingType"/>
|
|
579
|
+
</attribute>
|
|
580
|
+
</optional>
|
|
503
581
|
<zeroOrMore>
|
|
504
582
|
<ref name="TextElement"/>
|
|
505
583
|
</zeroOrMore>
|
|
@@ -527,6 +605,14 @@
|
|
|
527
605
|
<data type="boolean"/>
|
|
528
606
|
</attribute>
|
|
529
607
|
</optional>
|
|
608
|
+
<optional>
|
|
609
|
+
<attribute name="tag"/>
|
|
610
|
+
</optional>
|
|
611
|
+
<optional>
|
|
612
|
+
<attribute name="multilingual-rendering">
|
|
613
|
+
<ref name="MultilingualRenderingType"/>
|
|
614
|
+
</attribute>
|
|
615
|
+
</optional>
|
|
530
616
|
<zeroOrMore>
|
|
531
617
|
<choice>
|
|
532
618
|
<ref name="TextElement"/>
|
|
@@ -558,6 +644,14 @@
|
|
|
558
644
|
<data type="boolean"/>
|
|
559
645
|
</attribute>
|
|
560
646
|
</optional>
|
|
647
|
+
<optional>
|
|
648
|
+
<attribute name="tag"/>
|
|
649
|
+
</optional>
|
|
650
|
+
<optional>
|
|
651
|
+
<attribute name="multilingual-rendering">
|
|
652
|
+
<ref name="MultilingualRenderingType"/>
|
|
653
|
+
</attribute>
|
|
654
|
+
</optional>
|
|
561
655
|
<optional>
|
|
562
656
|
<ref name="quote-source"/>
|
|
563
657
|
</optional>
|
|
@@ -624,9 +718,6 @@
|
|
|
624
718
|
<zeroOrMore>
|
|
625
719
|
<ref name="BasicBlock"/>
|
|
626
720
|
</zeroOrMore>
|
|
627
|
-
<zeroOrMore>
|
|
628
|
-
<ref name="note"/>
|
|
629
|
-
</zeroOrMore>
|
|
630
721
|
<zeroOrMore>
|
|
631
722
|
<ref name="bibitem"/>
|
|
632
723
|
<zeroOrMore>
|
|
@@ -667,6 +758,14 @@
|
|
|
667
758
|
<optional>
|
|
668
759
|
<attribute name="type"/>
|
|
669
760
|
</optional>
|
|
761
|
+
<optional>
|
|
762
|
+
<attribute name="tag"/>
|
|
763
|
+
</optional>
|
|
764
|
+
<optional>
|
|
765
|
+
<attribute name="multilingual-rendering">
|
|
766
|
+
<ref name="MultilingualRenderingType"/>
|
|
767
|
+
</attribute>
|
|
768
|
+
</optional>
|
|
670
769
|
<oneOrMore>
|
|
671
770
|
<choice>
|
|
672
771
|
<ref name="paragraph"/>
|
|
@@ -703,14 +802,9 @@
|
|
|
703
802
|
<optional>
|
|
704
803
|
<ref name="section-title"/>
|
|
705
804
|
</optional>
|
|
706
|
-
<
|
|
707
|
-
<
|
|
708
|
-
|
|
709
|
-
</oneOrMore>
|
|
710
|
-
<zeroOrMore>
|
|
711
|
-
<ref name="note"/>
|
|
712
|
-
</zeroOrMore>
|
|
713
|
-
</group>
|
|
805
|
+
<oneOrMore>
|
|
806
|
+
<ref name="BasicBlock"/>
|
|
807
|
+
</oneOrMore>
|
|
714
808
|
</define>
|
|
715
809
|
<define name="li">
|
|
716
810
|
<element name="li">
|
|
@@ -845,6 +939,9 @@
|
|
|
845
939
|
<ref name="PureTextElement"/>
|
|
846
940
|
<ref name="stem"/>
|
|
847
941
|
<ref name="index"/>
|
|
942
|
+
<ref name="eref"/>
|
|
943
|
+
<ref name="xref"/>
|
|
944
|
+
<ref name="hyperlink"/>
|
|
848
945
|
</choice>
|
|
849
946
|
</zeroOrMore>
|
|
850
947
|
</element>
|
|
@@ -856,6 +953,9 @@
|
|
|
856
953
|
<ref name="PureTextElement"/>
|
|
857
954
|
<ref name="stem"/>
|
|
858
955
|
<ref name="index"/>
|
|
956
|
+
<ref name="eref"/>
|
|
957
|
+
<ref name="xref"/>
|
|
958
|
+
<ref name="hyperlink"/>
|
|
859
959
|
</choice>
|
|
860
960
|
</zeroOrMore>
|
|
861
961
|
</element>
|
|
@@ -866,6 +966,9 @@
|
|
|
866
966
|
<choice>
|
|
867
967
|
<ref name="PureTextElement"/>
|
|
868
968
|
<ref name="index"/>
|
|
969
|
+
<ref name="eref"/>
|
|
970
|
+
<ref name="xref"/>
|
|
971
|
+
<ref name="hyperlink"/>
|
|
869
972
|
</choice>
|
|
870
973
|
</zeroOrMore>
|
|
871
974
|
</element>
|
|
@@ -924,6 +1027,14 @@
|
|
|
924
1027
|
</define>
|
|
925
1028
|
</include>
|
|
926
1029
|
<!-- end overrides -->
|
|
1030
|
+
<define name="MultilingualRenderingType">
|
|
1031
|
+
<choice>
|
|
1032
|
+
<value>common</value>
|
|
1033
|
+
<value>all-columns</value>
|
|
1034
|
+
<value>parallel</value>
|
|
1035
|
+
<value>tag</value>
|
|
1036
|
+
</choice>
|
|
1037
|
+
</define>
|
|
927
1038
|
<define name="docsubtype">
|
|
928
1039
|
<element name="subdoctype">
|
|
929
1040
|
<ref name="DocumentSubtype"/>
|
|
@@ -1062,6 +1173,14 @@
|
|
|
1062
1173
|
<optional>
|
|
1063
1174
|
<attribute name="class"/>
|
|
1064
1175
|
</optional>
|
|
1176
|
+
<optional>
|
|
1177
|
+
<attribute name="tag"/>
|
|
1178
|
+
</optional>
|
|
1179
|
+
<optional>
|
|
1180
|
+
<attribute name="multilingual-rendering">
|
|
1181
|
+
<ref name="MultilingualRenderingType"/>
|
|
1182
|
+
</attribute>
|
|
1183
|
+
</optional>
|
|
1065
1184
|
<zeroOrMore>
|
|
1066
1185
|
<choice>
|
|
1067
1186
|
<ref name="TextElement"/>
|
|
@@ -1261,9 +1380,6 @@
|
|
|
1261
1380
|
<zeroOrMore>
|
|
1262
1381
|
<ref name="BasicBlock"/>
|
|
1263
1382
|
</zeroOrMore>
|
|
1264
|
-
<zeroOrMore>
|
|
1265
|
-
<ref name="note"/>
|
|
1266
|
-
</zeroOrMore>
|
|
1267
1383
|
<choice>
|
|
1268
1384
|
<oneOrMore>
|
|
1269
1385
|
<ref name="reference-clause"/>
|
|
@@ -1446,9 +1562,6 @@
|
|
|
1446
1562
|
<zeroOrMore>
|
|
1447
1563
|
<ref name="BasicBlock"/>
|
|
1448
1564
|
</zeroOrMore>
|
|
1449
|
-
<zeroOrMore>
|
|
1450
|
-
<ref name="note"/>
|
|
1451
|
-
</zeroOrMore>
|
|
1452
1565
|
<ref name="dl"/>
|
|
1453
1566
|
</oneOrMore>
|
|
1454
1567
|
</element>
|
|
@@ -1508,14 +1621,9 @@
|
|
|
1508
1621
|
<ref name="section-title"/>
|
|
1509
1622
|
</optional>
|
|
1510
1623
|
<group>
|
|
1511
|
-
<
|
|
1512
|
-
<
|
|
1513
|
-
|
|
1514
|
-
</zeroOrMore>
|
|
1515
|
-
<zeroOrMore>
|
|
1516
|
-
<ref name="note"/>
|
|
1517
|
-
</zeroOrMore>
|
|
1518
|
-
</group>
|
|
1624
|
+
<zeroOrMore>
|
|
1625
|
+
<ref name="BasicBlock"/>
|
|
1626
|
+
</zeroOrMore>
|
|
1519
1627
|
<zeroOrMore>
|
|
1520
1628
|
<ref name="content-subsection"/>
|
|
1521
1629
|
</zeroOrMore>
|
|
@@ -1562,14 +1670,9 @@
|
|
|
1562
1670
|
</optional>
|
|
1563
1671
|
<choice>
|
|
1564
1672
|
<choice>
|
|
1565
|
-
<
|
|
1566
|
-
<
|
|
1567
|
-
|
|
1568
|
-
</oneOrMore>
|
|
1569
|
-
<zeroOrMore>
|
|
1570
|
-
<ref name="note"/>
|
|
1571
|
-
</zeroOrMore>
|
|
1572
|
-
</group>
|
|
1673
|
+
<oneOrMore>
|
|
1674
|
+
<ref name="BasicBlock"/>
|
|
1675
|
+
</oneOrMore>
|
|
1573
1676
|
<ref name="amend"/>
|
|
1574
1677
|
</choice>
|
|
1575
1678
|
<oneOrMore>
|
|
@@ -1610,14 +1713,9 @@
|
|
|
1610
1713
|
<ref name="section-title"/>
|
|
1611
1714
|
</optional>
|
|
1612
1715
|
<group>
|
|
1613
|
-
<
|
|
1614
|
-
<
|
|
1615
|
-
|
|
1616
|
-
</zeroOrMore>
|
|
1617
|
-
<zeroOrMore>
|
|
1618
|
-
<ref name="note"/>
|
|
1619
|
-
</zeroOrMore>
|
|
1620
|
-
</group>
|
|
1716
|
+
<zeroOrMore>
|
|
1717
|
+
<ref name="BasicBlock"/>
|
|
1718
|
+
</zeroOrMore>
|
|
1621
1719
|
<zeroOrMore>
|
|
1622
1720
|
<choice>
|
|
1623
1721
|
<ref name="annex-subsection"/>
|
|
@@ -1676,9 +1774,6 @@
|
|
|
1676
1774
|
<zeroOrMore>
|
|
1677
1775
|
<ref name="BasicBlock"/>
|
|
1678
1776
|
</zeroOrMore>
|
|
1679
|
-
<zeroOrMore>
|
|
1680
|
-
<ref name="note"/>
|
|
1681
|
-
</zeroOrMore>
|
|
1682
1777
|
<choice>
|
|
1683
1778
|
<oneOrMore>
|
|
1684
1779
|
<ref name="term"/>
|
|
@@ -1824,6 +1919,14 @@
|
|
|
1824
1919
|
<data type="boolean"/>
|
|
1825
1920
|
</attribute>
|
|
1826
1921
|
</optional>
|
|
1922
|
+
<optional>
|
|
1923
|
+
<attribute name="tag"/>
|
|
1924
|
+
</optional>
|
|
1925
|
+
<optional>
|
|
1926
|
+
<attribute name="multilingual-rendering">
|
|
1927
|
+
<ref name="MultilingualRenderingType"/>
|
|
1928
|
+
</attribute>
|
|
1929
|
+
</optional>
|
|
1827
1930
|
<oneOrMore>
|
|
1828
1931
|
<choice>
|
|
1829
1932
|
<ref name="paragraph"/>
|
|
@@ -1840,6 +1943,24 @@
|
|
|
1840
1943
|
<attribute name="id">
|
|
1841
1944
|
<data type="ID"/>
|
|
1842
1945
|
</attribute>
|
|
1946
|
+
<optional>
|
|
1947
|
+
<attribute name="keep-with-next">
|
|
1948
|
+
<data type="boolean"/>
|
|
1949
|
+
</attribute>
|
|
1950
|
+
</optional>
|
|
1951
|
+
<optional>
|
|
1952
|
+
<attribute name="keep-lines-together">
|
|
1953
|
+
<data type="boolean"/>
|
|
1954
|
+
</attribute>
|
|
1955
|
+
</optional>
|
|
1956
|
+
<optional>
|
|
1957
|
+
<attribute name="tag"/>
|
|
1958
|
+
</optional>
|
|
1959
|
+
<optional>
|
|
1960
|
+
<attribute name="multilingual-rendering">
|
|
1961
|
+
<ref name="MultilingualRenderingType"/>
|
|
1962
|
+
</attribute>
|
|
1963
|
+
</optional>
|
|
1843
1964
|
<ref name="paragraph"/>
|
|
1844
1965
|
</element>
|
|
1845
1966
|
</define>
|
|
@@ -1966,9 +2087,6 @@
|
|
|
1966
2087
|
<zeroOrMore>
|
|
1967
2088
|
<ref name="BasicBlock"/>
|
|
1968
2089
|
</zeroOrMore>
|
|
1969
|
-
<zeroOrMore>
|
|
1970
|
-
<ref name="note"/>
|
|
1971
|
-
</zeroOrMore>
|
|
1972
2090
|
<zeroOrMore>
|
|
1973
2091
|
<choice>
|
|
1974
2092
|
<ref name="term-clause"/>
|
|
@@ -2007,6 +2125,14 @@
|
|
|
2007
2125
|
<optional>
|
|
2008
2126
|
<attribute name="title"/>
|
|
2009
2127
|
</optional>
|
|
2128
|
+
<optional>
|
|
2129
|
+
<attribute name="tag"/>
|
|
2130
|
+
</optional>
|
|
2131
|
+
<optional>
|
|
2132
|
+
<attribute name="multilingual-rendering">
|
|
2133
|
+
<ref name="MultilingualRenderingType"/>
|
|
2134
|
+
</attribute>
|
|
2135
|
+
</optional>
|
|
2010
2136
|
<optional>
|
|
2011
2137
|
<element name="location">
|
|
2012
2138
|
<zeroOrMore>
|
|
@@ -2066,6 +2192,14 @@
|
|
|
2066
2192
|
</define>
|
|
2067
2193
|
<define name="imagemap">
|
|
2068
2194
|
<element name="imagemap">
|
|
2195
|
+
<optional>
|
|
2196
|
+
<attribute name="tag"/>
|
|
2197
|
+
</optional>
|
|
2198
|
+
<optional>
|
|
2199
|
+
<attribute name="multilingual-rendering">
|
|
2200
|
+
<ref name="MultilingualRenderingType"/>
|
|
2201
|
+
</attribute>
|
|
2202
|
+
</optional>
|
|
2069
2203
|
<ref name="figure"/>
|
|
2070
2204
|
<zeroOrMore>
|
|
2071
2205
|
<element name="area">
|
|
@@ -2110,6 +2244,14 @@
|
|
|
2110
2244
|
</define>
|
|
2111
2245
|
<define name="svgmap">
|
|
2112
2246
|
<element name="svgmap">
|
|
2247
|
+
<optional>
|
|
2248
|
+
<attribute name="tag"/>
|
|
2249
|
+
</optional>
|
|
2250
|
+
<optional>
|
|
2251
|
+
<attribute name="multilingual-rendering">
|
|
2252
|
+
<ref name="MultilingualRenderingType"/>
|
|
2253
|
+
</attribute>
|
|
2254
|
+
</optional>
|
|
2113
2255
|
<ref name="figure"/>
|
|
2114
2256
|
<zeroOrMore>
|
|
2115
2257
|
<element name="target">
|
data/lib/asciidoctor/cc/reqt.rng
CHANGED
|
@@ -58,6 +58,14 @@
|
|
|
58
58
|
<optional>
|
|
59
59
|
<attribute name="type"/>
|
|
60
60
|
</optional>
|
|
61
|
+
<optional>
|
|
62
|
+
<attribute name="tag"/>
|
|
63
|
+
</optional>
|
|
64
|
+
<optional>
|
|
65
|
+
<attribute name="multilingual-rendering">
|
|
66
|
+
<ref name="MultilingualRenderingType"/>
|
|
67
|
+
</attribute>
|
|
68
|
+
</optional>
|
|
61
69
|
<optional>
|
|
62
70
|
<ref name="reqtitle"/>
|
|
63
71
|
</optional>
|
|
@@ -101,7 +109,9 @@
|
|
|
101
109
|
</define>
|
|
102
110
|
<define name="label">
|
|
103
111
|
<element name="label">
|
|
104
|
-
<
|
|
112
|
+
<oneOrMore>
|
|
113
|
+
<ref name="TextElement"/>
|
|
114
|
+
</oneOrMore>
|
|
105
115
|
</element>
|
|
106
116
|
</define>
|
|
107
117
|
<define name="subject">
|
|
@@ -175,8 +185,19 @@
|
|
|
175
185
|
<data type="boolean"/>
|
|
176
186
|
</attribute>
|
|
177
187
|
</optional>
|
|
188
|
+
<optional>
|
|
189
|
+
<attribute name="tag"/>
|
|
190
|
+
</optional>
|
|
191
|
+
<optional>
|
|
192
|
+
<attribute name="multilingual-rendering">
|
|
193
|
+
<ref name="MultilingualRenderingType"/>
|
|
194
|
+
</attribute>
|
|
195
|
+
</optional>
|
|
178
196
|
<oneOrMore>
|
|
179
|
-
<
|
|
197
|
+
<choice>
|
|
198
|
+
<ref name="BasicBlock"/>
|
|
199
|
+
<ref name="component"/>
|
|
200
|
+
</choice>
|
|
180
201
|
</oneOrMore>
|
|
181
202
|
</define>
|
|
182
203
|
<define name="ObligationType">
|
|
@@ -1201,6 +1201,11 @@
|
|
|
1201
1201
|
|
|
1202
1202
|
|
|
1203
1203
|
|
|
1204
|
+
</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
|
|
1205
|
+
|
|
1206
|
+
|
|
1207
|
+
|
|
1208
|
+
|
|
1204
1209
|
</xsl:attribute-set><xsl:attribute-set name="note-p-style">
|
|
1205
1210
|
|
|
1206
1211
|
|
|
@@ -2284,9 +2289,8 @@
|
|
|
2284
2289
|
|
|
2285
2290
|
<!-- Table's note name (NOTE, for example) -->
|
|
2286
2291
|
|
|
2287
|
-
<fo:inline padding-right="2mm">
|
|
2292
|
+
<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
|
|
2288
2293
|
|
|
2289
|
-
|
|
2290
2294
|
|
|
2291
2295
|
|
|
2292
2296
|
|
|
@@ -2898,6 +2902,8 @@
|
|
|
2898
2902
|
<xsl:if test="$font-size != ''">
|
|
2899
2903
|
<xsl:attribute name="font-size">
|
|
2900
2904
|
<xsl:choose>
|
|
2905
|
+
<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
|
|
2906
|
+
<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
|
|
2901
2907
|
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
|
|
2902
2908
|
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
|
|
2903
2909
|
</xsl:choose>
|
|
@@ -4354,12 +4360,16 @@
|
|
|
4354
4360
|
<xsl:if test="$font-size != ''">
|
|
4355
4361
|
<xsl:attribute name="font-size">
|
|
4356
4362
|
<xsl:choose>
|
|
4363
|
+
<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
|
|
4364
|
+
<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
|
|
4357
4365
|
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
|
|
4358
4366
|
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
|
|
4359
4367
|
</xsl:choose>
|
|
4360
4368
|
</xsl:attribute>
|
|
4361
4369
|
</xsl:if>
|
|
4362
4370
|
|
|
4371
|
+
|
|
4372
|
+
|
|
4363
4373
|
<xsl:apply-templates/>
|
|
4364
4374
|
</fo:block>
|
|
4365
4375
|
|
|
@@ -152,6 +152,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
|
|
|
152
152
|
|
|
153
153
|
p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
|
|
154
154
|
mso-style-noshow: yes;
|
|
155
|
+
mso-style-name: "Comment Text";
|
|
155
156
|
mso-style-unhide: no;
|
|
156
157
|
margin: 0cm;
|
|
157
158
|
margin-bottom: .0001pt;
|
|
@@ -371,6 +372,7 @@ div.figure, p.figure {
|
|
|
371
372
|
|
|
372
373
|
h1 {
|
|
373
374
|
mso-style-priority: 1;
|
|
375
|
+
mso-style-name: "Heading 1";
|
|
374
376
|
mso-style-unhide: no;
|
|
375
377
|
mso-style-qformat: yes;
|
|
376
378
|
mso-style-link: "Heading 1 Char";
|
|
@@ -457,6 +459,7 @@ h1.Annex {
|
|
|
457
459
|
|
|
458
460
|
h2 {
|
|
459
461
|
mso-style-priority: 2;
|
|
462
|
+
mso-style-name: "Heading 2";
|
|
460
463
|
mso-style-unhide: no;
|
|
461
464
|
mso-style-qformat: yes;
|
|
462
465
|
mso-style-parent: "Heading 1";
|
|
@@ -485,6 +488,7 @@ h2 {
|
|
|
485
488
|
|
|
486
489
|
h3 {
|
|
487
490
|
mso-style-priority: 3;
|
|
491
|
+
mso-style-name: "Heading 3";
|
|
488
492
|
mso-style-unhide: no;
|
|
489
493
|
mso-style-qformat: yes;
|
|
490
494
|
mso-style-parent: "Heading 1";
|
|
@@ -512,6 +516,7 @@ h3 {
|
|
|
512
516
|
|
|
513
517
|
h4 {
|
|
514
518
|
mso-style-priority: 4;
|
|
519
|
+
mso-style-name: "Heading 4";
|
|
515
520
|
mso-style-unhide: no;
|
|
516
521
|
mso-style-qformat: yes;
|
|
517
522
|
mso-style-parent: "Heading 3";
|
|
@@ -539,6 +544,7 @@ h4 {
|
|
|
539
544
|
|
|
540
545
|
h5 {
|
|
541
546
|
mso-style-priority: 5;
|
|
547
|
+
mso-style-name: "Heading 5";
|
|
542
548
|
mso-style-unhide: no;
|
|
543
549
|
mso-style-qformat: yes;
|
|
544
550
|
mso-style-parent: "Heading 4";
|
|
@@ -566,6 +572,7 @@ h5 {
|
|
|
566
572
|
|
|
567
573
|
h6 {
|
|
568
574
|
mso-style-priority: 6;
|
|
575
|
+
mso-style-name: "Heading 6";
|
|
569
576
|
mso-style-unhide: no;
|
|
570
577
|
mso-style-qformat: yes;
|
|
571
578
|
mso-style-parent: "Heading 5";
|
|
@@ -593,6 +600,7 @@ h6 {
|
|
|
593
600
|
|
|
594
601
|
p.MsoToc1, li.MsoToc1, div.MsoToc1 {
|
|
595
602
|
mso-style-priority: 39;
|
|
603
|
+
mso-style-name: "TOC 1";
|
|
596
604
|
mso-style-unhide: no;
|
|
597
605
|
mso-style-next: Normal;
|
|
598
606
|
margin-top: 6.0pt;
|
|
@@ -615,6 +623,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 {
|
|
|
615
623
|
|
|
616
624
|
p.MsoToc2, li.MsoToc2, div.MsoToc2 {
|
|
617
625
|
mso-style-noshow: yes;
|
|
626
|
+
mso-style-name: "TOC 2";
|
|
618
627
|
mso-style-priority: 39;
|
|
619
628
|
mso-style-unhide: no;
|
|
620
629
|
mso-style-parent: "TOC 1";
|
|
@@ -639,6 +648,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
|
|
|
639
648
|
|
|
640
649
|
p.MsoToc3, li.MsoToc3, div.MsoToc3 {
|
|
641
650
|
mso-style-noshow: yes;
|
|
651
|
+
mso-style-name: "TOC 3";
|
|
642
652
|
mso-style-priority: 39;
|
|
643
653
|
mso-style-unhide: no;
|
|
644
654
|
mso-style-parent: "TOC 2";
|
|
@@ -662,6 +672,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
|
|
|
662
672
|
mso-bidi-font-weight: normal; }
|
|
663
673
|
|
|
664
674
|
span.MsoFootnoteReference {
|
|
675
|
+
mso-style-name: "Footnote Reference";
|
|
665
676
|
mso-style-priority: 99;
|
|
666
677
|
vertical-align: super; }
|
|
667
678
|
|
|
@@ -138,6 +138,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
|
|
|
138
138
|
|
|
139
139
|
p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
|
|
140
140
|
{mso-style-noshow:yes;
|
|
141
|
+
mso-style-name:"Comment Text";
|
|
141
142
|
mso-style-unhide:no;
|
|
142
143
|
margin:0cm;
|
|
143
144
|
margin-bottom:.0001pt;
|
|
@@ -341,6 +342,7 @@ div.figure, p.figure
|
|
|
341
342
|
|
|
342
343
|
h1
|
|
343
344
|
{mso-style-priority:1;
|
|
345
|
+
mso-style-name:"Heading 1";
|
|
344
346
|
mso-style-unhide:no;
|
|
345
347
|
mso-style-qformat:yes;
|
|
346
348
|
mso-style-link:"Heading 1 Char";
|
|
@@ -424,6 +426,7 @@ h1.Annex
|
|
|
424
426
|
mso-bidi-font-weight:normal;}
|
|
425
427
|
h2
|
|
426
428
|
{mso-style-priority:2;
|
|
429
|
+
mso-style-name:"Heading 2";
|
|
427
430
|
mso-style-unhide:no;
|
|
428
431
|
mso-style-qformat:yes;
|
|
429
432
|
mso-style-parent:"Heading 1";
|
|
@@ -451,6 +454,7 @@ h2
|
|
|
451
454
|
mso-bidi-font-weight:normal;}
|
|
452
455
|
h3
|
|
453
456
|
{mso-style-priority:3;
|
|
457
|
+
mso-style-name:"Heading 3";
|
|
454
458
|
mso-style-unhide:no;
|
|
455
459
|
mso-style-qformat:yes;
|
|
456
460
|
mso-style-parent:"Heading 1";
|
|
@@ -477,6 +481,7 @@ h3
|
|
|
477
481
|
mso-bidi-font-weight:normal;}
|
|
478
482
|
h4
|
|
479
483
|
{mso-style-priority:4;
|
|
484
|
+
mso-style-name:"Heading 4";
|
|
480
485
|
mso-style-unhide:no;
|
|
481
486
|
mso-style-qformat:yes;
|
|
482
487
|
mso-style-parent:"Heading 3";
|
|
@@ -503,6 +508,7 @@ h4
|
|
|
503
508
|
mso-bidi-font-weight:normal;}
|
|
504
509
|
h5
|
|
505
510
|
{mso-style-priority:5;
|
|
511
|
+
mso-style-name:"Heading 5";
|
|
506
512
|
mso-style-unhide:no;
|
|
507
513
|
mso-style-qformat:yes;
|
|
508
514
|
mso-style-parent:"Heading 4";
|
|
@@ -529,6 +535,7 @@ h5
|
|
|
529
535
|
mso-bidi-font-weight:normal;}
|
|
530
536
|
h6
|
|
531
537
|
{mso-style-priority:6;
|
|
538
|
+
mso-style-name:"Heading 6";
|
|
532
539
|
mso-style-unhide:no;
|
|
533
540
|
mso-style-qformat:yes;
|
|
534
541
|
mso-style-parent:"Heading 5";
|
|
@@ -555,6 +562,7 @@ h6
|
|
|
555
562
|
mso-bidi-font-weight:normal;}
|
|
556
563
|
p.MsoToc1, li.MsoToc1, div.MsoToc1
|
|
557
564
|
{mso-style-priority:39;
|
|
565
|
+
mso-style-name:"TOC 1";
|
|
558
566
|
mso-style-unhide:no;
|
|
559
567
|
mso-style-next:Normal;
|
|
560
568
|
margin-top:6.0pt;
|
|
@@ -576,6 +584,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
|
|
|
576
584
|
mso-bidi-font-weight:normal;}
|
|
577
585
|
p.MsoToc2, li.MsoToc2, div.MsoToc2
|
|
578
586
|
{mso-style-noshow:yes;
|
|
587
|
+
mso-style-name:"TOC 2";
|
|
579
588
|
mso-style-priority:39;
|
|
580
589
|
mso-style-unhide:no;
|
|
581
590
|
mso-style-parent:"TOC 1";
|
|
@@ -599,6 +608,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
|
|
|
599
608
|
mso-bidi-font-weight:normal;}
|
|
600
609
|
p.MsoToc3, li.MsoToc3, div.MsoToc3
|
|
601
610
|
{mso-style-noshow:yes;
|
|
611
|
+
mso-style-name:"TOC 3";
|
|
602
612
|
mso-style-priority:39;
|
|
603
613
|
mso-style-unhide:no;
|
|
604
614
|
mso-style-parent:"TOC 2";
|
|
@@ -620,8 +630,9 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
|
|
|
620
630
|
mso-ansi-language:EN-GB;
|
|
621
631
|
font-weight:bold;
|
|
622
632
|
mso-bidi-font-weight:normal;}
|
|
623
|
-
span.MsoFootnoteReference
|
|
624
|
-
|
|
633
|
+
span.MsoFootnoteReference {
|
|
634
|
+
mso-style-name:"Footnote Reference";
|
|
635
|
+
mso-style-priority:99;
|
|
625
636
|
vertical-align:super;}
|
|
626
637
|
p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
|
|
627
638
|
{mso-style-noshow:yes;
|
data/lib/metanorma/cc/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-cc
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.7.
|
|
4
|
+
version: 1.7.13
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-
|
|
11
|
+
date: 2021-10-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-generic
|