metanorma-csa 1.8.12 → 1.8.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/csa/basicdoc.rng +21 -4
- data/lib/asciidoctor/csa/isodoc.rng +192 -50
- data/lib/asciidoctor/csa/reqt.rng +23 -2
- data/lib/isodoc/csa/base_convert.rb +1 -1
- data/lib/isodoc/csa/csa.standard.xsl +12 -2
- data/lib/isodoc/csa/html/wordstyle.css +12 -1
- data/lib/isodoc/csa/html/wordstyle.scss +12 -1
- data/lib/isodoc/csa/word_convert.rb +4 -5
- data/lib/metanorma/csa/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: '0278402202df1d54400e2484353f2b72e6cc1cb1460b667d612e33ed59866bd8'
|
|
4
|
+
data.tar.gz: 5b0dc26b3f6ca9a6ebcefae0aab24c489d2cd44375b460fa7de256f49df33241
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1777e7470a39065734ebdba76f5b393516e368af17d023028caa91e91f968bff5228fb895ae9838b6eaeb9c27457fadd25a396331074d70043efd58959913051
|
|
7
|
+
data.tar.gz: f5d341dc22ac44eb35c04ffa55f7bdab25963543eb1f1851e3602563296f573e7793268b10e7a5bc9d70be5ad6e4b61f272e894a78b625a0e1a43324c2a39d87
|
|
@@ -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">
|
|
@@ -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">
|
|
@@ -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">
|
|
@@ -1276,6 +1276,11 @@
|
|
|
1276
1276
|
|
|
1277
1277
|
|
|
1278
1278
|
|
|
1279
|
+
</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
|
|
1280
|
+
|
|
1281
|
+
|
|
1282
|
+
|
|
1283
|
+
|
|
1279
1284
|
</xsl:attribute-set><xsl:attribute-set name="note-p-style">
|
|
1280
1285
|
|
|
1281
1286
|
<xsl:attribute name="margin-top">12pt</xsl:attribute>
|
|
@@ -2361,9 +2366,8 @@
|
|
|
2361
2366
|
|
|
2362
2367
|
<!-- Table's note name (NOTE, for example) -->
|
|
2363
2368
|
|
|
2364
|
-
<fo:inline padding-right="2mm">
|
|
2369
|
+
<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
|
|
2365
2370
|
|
|
2366
|
-
|
|
2367
2371
|
|
|
2368
2372
|
|
|
2369
2373
|
|
|
@@ -2971,6 +2975,8 @@
|
|
|
2971
2975
|
<xsl:if test="$font-size != ''">
|
|
2972
2976
|
<xsl:attribute name="font-size">
|
|
2973
2977
|
<xsl:choose>
|
|
2978
|
+
<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
|
|
2979
|
+
<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
|
|
2974
2980
|
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
|
|
2975
2981
|
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
|
|
2976
2982
|
</xsl:choose>
|
|
@@ -4431,12 +4437,16 @@
|
|
|
4431
4437
|
<xsl:if test="$font-size != ''">
|
|
4432
4438
|
<xsl:attribute name="font-size">
|
|
4433
4439
|
<xsl:choose>
|
|
4440
|
+
<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
|
|
4441
|
+
<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
|
|
4434
4442
|
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
|
|
4435
4443
|
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
|
|
4436
4444
|
</xsl:choose>
|
|
4437
4445
|
</xsl:attribute>
|
|
4438
4446
|
</xsl:if>
|
|
4439
4447
|
|
|
4448
|
+
|
|
4449
|
+
|
|
4440
4450
|
<xsl:apply-templates/>
|
|
4441
4451
|
</fo:block>
|
|
4442
4452
|
|
|
@@ -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;
|
|
@@ -373,6 +374,7 @@ h1 {
|
|
|
373
374
|
mso-style-priority: 1;
|
|
374
375
|
mso-style-unhide: no;
|
|
375
376
|
mso-style-qformat: yes;
|
|
377
|
+
mso-style-name: "Heading 1";
|
|
376
378
|
mso-style-link: "Heading 1 Char";
|
|
377
379
|
mso-style-next: Normal;
|
|
378
380
|
margin-top: 13.5pt;
|
|
@@ -459,6 +461,7 @@ h2 {
|
|
|
459
461
|
mso-style-priority: 2;
|
|
460
462
|
mso-style-unhide: no;
|
|
461
463
|
mso-style-qformat: yes;
|
|
464
|
+
mso-style-name: "Heading 2";
|
|
462
465
|
mso-style-parent: "Heading 1";
|
|
463
466
|
mso-style-link: "Heading 2 Char";
|
|
464
467
|
mso-style-next: Normal;
|
|
@@ -487,7 +490,8 @@ h3 {
|
|
|
487
490
|
mso-style-priority: 3;
|
|
488
491
|
mso-style-unhide: no;
|
|
489
492
|
mso-style-qformat: yes;
|
|
490
|
-
mso-style-
|
|
493
|
+
mso-style-name: "Heading 3";
|
|
494
|
+
mso-style-parent: "Heading 2";
|
|
491
495
|
mso-style-link: "Heading 3 Char";
|
|
492
496
|
mso-style-next: Normal;
|
|
493
497
|
margin-top: 3.0pt;
|
|
@@ -514,6 +518,7 @@ h4 {
|
|
|
514
518
|
mso-style-priority: 4;
|
|
515
519
|
mso-style-unhide: no;
|
|
516
520
|
mso-style-qformat: yes;
|
|
521
|
+
mso-style-name: "Heading 4";
|
|
517
522
|
mso-style-parent: "Heading 3";
|
|
518
523
|
mso-style-link: "Heading 4 Char";
|
|
519
524
|
mso-style-next: Normal;
|
|
@@ -541,6 +546,7 @@ h5 {
|
|
|
541
546
|
mso-style-priority: 5;
|
|
542
547
|
mso-style-unhide: no;
|
|
543
548
|
mso-style-qformat: yes;
|
|
549
|
+
mso-style-name: "Heading 5";
|
|
544
550
|
mso-style-parent: "Heading 4";
|
|
545
551
|
mso-style-link: "Heading 5 Char";
|
|
546
552
|
mso-style-next: Normal;
|
|
@@ -568,6 +574,7 @@ h6 {
|
|
|
568
574
|
mso-style-priority: 6;
|
|
569
575
|
mso-style-unhide: no;
|
|
570
576
|
mso-style-qformat: yes;
|
|
577
|
+
mso-style-name: "Heading 6";
|
|
571
578
|
mso-style-parent: "Heading 5";
|
|
572
579
|
mso-style-link: "Heading 6 Char";
|
|
573
580
|
mso-style-next: Normal;
|
|
@@ -594,6 +601,7 @@ h6 {
|
|
|
594
601
|
p.MsoToc1, li.MsoToc1, div.MsoToc1 {
|
|
595
602
|
mso-style-priority: 39;
|
|
596
603
|
mso-style-unhide: no;
|
|
604
|
+
mso-style-name: "TOC 1";
|
|
597
605
|
mso-style-next: Normal;
|
|
598
606
|
margin-top: 6.0pt;
|
|
599
607
|
margin-right: 25.0pt;
|
|
@@ -617,6 +625,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
|
|
|
617
625
|
mso-style-noshow: yes;
|
|
618
626
|
mso-style-priority: 39;
|
|
619
627
|
mso-style-unhide: no;
|
|
628
|
+
mso-style-name: "TOC 2";
|
|
620
629
|
mso-style-parent: "TOC 1";
|
|
621
630
|
mso-style-next: Normal;
|
|
622
631
|
margin-top: 0cm;
|
|
@@ -641,6 +650,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
|
|
|
641
650
|
mso-style-noshow: yes;
|
|
642
651
|
mso-style-priority: 39;
|
|
643
652
|
mso-style-unhide: no;
|
|
653
|
+
mso-style-name: "TOC 3";
|
|
644
654
|
mso-style-parent: "TOC 2";
|
|
645
655
|
mso-style-next: Normal;
|
|
646
656
|
margin-top: 0cm;
|
|
@@ -663,6 +673,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
|
|
|
663
673
|
|
|
664
674
|
span.MsoFootnoteReference {
|
|
665
675
|
mso-style-priority: 99;
|
|
676
|
+
mso-style-name: "Footnote Reference";
|
|
666
677
|
vertical-align: super; }
|
|
667
678
|
|
|
668
679
|
p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
|
|
@@ -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;
|
|
@@ -343,6 +344,7 @@ h1
|
|
|
343
344
|
{mso-style-priority:1;
|
|
344
345
|
mso-style-unhide:no;
|
|
345
346
|
mso-style-qformat:yes;
|
|
347
|
+
mso-style-name:"Heading 1";
|
|
346
348
|
mso-style-link:"Heading 1 Char";
|
|
347
349
|
mso-style-next:Normal;
|
|
348
350
|
margin-top:13.5pt;
|
|
@@ -426,6 +428,7 @@ h2
|
|
|
426
428
|
{mso-style-priority:2;
|
|
427
429
|
mso-style-unhide:no;
|
|
428
430
|
mso-style-qformat:yes;
|
|
431
|
+
mso-style-name:"Heading 2";
|
|
429
432
|
mso-style-parent:"Heading 1";
|
|
430
433
|
mso-style-link:"Heading 2 Char";
|
|
431
434
|
mso-style-next:Normal;
|
|
@@ -453,7 +456,8 @@ h3
|
|
|
453
456
|
{mso-style-priority:3;
|
|
454
457
|
mso-style-unhide:no;
|
|
455
458
|
mso-style-qformat:yes;
|
|
456
|
-
|
|
459
|
+
mso-style-name:"Heading 3";
|
|
460
|
+
mso-style-parent:"Heading 2";
|
|
457
461
|
mso-style-link:"Heading 3 Char";
|
|
458
462
|
mso-style-next:Normal;
|
|
459
463
|
margin-top:3.0pt;
|
|
@@ -479,6 +483,7 @@ h4
|
|
|
479
483
|
{mso-style-priority:4;
|
|
480
484
|
mso-style-unhide:no;
|
|
481
485
|
mso-style-qformat:yes;
|
|
486
|
+
mso-style-name:"Heading 4";
|
|
482
487
|
mso-style-parent:"Heading 3";
|
|
483
488
|
mso-style-link:"Heading 4 Char";
|
|
484
489
|
mso-style-next:Normal;
|
|
@@ -505,6 +510,7 @@ h5
|
|
|
505
510
|
{mso-style-priority:5;
|
|
506
511
|
mso-style-unhide:no;
|
|
507
512
|
mso-style-qformat:yes;
|
|
513
|
+
mso-style-name:"Heading 5";
|
|
508
514
|
mso-style-parent:"Heading 4";
|
|
509
515
|
mso-style-link:"Heading 5 Char";
|
|
510
516
|
mso-style-next:Normal;
|
|
@@ -531,6 +537,7 @@ h6
|
|
|
531
537
|
{mso-style-priority:6;
|
|
532
538
|
mso-style-unhide:no;
|
|
533
539
|
mso-style-qformat:yes;
|
|
540
|
+
mso-style-name:"Heading 6";
|
|
534
541
|
mso-style-parent:"Heading 5";
|
|
535
542
|
mso-style-link:"Heading 6 Char";
|
|
536
543
|
mso-style-next:Normal;
|
|
@@ -556,6 +563,7 @@ h6
|
|
|
556
563
|
p.MsoToc1, li.MsoToc1, div.MsoToc1
|
|
557
564
|
{mso-style-priority:39;
|
|
558
565
|
mso-style-unhide:no;
|
|
566
|
+
mso-style-name:"TOC 1";
|
|
559
567
|
mso-style-next:Normal;
|
|
560
568
|
margin-top:6.0pt;
|
|
561
569
|
margin-right:25.0pt;
|
|
@@ -578,6 +586,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
|
|
|
578
586
|
{mso-style-noshow:yes;
|
|
579
587
|
mso-style-priority:39;
|
|
580
588
|
mso-style-unhide:no;
|
|
589
|
+
mso-style-name:"TOC 2";
|
|
581
590
|
mso-style-parent:"TOC 1";
|
|
582
591
|
mso-style-next:Normal;
|
|
583
592
|
margin-top:0cm;
|
|
@@ -601,6 +610,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
|
|
|
601
610
|
{mso-style-noshow:yes;
|
|
602
611
|
mso-style-priority:39;
|
|
603
612
|
mso-style-unhide:no;
|
|
613
|
+
mso-style-name:"TOC 3";
|
|
604
614
|
mso-style-parent:"TOC 2";
|
|
605
615
|
mso-style-next:Normal;
|
|
606
616
|
margin-top:0cm;
|
|
@@ -622,6 +632,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
|
|
|
622
632
|
mso-bidi-font-weight:normal;}
|
|
623
633
|
span.MsoFootnoteReference
|
|
624
634
|
{mso-style-priority:99;
|
|
635
|
+
mso-style-name:"Footnote Reference";
|
|
625
636
|
vertical-align:super;}
|
|
626
637
|
p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
|
|
627
638
|
{mso-style-noshow:yes;
|
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require_relative
|
|
3
|
+
require_relative "base_convert"
|
|
4
4
|
require "isodoc/generic/word_convert"
|
|
5
|
-
require_relative
|
|
6
|
-
require
|
|
5
|
+
require_relative "init"
|
|
6
|
+
require "isodoc"
|
|
7
7
|
|
|
8
8
|
module IsoDoc
|
|
9
9
|
module Csa
|
|
10
10
|
# A {Converter} implementation that generates CSA output, and a document
|
|
11
11
|
# schema encapsulation of the document for validation
|
|
12
|
-
class WordConvert < IsoDoc::WordConvert
|
|
13
|
-
|
|
12
|
+
class WordConvert < IsoDoc::Generic::WordConvert
|
|
14
13
|
include BaseConvert
|
|
15
14
|
include Init
|
|
16
15
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-csa
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.8.
|
|
4
|
+
version: 1.8.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
|