metanorma-ribose 1.7.12 → 1.7.13

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9e0b6229851d20c86d189c1df2d6441f87934af1f07414d4be2faddb5ca27a3a
4
- data.tar.gz: 4da9b81ce4236372255702f0d4faf45aff59a61d8d09a260bd36ee4aacc5c142
3
+ metadata.gz: 60c47fff7ab2b67b6b9ff28cc0610347542f88487ae3c893423e0922b762d976
4
+ data.tar.gz: f39b4d4138669ee42c733f972114b7a42c1274a0e7069a15bdc7075071fdf7fd
5
5
  SHA512:
6
- metadata.gz: 3159d509a3311d6f0fcb3e408519aa38fc1825694b3c4e867965ee8ef64a7040357d1f0c895b615aa04f14be0a257333ee5389d0082604c91cd550c4e7cbb115
7
- data.tar.gz: a199158310f45541c93c37b297253dfabbfae1e71663d2de664b62f6bc30534acffc9533fe4e5b0d23c0319920fb2db539392500c2c0f45f88dd7a2de321b19c
6
+ metadata.gz: 440127867ff8b3f6da6e46b4a747f0fcd5d30f60b2fb99b84e8f49a8988956bd7dfb85cf2091d3139c43e3b1342b7080e712076e9fb949104540c65523136c77
7
+ data.tar.gz: 11b0de68feb0025de233aeedfb869133e388b2a7297fc76554d44f01a0100db5087302d4c4e369b1074a02babe0adb6becc4b4935b0f299e94f9219a36b58f0c
@@ -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
- <ref name="PureTextElement"/>
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
- <text/>
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
- <text/>
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
- <text/>
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
- <text/>
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
- <text/>
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
- <text/>
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
- <group>
707
- <oneOrMore>
708
- <ref name="BasicBlock"/>
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
- <group>
1512
- <zeroOrMore>
1513
- <ref name="BasicBlock"/>
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
- <group>
1566
- <oneOrMore>
1567
- <ref name="BasicBlock"/>
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
- <group>
1614
- <zeroOrMore>
1615
- <ref name="BasicBlock"/>
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
- <text/>
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
- <ref name="BasicBlock"/>
197
+ <choice>
198
+ <ref name="BasicBlock"/>
199
+ <ref name="component"/>
200
+ </choice>
180
201
  </oneOrMore>
181
202
  </define>
182
203
  <define name="ObligationType">
@@ -153,6 +153,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
153
153
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
154
154
  mso-style-noshow: yes;
155
155
  mso-style-unhide: no;
156
+ mso-style-name: "Comment Text";
156
157
  margin: 0cm;
157
158
  margin-bottom: .0001pt;
158
159
  mso-pagination: widow-orphan;
@@ -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;
@@ -461,6 +463,7 @@ h2 {
461
463
  mso-style-priority: 2;
462
464
  mso-style-unhide: no;
463
465
  mso-style-qformat: yes;
466
+ mso-style-name: "Heading 2";
464
467
  mso-style-parent: "Heading 1";
465
468
  mso-style-link: "Heading 2 Char";
466
469
  mso-style-next: Normal;
@@ -490,7 +493,8 @@ h3 {
490
493
  mso-style-priority: 3;
491
494
  mso-style-unhide: no;
492
495
  mso-style-qformat: yes;
493
- mso-style-parent: "Heading 1";
496
+ mso-style-name: "Heading 3";
497
+ mso-style-parent: "Heading 2";
494
498
  mso-style-link: "Heading 3 Char";
495
499
  mso-style-next: Normal;
496
500
  margin-top: 3.0pt;
@@ -518,6 +522,7 @@ h4 {
518
522
  mso-style-priority: 4;
519
523
  mso-style-unhide: no;
520
524
  mso-style-qformat: yes;
525
+ mso-style-name: "Heading 4";
521
526
  mso-style-parent: "Heading 3";
522
527
  mso-style-link: "Heading 4 Char";
523
528
  mso-style-next: Normal;
@@ -546,6 +551,7 @@ h5 {
546
551
  mso-style-priority: 5;
547
552
  mso-style-unhide: no;
548
553
  mso-style-qformat: yes;
554
+ mso-style-name: "Heading 5";
549
555
  mso-style-parent: "Heading 4";
550
556
  mso-style-link: "Heading 5 Char";
551
557
  mso-style-next: Normal;
@@ -574,6 +580,7 @@ h6 {
574
580
  mso-style-priority: 6;
575
581
  mso-style-unhide: no;
576
582
  mso-style-qformat: yes;
583
+ mso-style-name: "Heading 6";
577
584
  mso-style-parent: "Heading 5";
578
585
  mso-style-link: "Heading 6 Char";
579
586
  mso-style-next: Normal;
@@ -601,6 +608,7 @@ h6 {
601
608
  p.MsoToc1, li.MsoToc1, div.MsoToc1 {
602
609
  mso-style-priority: 39;
603
610
  mso-style-unhide: no;
611
+ mso-style-name: "TOC 1";
604
612
  mso-style-next: Normal;
605
613
  margin-top: 6.0pt;
606
614
  margin-right: 25.0pt;
@@ -624,6 +632,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
624
632
  mso-style-noshow: yes;
625
633
  mso-style-priority: 39;
626
634
  mso-style-unhide: no;
635
+ mso-style-name: "TOC 2";
627
636
  mso-style-parent: "TOC 1";
628
637
  mso-style-next: Normal;
629
638
  margin-top: 0cm;
@@ -648,6 +657,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
648
657
  mso-style-noshow: yes;
649
658
  mso-style-priority: 39;
650
659
  mso-style-unhide: no;
660
+ mso-style-name: "TOC 3";
651
661
  mso-style-parent: "TOC 2";
652
662
  mso-style-next: Normal;
653
663
  margin-top: 0cm;
@@ -670,6 +680,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
670
680
 
671
681
  span.MsoFootnoteReference {
672
682
  mso-style-priority: 99;
683
+ mso-style-name: "Footnote Reference";
673
684
  vertical-align: super; }
674
685
 
675
686
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
@@ -139,6 +139,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
139
139
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
140
140
  {mso-style-noshow:yes;
141
141
  mso-style-unhide:no;
142
+ mso-style-name:"Comment Text";
142
143
  margin:0cm;
143
144
  margin-bottom:.0001pt;
144
145
  mso-pagination:widow-orphan;
@@ -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;
@@ -428,6 +430,7 @@ h2
428
430
  {mso-style-priority:2;
429
431
  mso-style-unhide:no;
430
432
  mso-style-qformat:yes;
433
+ mso-style-name:"Heading 2";
431
434
  mso-style-parent:"Heading 1";
432
435
  mso-style-link:"Heading 2 Char";
433
436
  mso-style-next:Normal;
@@ -456,7 +459,8 @@ h3
456
459
  {mso-style-priority:3;
457
460
  mso-style-unhide:no;
458
461
  mso-style-qformat:yes;
459
- mso-style-parent:"Heading 1";
462
+ mso-style-name:"Heading 3";
463
+ mso-style-parent:"Heading 2";
460
464
  mso-style-link:"Heading 3 Char";
461
465
  mso-style-next:Normal;
462
466
  margin-top:3.0pt;
@@ -483,6 +487,7 @@ h4
483
487
  {mso-style-priority:4;
484
488
  mso-style-unhide:no;
485
489
  mso-style-qformat:yes;
490
+ mso-style-name:"Heading 4";
486
491
  mso-style-parent:"Heading 3";
487
492
  mso-style-link:"Heading 4 Char";
488
493
  mso-style-next:Normal;
@@ -510,6 +515,7 @@ h5
510
515
  {mso-style-priority:5;
511
516
  mso-style-unhide:no;
512
517
  mso-style-qformat:yes;
518
+ mso-style-name:"Heading 5";
513
519
  mso-style-parent:"Heading 4";
514
520
  mso-style-link:"Heading 5 Char";
515
521
  mso-style-next:Normal;
@@ -537,6 +543,7 @@ h6
537
543
  {mso-style-priority:6;
538
544
  mso-style-unhide:no;
539
545
  mso-style-qformat:yes;
546
+ mso-style-name:"Heading 6";
540
547
  mso-style-parent:"Heading 5";
541
548
  mso-style-link:"Heading 6 Char";
542
549
  mso-style-next:Normal;
@@ -563,6 +570,7 @@ h6
563
570
  p.MsoToc1, li.MsoToc1, div.MsoToc1
564
571
  {mso-style-priority:39;
565
572
  mso-style-unhide:no;
573
+ mso-style-name:"TOC 1";
566
574
  mso-style-next:Normal;
567
575
  margin-top:6.0pt;
568
576
  margin-right:25.0pt;
@@ -585,6 +593,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
585
593
  {mso-style-noshow:yes;
586
594
  mso-style-priority:39;
587
595
  mso-style-unhide:no;
596
+ mso-style-name:"TOC 2";
588
597
  mso-style-parent:"TOC 1";
589
598
  mso-style-next:Normal;
590
599
  margin-top:0cm;
@@ -608,6 +617,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
608
617
  {mso-style-noshow:yes;
609
618
  mso-style-priority:39;
610
619
  mso-style-unhide:no;
620
+ mso-style-name:"TOC 3";
611
621
  mso-style-parent:"TOC 2";
612
622
  mso-style-next:Normal;
613
623
  margin-top:0cm;
@@ -629,6 +639,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
629
639
  mso-bidi-font-weight:normal;}
630
640
  span.MsoFootnoteReference
631
641
  {mso-style-priority:99;
642
+ mso-style-name:"Footnote Reference";
632
643
  vertical-align:super;}
633
644
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
634
645
  {mso-style-noshow:yes;
@@ -1244,6 +1244,9 @@
1244
1244
  <fo:inline font-weight="bold" font-style="normal" color="black"><xsl:value-of select="java:toUpperCase(java:java.lang.String.new($name_number))"/><xsl:text>:</xsl:text></fo:inline>
1245
1245
  <xsl:value-of select="substring-after(., '—')"/>
1246
1246
  </xsl:when>
1247
+ <xsl:when test="starts-with(., 'Figure ') or starts-with(., 'Table ')">
1248
+ <fo:inline font-weight="bold" font-style="normal" color="black"><xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/></fo:inline>
1249
+ </xsl:when>
1247
1250
  <xsl:otherwise>
1248
1251
  <xsl:value-of select="."/>
1249
1252
  </xsl:otherwise>
@@ -1646,7 +1649,7 @@
1646
1649
 
1647
1650
 
1648
1651
  <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
1649
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1652
+ <xsl:attribute name="font-weight">300</xsl:attribute><!-- bold -->
1650
1653
  <xsl:attribute name="text-decoration">underline</xsl:attribute>
1651
1654
 
1652
1655
 
@@ -1871,6 +1874,15 @@
1871
1874
 
1872
1875
 
1873
1876
 
1877
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1878
+ <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
1879
+ <xsl:attribute name="padding-right">0.5mm</xsl:attribute>
1880
+
1881
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
1882
+
1883
+
1884
+
1885
+
1874
1886
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1875
1887
  <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
1876
1888
  <xsl:attribute name="padding-right">0.5mm</xsl:attribute>
@@ -2020,6 +2032,7 @@
2020
2032
  <xsl:attribute name="text-align">left</xsl:attribute>
2021
2033
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
2022
2034
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2035
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
2023
2036
 
2024
2037
  </xsl:attribute-set><xsl:attribute-set name="domain-style">
2025
2038
 
@@ -3008,9 +3021,8 @@
3008
3021
 
3009
3022
  <!-- Table's note name (NOTE, for example) -->
3010
3023
 
3011
- <fo:inline padding-right="2mm">
3024
+ <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
3012
3025
 
3013
-
3014
3026
 
3015
3027
 
3016
3028
 
@@ -3627,13 +3639,20 @@
3627
3639
 
3628
3640
 
3629
3641
 
3630
- 10
3642
+
3643
+ <xsl:choose>
3644
+ <xsl:when test="ancestor::*[local-name() = 'table']">inherit</xsl:when>
3645
+ <xsl:otherwise>110%</xsl:otherwise>
3646
+ </xsl:choose>
3647
+
3631
3648
 
3632
3649
  </xsl:variable>
3633
3650
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
3634
3651
  <xsl:if test="$font-size != ''">
3635
3652
  <xsl:attribute name="font-size">
3636
3653
  <xsl:choose>
3654
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
3655
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
3637
3656
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
3638
3657
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
3639
3658
  </xsl:choose>
@@ -5109,19 +5128,42 @@
5109
5128
 
5110
5129
 
5111
5130
 
5112
- 10
5131
+
5132
+ <xsl:choose>
5133
+ <xsl:when test="ancestor::*[local-name() = 'table']">inherit</xsl:when>
5134
+ <xsl:otherwise>110%</xsl:otherwise>
5135
+ </xsl:choose>
5136
+
5113
5137
 
5114
5138
  </xsl:variable>
5115
5139
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
5116
5140
  <xsl:if test="$font-size != ''">
5117
5141
  <xsl:attribute name="font-size">
5118
5142
  <xsl:choose>
5143
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
5144
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
5119
5145
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
5120
5146
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
5121
5147
  </xsl:choose>
5122
5148
  </xsl:attribute>
5123
5149
  </xsl:if>
5124
5150
 
5151
+ <!-- background for image -->
5152
+ <xsl:if test="starts-with(*[local-name() = 'name']/text()[1], 'Figure ')">
5153
+ <xsl:attribute name="background-color">rgb(236,242,246)</xsl:attribute>
5154
+ <xsl:attribute name="padding-left">11mm</xsl:attribute>
5155
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
5156
+ <xsl:attribute name="padding-right">11mm</xsl:attribute>
5157
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
5158
+ <xsl:attribute name="padding-top">7.5mm</xsl:attribute>
5159
+ <xsl:attribute name="padding-bottom">7.5mm</xsl:attribute>
5160
+ <!-- <xsl:attribute name="margin-bottom">3mm</xsl:attribute> -->
5161
+ <xsl:if test="following-sibling::*[1][local-name() = 'sourcecode'] and starts-with(*[local-name() = 'name']/text()[1], 'Figure ')">
5162
+ <xsl:attribute name="margin-bottom">16pt</xsl:attribute>
5163
+ </xsl:if>
5164
+ </xsl:if>
5165
+
5166
+
5125
5167
  <xsl:apply-templates/>
5126
5168
  </fo:block>
5127
5169
 
@@ -5377,7 +5419,7 @@
5377
5419
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']" mode="presentation">
5378
5420
  <xsl:if test="normalize-space() != ''">
5379
5421
  <fo:inline xsl:use-attribute-sets="termexample-name-style">
5380
- <xsl:apply-templates/>
5422
+ <xsl:apply-templates/>:
5381
5423
  </fo:inline>
5382
5424
  </xsl:if>
5383
5425
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ribose
3
- VERSION = "1.7.12".freeze
3
+ VERSION = "1.7.13".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ribose
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.12
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-09-27 00:00:00.000000000 Z
11
+ date: 2021-10-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic