metanorma-un 0.6.12 → 0.6.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/un/basicdoc.rng +21 -4
- data/lib/asciidoctor/un/isodoc.rng +192 -50
- data/lib/asciidoctor/un/reqt.rng +23 -2
- data/lib/asciidoctor/un/un.rng +6 -16
- data/lib/isodoc/un/html/wordstyle.css +12 -1
- data/lib/isodoc/un/html/wordstyle.scss +12 -1
- data/lib/isodoc/un/un.plenary-attachment.xsl +13 -3
- data/lib/isodoc/un/un.plenary.xsl +13 -3
- data/lib/isodoc/un/un.recommendation.xsl +13 -3
- data/lib/metanorma/un/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: b7090558cbfbf23662a7b4c3d74d37e8f36f6ed5e9fd2533f4a60727b649103b
|
|
4
|
+
data.tar.gz: a66d7b14762d4d72ba18f136b5d21f6c9630e248bee55a4b77ba6ed609b55ee1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5489ca83efa7a1c79205c2ece2e831176280ba0ee916147ca0d8e5f35c34adb863a5ac6115e375c2462036c6baae47861dda1d359d70048ac4a934d74525fe9b
|
|
7
|
+
data.tar.gz: 25ddfbdf217fef36a89c60690b9f5592e30980fbcb9f505ceada556b7817dbe9813b4b0b773bf9cbdbfaf3c9e69913600925b81ce01a8744b9109c02b7e80cc3
|
|
@@ -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">
|
data/lib/asciidoctor/un/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">
|
data/lib/asciidoctor/un/un.rng
CHANGED
|
@@ -178,14 +178,9 @@
|
|
|
178
178
|
<ref name="section-title"/>
|
|
179
179
|
</optional>
|
|
180
180
|
<group>
|
|
181
|
-
<
|
|
182
|
-
<
|
|
183
|
-
|
|
184
|
-
</zeroOrMore>
|
|
185
|
-
<zeroOrMore>
|
|
186
|
-
<ref name="note"/>
|
|
187
|
-
</zeroOrMore>
|
|
188
|
-
</group>
|
|
181
|
+
<zeroOrMore>
|
|
182
|
+
<ref name="BasicBlock"/>
|
|
183
|
+
</zeroOrMore>
|
|
189
184
|
<zeroOrMore>
|
|
190
185
|
<choice>
|
|
191
186
|
<ref name="clause-subsection"/>
|
|
@@ -229,14 +224,9 @@
|
|
|
229
224
|
<ref name="section-title"/>
|
|
230
225
|
</optional>
|
|
231
226
|
<group>
|
|
232
|
-
<
|
|
233
|
-
<
|
|
234
|
-
|
|
235
|
-
</zeroOrMore>
|
|
236
|
-
<zeroOrMore>
|
|
237
|
-
<ref name="note"/>
|
|
238
|
-
</zeroOrMore>
|
|
239
|
-
</group>
|
|
227
|
+
<zeroOrMore>
|
|
228
|
+
<ref name="BasicBlock"/>
|
|
229
|
+
</zeroOrMore>
|
|
240
230
|
<zeroOrMore>
|
|
241
231
|
<choice>
|
|
242
232
|
<ref name="annex-subsection"/>
|
|
@@ -149,6 +149,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
|
|
|
149
149
|
p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
|
|
150
150
|
mso-style-noshow: yes;
|
|
151
151
|
mso-style-unhide: no;
|
|
152
|
+
mso-style-name: "Comment Text";
|
|
152
153
|
margin: 0cm;
|
|
153
154
|
margin-bottom: .0001pt;
|
|
154
155
|
mso-pagination: widow-orphan;
|
|
@@ -369,6 +370,7 @@ h1 {
|
|
|
369
370
|
mso-style-priority: 1;
|
|
370
371
|
mso-style-unhide: no;
|
|
371
372
|
mso-style-qformat: yes;
|
|
373
|
+
mso-style-name: "Heading 1";
|
|
372
374
|
mso-style-link: "Heading 1 Char";
|
|
373
375
|
mso-style-next: Normal;
|
|
374
376
|
margin-top: 13.5pt;
|
|
@@ -452,6 +454,7 @@ h2 {
|
|
|
452
454
|
mso-style-priority: 2;
|
|
453
455
|
mso-style-unhide: no;
|
|
454
456
|
mso-style-qformat: yes;
|
|
457
|
+
mso-style-name: "Heading 2";
|
|
455
458
|
mso-style-parent: "Heading 1";
|
|
456
459
|
mso-style-link: "Heading 2 Char";
|
|
457
460
|
mso-style-next: Normal;
|
|
@@ -478,7 +481,8 @@ h3 {
|
|
|
478
481
|
mso-style-priority: 3;
|
|
479
482
|
mso-style-unhide: no;
|
|
480
483
|
mso-style-qformat: yes;
|
|
481
|
-
mso-style-
|
|
484
|
+
mso-style-name: "Heading 3";
|
|
485
|
+
mso-style-parent: "Heading 2";
|
|
482
486
|
mso-style-link: "Heading 3 Char";
|
|
483
487
|
mso-style-next: Normal;
|
|
484
488
|
margin-top: 3.0pt;
|
|
@@ -504,6 +508,7 @@ h4 {
|
|
|
504
508
|
mso-style-priority: 4;
|
|
505
509
|
mso-style-unhide: no;
|
|
506
510
|
mso-style-qformat: yes;
|
|
511
|
+
mso-style-name: "Heading 4";
|
|
507
512
|
mso-style-parent: "Heading 3";
|
|
508
513
|
mso-style-link: "Heading 4 Char";
|
|
509
514
|
mso-style-next: Normal;
|
|
@@ -530,6 +535,7 @@ h5 {
|
|
|
530
535
|
mso-style-priority: 5;
|
|
531
536
|
mso-style-unhide: no;
|
|
532
537
|
mso-style-qformat: yes;
|
|
538
|
+
mso-style-name: "Heading 5";
|
|
533
539
|
mso-style-parent: "Heading 4";
|
|
534
540
|
mso-style-link: "Heading 5 Char";
|
|
535
541
|
mso-style-next: Normal;
|
|
@@ -556,6 +562,7 @@ h6 {
|
|
|
556
562
|
mso-style-priority: 6;
|
|
557
563
|
mso-style-unhide: no;
|
|
558
564
|
mso-style-qformat: yes;
|
|
565
|
+
mso-style-name: "Heading 6";
|
|
559
566
|
mso-style-parent: "Heading 5";
|
|
560
567
|
mso-style-link: "Heading 6 Char";
|
|
561
568
|
mso-style-next: Normal;
|
|
@@ -581,6 +588,7 @@ h6 {
|
|
|
581
588
|
p.MsoToc1, li.MsoToc1, div.MsoToc1 {
|
|
582
589
|
mso-style-priority: 39;
|
|
583
590
|
mso-style-unhide: no;
|
|
591
|
+
mso-style-name: "TOC 1";
|
|
584
592
|
mso-style-next: Normal;
|
|
585
593
|
margin-top: 6.0pt;
|
|
586
594
|
margin-right: 25.0pt;
|
|
@@ -603,6 +611,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
|
|
|
603
611
|
mso-style-noshow: yes;
|
|
604
612
|
mso-style-priority: 39;
|
|
605
613
|
mso-style-unhide: no;
|
|
614
|
+
mso-style-name: "TOC 2";
|
|
606
615
|
mso-style-parent: "TOC 1";
|
|
607
616
|
mso-style-next: Normal;
|
|
608
617
|
margin-top: 0cm;
|
|
@@ -626,6 +635,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
|
|
|
626
635
|
mso-style-noshow: yes;
|
|
627
636
|
mso-style-priority: 39;
|
|
628
637
|
mso-style-unhide: no;
|
|
638
|
+
mso-style-name: "TOC 3";
|
|
629
639
|
mso-style-parent: "TOC 2";
|
|
630
640
|
mso-style-next: Normal;
|
|
631
641
|
margin-top: 0cm;
|
|
@@ -647,6 +657,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
|
|
|
647
657
|
|
|
648
658
|
span.MsoFootnoteReference {
|
|
649
659
|
mso-style-priority: 99;
|
|
660
|
+
mso-style-name: "Footnote Reference";
|
|
650
661
|
vertical-align: super; }
|
|
651
662
|
|
|
652
663
|
p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
|
|
@@ -135,6 +135,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
|
|
|
135
135
|
p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
|
|
136
136
|
{mso-style-noshow:yes;
|
|
137
137
|
mso-style-unhide:no;
|
|
138
|
+
mso-style-name:"Comment Text";
|
|
138
139
|
margin:0cm;
|
|
139
140
|
margin-bottom:.0001pt;
|
|
140
141
|
mso-pagination:widow-orphan;
|
|
@@ -338,6 +339,7 @@ h1
|
|
|
338
339
|
{mso-style-priority:1;
|
|
339
340
|
mso-style-unhide:no;
|
|
340
341
|
mso-style-qformat:yes;
|
|
342
|
+
mso-style-name:"Heading 1";
|
|
341
343
|
mso-style-link:"Heading 1 Char";
|
|
342
344
|
mso-style-next:Normal;
|
|
343
345
|
margin-top:13.5pt;
|
|
@@ -418,6 +420,7 @@ h2
|
|
|
418
420
|
{mso-style-priority:2;
|
|
419
421
|
mso-style-unhide:no;
|
|
420
422
|
mso-style-qformat:yes;
|
|
423
|
+
mso-style-name:"Heading 2";
|
|
421
424
|
mso-style-parent:"Heading 1";
|
|
422
425
|
mso-style-link:"Heading 2 Char";
|
|
423
426
|
mso-style-next:Normal;
|
|
@@ -443,7 +446,8 @@ h3
|
|
|
443
446
|
{mso-style-priority:3;
|
|
444
447
|
mso-style-unhide:no;
|
|
445
448
|
mso-style-qformat:yes;
|
|
446
|
-
mso-style-
|
|
449
|
+
mso-style-name:"Heading 3";
|
|
450
|
+
mso-style-parent:"Heading 2";
|
|
447
451
|
mso-style-link:"Heading 3 Char";
|
|
448
452
|
mso-style-next:Normal;
|
|
449
453
|
margin-top:3.0pt;
|
|
@@ -468,6 +472,7 @@ h4
|
|
|
468
472
|
{mso-style-priority:4;
|
|
469
473
|
mso-style-unhide:no;
|
|
470
474
|
mso-style-qformat:yes;
|
|
475
|
+
mso-style-name:"Heading 4";
|
|
471
476
|
mso-style-parent:"Heading 3";
|
|
472
477
|
mso-style-link:"Heading 4 Char";
|
|
473
478
|
mso-style-next:Normal;
|
|
@@ -493,6 +498,7 @@ h5
|
|
|
493
498
|
{mso-style-priority:5;
|
|
494
499
|
mso-style-unhide:no;
|
|
495
500
|
mso-style-qformat:yes;
|
|
501
|
+
mso-style-name:"Heading 5";
|
|
496
502
|
mso-style-parent:"Heading 4";
|
|
497
503
|
mso-style-link:"Heading 5 Char";
|
|
498
504
|
mso-style-next:Normal;
|
|
@@ -518,6 +524,7 @@ h6
|
|
|
518
524
|
{mso-style-priority:6;
|
|
519
525
|
mso-style-unhide:no;
|
|
520
526
|
mso-style-qformat:yes;
|
|
527
|
+
mso-style-name:"Heading 6";
|
|
521
528
|
mso-style-parent:"Heading 5";
|
|
522
529
|
mso-style-link:"Heading 6 Char";
|
|
523
530
|
mso-style-next:Normal;
|
|
@@ -542,6 +549,7 @@ h6
|
|
|
542
549
|
p.MsoToc1, li.MsoToc1, div.MsoToc1
|
|
543
550
|
{mso-style-priority:39;
|
|
544
551
|
mso-style-unhide:no;
|
|
552
|
+
mso-style-name:"TOC 1";
|
|
545
553
|
mso-style-next:Normal;
|
|
546
554
|
margin-top:6.0pt;
|
|
547
555
|
margin-right:25.0pt;
|
|
@@ -563,6 +571,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
|
|
|
563
571
|
{mso-style-noshow:yes;
|
|
564
572
|
mso-style-priority:39;
|
|
565
573
|
mso-style-unhide:no;
|
|
574
|
+
mso-style-name:"TOC 2";
|
|
566
575
|
mso-style-parent:"TOC 1";
|
|
567
576
|
mso-style-next:Normal;
|
|
568
577
|
margin-top:0cm;
|
|
@@ -585,6 +594,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
|
|
|
585
594
|
{mso-style-noshow:yes;
|
|
586
595
|
mso-style-priority:39;
|
|
587
596
|
mso-style-unhide:no;
|
|
597
|
+
mso-style-name:"TOC 3";
|
|
588
598
|
mso-style-parent:"TOC 2";
|
|
589
599
|
mso-style-next:Normal;
|
|
590
600
|
margin-top:0cm;
|
|
@@ -605,6 +615,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
|
|
|
605
615
|
mso-bidi-font-weight:normal;}
|
|
606
616
|
span.MsoFootnoteReference
|
|
607
617
|
{mso-style-priority:99;
|
|
618
|
+
mso-style-name:"Footnote Reference";
|
|
608
619
|
vertical-align:super;}
|
|
609
620
|
p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
|
|
610
621
|
{mso-style-noshow:yes;
|
|
@@ -1479,6 +1479,11 @@
|
|
|
1479
1479
|
<xsl:attribute name="padding-right">4mm</xsl:attribute>
|
|
1480
1480
|
|
|
1481
1481
|
|
|
1482
|
+
</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
|
|
1483
|
+
|
|
1484
|
+
|
|
1485
|
+
|
|
1486
|
+
|
|
1482
1487
|
</xsl:attribute-set><xsl:attribute-set name="note-p-style">
|
|
1483
1488
|
|
|
1484
1489
|
|
|
@@ -2579,9 +2584,7 @@
|
|
|
2579
2584
|
|
|
2580
2585
|
<!-- Table's note name (NOTE, for example) -->
|
|
2581
2586
|
|
|
2582
|
-
<fo:inline padding-right="2mm">
|
|
2583
|
-
|
|
2584
|
-
|
|
2587
|
+
<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
|
|
2585
2588
|
|
|
2586
2589
|
|
|
2587
2590
|
|
|
@@ -2596,6 +2599,7 @@
|
|
|
2596
2599
|
</xsl:if>
|
|
2597
2600
|
|
|
2598
2601
|
|
|
2602
|
+
|
|
2599
2603
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
|
2600
2604
|
|
|
2601
2605
|
</fo:inline>
|
|
@@ -3201,6 +3205,8 @@
|
|
|
3201
3205
|
<xsl:if test="$font-size != ''">
|
|
3202
3206
|
<xsl:attribute name="font-size">
|
|
3203
3207
|
<xsl:choose>
|
|
3208
|
+
<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
|
|
3209
|
+
<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
|
|
3204
3210
|
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
|
|
3205
3211
|
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
|
|
3206
3212
|
</xsl:choose>
|
|
@@ -4670,12 +4676,16 @@
|
|
|
4670
4676
|
<xsl:if test="$font-size != ''">
|
|
4671
4677
|
<xsl:attribute name="font-size">
|
|
4672
4678
|
<xsl:choose>
|
|
4679
|
+
<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
|
|
4680
|
+
<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
|
|
4673
4681
|
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
|
|
4674
4682
|
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
|
|
4675
4683
|
</xsl:choose>
|
|
4676
4684
|
</xsl:attribute>
|
|
4677
4685
|
</xsl:if>
|
|
4678
4686
|
|
|
4687
|
+
|
|
4688
|
+
|
|
4679
4689
|
<xsl:apply-templates/>
|
|
4680
4690
|
</fo:block>
|
|
4681
4691
|
|
|
@@ -1479,6 +1479,11 @@
|
|
|
1479
1479
|
<xsl:attribute name="padding-right">4mm</xsl:attribute>
|
|
1480
1480
|
|
|
1481
1481
|
|
|
1482
|
+
</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
|
|
1483
|
+
|
|
1484
|
+
|
|
1485
|
+
|
|
1486
|
+
|
|
1482
1487
|
</xsl:attribute-set><xsl:attribute-set name="note-p-style">
|
|
1483
1488
|
|
|
1484
1489
|
|
|
@@ -2579,9 +2584,7 @@
|
|
|
2579
2584
|
|
|
2580
2585
|
<!-- Table's note name (NOTE, for example) -->
|
|
2581
2586
|
|
|
2582
|
-
<fo:inline padding-right="2mm">
|
|
2583
|
-
|
|
2584
|
-
|
|
2587
|
+
<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
|
|
2585
2588
|
|
|
2586
2589
|
|
|
2587
2590
|
|
|
@@ -2596,6 +2599,7 @@
|
|
|
2596
2599
|
</xsl:if>
|
|
2597
2600
|
|
|
2598
2601
|
|
|
2602
|
+
|
|
2599
2603
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
|
2600
2604
|
|
|
2601
2605
|
</fo:inline>
|
|
@@ -3201,6 +3205,8 @@
|
|
|
3201
3205
|
<xsl:if test="$font-size != ''">
|
|
3202
3206
|
<xsl:attribute name="font-size">
|
|
3203
3207
|
<xsl:choose>
|
|
3208
|
+
<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
|
|
3209
|
+
<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
|
|
3204
3210
|
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
|
|
3205
3211
|
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
|
|
3206
3212
|
</xsl:choose>
|
|
@@ -4670,12 +4676,16 @@
|
|
|
4670
4676
|
<xsl:if test="$font-size != ''">
|
|
4671
4677
|
<xsl:attribute name="font-size">
|
|
4672
4678
|
<xsl:choose>
|
|
4679
|
+
<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
|
|
4680
|
+
<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
|
|
4673
4681
|
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
|
|
4674
4682
|
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
|
|
4675
4683
|
</xsl:choose>
|
|
4676
4684
|
</xsl:attribute>
|
|
4677
4685
|
</xsl:if>
|
|
4678
4686
|
|
|
4687
|
+
|
|
4688
|
+
|
|
4679
4689
|
<xsl:apply-templates/>
|
|
4680
4690
|
</fo:block>
|
|
4681
4691
|
|
|
@@ -1434,6 +1434,11 @@
|
|
|
1434
1434
|
|
|
1435
1435
|
|
|
1436
1436
|
|
|
1437
|
+
</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
|
|
1438
|
+
|
|
1439
|
+
|
|
1440
|
+
|
|
1441
|
+
|
|
1437
1442
|
</xsl:attribute-set><xsl:attribute-set name="note-p-style">
|
|
1438
1443
|
|
|
1439
1444
|
|
|
@@ -2542,9 +2547,7 @@
|
|
|
2542
2547
|
|
|
2543
2548
|
<!-- Table's note name (NOTE, for example) -->
|
|
2544
2549
|
|
|
2545
|
-
<fo:inline padding-right="2mm">
|
|
2546
|
-
|
|
2547
|
-
|
|
2550
|
+
<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
|
|
2548
2551
|
|
|
2549
2552
|
|
|
2550
2553
|
|
|
@@ -2559,6 +2562,7 @@
|
|
|
2559
2562
|
</xsl:if>
|
|
2560
2563
|
|
|
2561
2564
|
|
|
2565
|
+
|
|
2562
2566
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
|
2563
2567
|
|
|
2564
2568
|
</fo:inline>
|
|
@@ -3164,6 +3168,8 @@
|
|
|
3164
3168
|
<xsl:if test="$font-size != ''">
|
|
3165
3169
|
<xsl:attribute name="font-size">
|
|
3166
3170
|
<xsl:choose>
|
|
3171
|
+
<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
|
|
3172
|
+
<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
|
|
3167
3173
|
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
|
|
3168
3174
|
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
|
|
3169
3175
|
</xsl:choose>
|
|
@@ -4642,12 +4648,16 @@
|
|
|
4642
4648
|
<xsl:if test="$font-size != ''">
|
|
4643
4649
|
<xsl:attribute name="font-size">
|
|
4644
4650
|
<xsl:choose>
|
|
4651
|
+
<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
|
|
4652
|
+
<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
|
|
4645
4653
|
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
|
|
4646
4654
|
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
|
|
4647
4655
|
</xsl:choose>
|
|
4648
4656
|
</xsl:attribute>
|
|
4649
4657
|
</xsl:if>
|
|
4650
4658
|
|
|
4659
|
+
|
|
4660
|
+
|
|
4651
4661
|
<xsl:apply-templates/>
|
|
4652
4662
|
</fo:block>
|
|
4653
4663
|
|
data/lib/metanorma/un/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-un
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.6.
|
|
4
|
+
version: 0.6.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: iso-639
|