metanorma-bipm 1.1.10 → 1.1.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/bipm/basicdoc.rng +21 -4
  3. data/lib/asciidoctor/bipm/bipm.rng +21 -16
  4. data/lib/asciidoctor/bipm/isodoc.rng +192 -50
  5. data/lib/asciidoctor/bipm/reqt.rng +23 -2
  6. data/lib/isodoc/bipm/bipm.brochure.xsl +17 -5
  7. data/lib/isodoc/bipm/bipm.guide.xsl +17 -5
  8. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +17 -5
  9. data/lib/isodoc/bipm/bipm.rapport.xsl +17 -5
  10. data/lib/isodoc/bipm/jcgm.standard.xsl +22 -3
  11. data/lib/isodoc/bipm/presentation_xml_convert.rb +2 -2
  12. data/lib/metanorma/bipm/version.rb +1 -1
  13. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 86fa29bca65419443c3812628acd23d6125472ee5e1a3ea536a6d6c4758a3a73
4
- data.tar.gz: 06e241b9292e724447fb4a75e558d7e1a62a47c22f0a65dd026d4afd81b3d150
3
+ metadata.gz: ddf24d77798cb1b15e5d00dc969800a9a8113bc700ac2150f4d4e0095f336f3c
4
+ data.tar.gz: 428a0e42c5396df23955f3778adb57c83218a3a69bdb32e90af9b77647c68725
5
5
  SHA512:
6
- metadata.gz: a7623eaca4e9872c151d36ec2538c4ace868d846dd32cc7a5ef3cdb8005e0469059f23bda5caa1b8ba71f9b8effbc8b8053a46e0f7879cd4941f1b9e38d92af7
7
- data.tar.gz: ce0f7e7fc21bc1aba3d780658cdf00f11e61d3db5cfb35f8fc73de3f7b30dba68d6117aeb7f37cecdbefafa7241b27a240d80af58b1ddc96161e69a0a4280eb5
6
+ metadata.gz: d74c56b696f2e01668c89c12f2cccfeef7c19cb61890c02a4780833cafc24b304edbe60a92b49584d7b7b9445b1cef42f80f2540ddb9bf40e1a5c3d8bdf6fb1a
7
+ data.tar.gz: 75b8d7c11028470d37d4e3870647cfc8dd36d1fdd9037d4ca768b4f389287f6e22208c42d420d9afdaf64ab366c121f7e74c0d6ef2cdb07997bb97074c135207
data/lib/asciidoctor/bipm/basicdoc.rng CHANGED
@@ -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">
data/lib/asciidoctor/bipm/bipm.rng CHANGED
@@ -16,6 +16,13 @@
16
16
  <param name="pattern">\i\c*|\c+#\c+</param>
17
17
  </data>
18
18
  </attribute>
19
+ <optional>
20
+ <attribute name="to">
21
+ <data type="string">
22
+ <param name="pattern">\i\c*|\c+#\c+</param>
23
+ </data>
24
+ </attribute>
25
+ </optional>
19
26
  <optional>
20
27
  <attribute name="type">
21
28
  <ref name="ReferenceFormat"/>
@@ -93,14 +100,9 @@
93
100
  </optional>
94
101
  <group>
95
102
  <choice>
96
- <group>
97
- <zeroOrMore>
98
- <ref name="BasicBlock"/>
99
- </zeroOrMore>
100
- <zeroOrMore>
101
- <ref name="note"/>
102
- </zeroOrMore>
103
- </group>
103
+ <zeroOrMore>
104
+ <ref name="BasicBlock"/>
105
+ </zeroOrMore>
104
106
  <ref name="amend"/>
105
107
  </choice>
106
108
  <zeroOrMore>
@@ -146,14 +148,9 @@
146
148
  <ref name="section-title"/>
147
149
  </optional>
148
150
  <group>
149
- <group>
150
- <zeroOrMore>
151
- <ref name="BasicBlock"/>
152
- </zeroOrMore>
153
- <zeroOrMore>
154
- <ref name="note"/>
155
- </zeroOrMore>
156
- </group>
151
+ <zeroOrMore>
152
+ <ref name="BasicBlock"/>
153
+ </zeroOrMore>
157
154
  <zeroOrMore>
158
155
  <choice>
159
156
  <ref name="annex-subsection"/>
@@ -179,6 +176,14 @@
179
176
  <data type="boolean"/>
180
177
  </attribute>
181
178
  </optional>
179
+ <optional>
180
+ <attribute name="tag"/>
181
+ </optional>
182
+ <optional>
183
+ <attribute name="multilingual-rendering">
184
+ <ref name="MultilingualRenderingType"/>
185
+ </attribute>
186
+ </optional>
182
187
  <attribute name="type">
183
188
  <choice>
184
189
  <value>roman</value>
data/lib/asciidoctor/bipm/isodoc.rng CHANGED
@@ -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">
data/lib/asciidoctor/bipm/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
- <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">
data/lib/isodoc/bipm/bipm.brochure.xsl CHANGED
@@ -2497,7 +2497,8 @@
2497
2497
  <xsl:if test="../@type = 'toc'">
2498
2498
  <xsl:attribute name="text-align">left</xsl:attribute>
2499
2499
  </xsl:if>
2500
- <xsl:call-template name="extractTitle"/>
2500
+ <!-- <xsl:call-template name="extractTitle"/> -->
2501
+ <xsl:apply-templates/>
2501
2502
  <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
2502
2503
  </xsl:when>
2503
2504
  <xsl:otherwise>
@@ -4914,6 +4915,13 @@
4914
4915
 
4915
4916
 
4916
4917
 
4918
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
4919
+
4920
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
4921
+
4922
+
4923
+
4924
+
4917
4925
  </xsl:attribute-set><xsl:attribute-set name="note-p-style">
4918
4926
 
4919
4927
 
@@ -6081,18 +6089,16 @@
6081
6089
 
6082
6090
  <!-- Table's note name (NOTE, for example) -->
6083
6091
 
6084
- <fo:inline padding-right="2mm">
6092
+ <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
6085
6093
 
6086
-
6087
6094
 
6088
6095
 
6089
6096
 
6090
-
6091
- <xsl:attribute name="font-size">10pt</xsl:attribute>
6092
6097
  <xsl:if test="ancestor::bipm:preface">
6093
6098
  <xsl:attribute name="text-decoration">underline</xsl:attribute>
6094
6099
  </xsl:if>
6095
6100
 
6101
+
6096
6102
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
6097
6103
 
6098
6104
  </fo:inline>
@@ -6727,6 +6733,8 @@
6727
6733
  <xsl:if test="$font-size != ''">
6728
6734
  <xsl:attribute name="font-size">
6729
6735
  <xsl:choose>
6736
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
6737
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
6730
6738
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
6731
6739
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
6732
6740
  </xsl:choose>
@@ -8245,12 +8253,16 @@
8245
8253
  <xsl:if test="$font-size != ''">
8246
8254
  <xsl:attribute name="font-size">
8247
8255
  <xsl:choose>
8256
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
8257
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
8248
8258
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
8249
8259
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
8250
8260
  </xsl:choose>
8251
8261
  </xsl:attribute>
8252
8262
  </xsl:if>
8253
8263
 
8264
+
8265
+
8254
8266
  <xsl:apply-templates/>
8255
8267
  </fo:block>
8256
8268
 
data/lib/isodoc/bipm/bipm.guide.xsl CHANGED
@@ -2497,7 +2497,8 @@
2497
2497
  <xsl:if test="../@type = 'toc'">
2498
2498
  <xsl:attribute name="text-align">left</xsl:attribute>
2499
2499
  </xsl:if>
2500
- <xsl:call-template name="extractTitle"/>
2500
+ <!-- <xsl:call-template name="extractTitle"/> -->
2501
+ <xsl:apply-templates/>
2501
2502
  <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
2502
2503
  </xsl:when>
2503
2504
  <xsl:otherwise>
@@ -4914,6 +4915,13 @@
4914
4915
 
4915
4916
 
4916
4917
 
4918
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
4919
+
4920
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
4921
+
4922
+
4923
+
4924
+
4917
4925
  </xsl:attribute-set><xsl:attribute-set name="note-p-style">
4918
4926
 
4919
4927
 
@@ -6081,18 +6089,16 @@
6081
6089
 
6082
6090
  <!-- Table's note name (NOTE, for example) -->
6083
6091
 
6084
- <fo:inline padding-right="2mm">
6092
+ <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
6085
6093
 
6086
-
6087
6094
 
6088
6095
 
6089
6096
 
6090
-
6091
- <xsl:attribute name="font-size">10pt</xsl:attribute>
6092
6097
  <xsl:if test="ancestor::bipm:preface">
6093
6098
  <xsl:attribute name="text-decoration">underline</xsl:attribute>
6094
6099
  </xsl:if>
6095
6100
 
6101
+
6096
6102
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
6097
6103
 
6098
6104
  </fo:inline>
@@ -6727,6 +6733,8 @@
6727
6733
  <xsl:if test="$font-size != ''">
6728
6734
  <xsl:attribute name="font-size">
6729
6735
  <xsl:choose>
6736
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
6737
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
6730
6738
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
6731
6739
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
6732
6740
  </xsl:choose>
@@ -8245,12 +8253,16 @@
8245
8253
  <xsl:if test="$font-size != ''">
8246
8254
  <xsl:attribute name="font-size">
8247
8255
  <xsl:choose>
8256
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
8257
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
8248
8258
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
8249
8259
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
8250
8260
  </xsl:choose>
8251
8261
  </xsl:attribute>
8252
8262
  </xsl:if>
8253
8263
 
8264
+
8265
+
8254
8266
  <xsl:apply-templates/>
8255
8267
  </fo:block>
8256
8268
 
data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl CHANGED
@@ -2497,7 +2497,8 @@
2497
2497
  <xsl:if test="../@type = 'toc'">
2498
2498
  <xsl:attribute name="text-align">left</xsl:attribute>
2499
2499
  </xsl:if>
2500
- <xsl:call-template name="extractTitle"/>
2500
+ <!-- <xsl:call-template name="extractTitle"/> -->
2501
+ <xsl:apply-templates/>
2501
2502
  <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
2502
2503
  </xsl:when>
2503
2504
  <xsl:otherwise>
@@ -4914,6 +4915,13 @@
4914
4915
 
4915
4916
 
4916
4917
 
4918
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
4919
+
4920
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
4921
+
4922
+
4923
+
4924
+
4917
4925
  </xsl:attribute-set><xsl:attribute-set name="note-p-style">
4918
4926
 
4919
4927
 
@@ -6081,18 +6089,16 @@
6081
6089
 
6082
6090
  <!-- Table's note name (NOTE, for example) -->
6083
6091
 
6084
- <fo:inline padding-right="2mm">
6092
+ <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
6085
6093
 
6086
-
6087
6094
 
6088
6095
 
6089
6096
 
6090
-
6091
- <xsl:attribute name="font-size">10pt</xsl:attribute>
6092
6097
  <xsl:if test="ancestor::bipm:preface">
6093
6098
  <xsl:attribute name="text-decoration">underline</xsl:attribute>
6094
6099
  </xsl:if>
6095
6100
 
6101
+
6096
6102
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
6097
6103
 
6098
6104
  </fo:inline>
@@ -6727,6 +6733,8 @@
6727
6733
  <xsl:if test="$font-size != ''">
6728
6734
  <xsl:attribute name="font-size">
6729
6735
  <xsl:choose>
6736
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
6737
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
6730
6738
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
6731
6739
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
6732
6740
  </xsl:choose>
@@ -8245,12 +8253,16 @@
8245
8253
  <xsl:if test="$font-size != ''">
8246
8254
  <xsl:attribute name="font-size">
8247
8255
  <xsl:choose>
8256
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
8257
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
8248
8258
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
8249
8259
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
8250
8260
  </xsl:choose>
8251
8261
  </xsl:attribute>
8252
8262
  </xsl:if>
8253
8263
 
8264
+
8265
+
8254
8266
  <xsl:apply-templates/>
8255
8267
  </fo:block>
8256
8268
 
data/lib/isodoc/bipm/bipm.rapport.xsl CHANGED
@@ -2497,7 +2497,8 @@
2497
2497
  <xsl:if test="../@type = 'toc'">
2498
2498
  <xsl:attribute name="text-align">left</xsl:attribute>
2499
2499
  </xsl:if>
2500
- <xsl:call-template name="extractTitle"/>
2500
+ <!-- <xsl:call-template name="extractTitle"/> -->
2501
+ <xsl:apply-templates/>
2501
2502
  <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
2502
2503
  </xsl:when>
2503
2504
  <xsl:otherwise>
@@ -4914,6 +4915,13 @@
4914
4915
 
4915
4916
 
4916
4917
 
4918
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
4919
+
4920
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
4921
+
4922
+
4923
+
4924
+
4917
4925
  </xsl:attribute-set><xsl:attribute-set name="note-p-style">
4918
4926
 
4919
4927
 
@@ -6081,18 +6089,16 @@
6081
6089
 
6082
6090
  <!-- Table's note name (NOTE, for example) -->
6083
6091
 
6084
- <fo:inline padding-right="2mm">
6092
+ <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
6085
6093
 
6086
-
6087
6094
 
6088
6095
 
6089
6096
 
6090
-
6091
- <xsl:attribute name="font-size">10pt</xsl:attribute>
6092
6097
  <xsl:if test="ancestor::bipm:preface">
6093
6098
  <xsl:attribute name="text-decoration">underline</xsl:attribute>
6094
6099
  </xsl:if>
6095
6100
 
6101
+
6096
6102
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
6097
6103
 
6098
6104
  </fo:inline>
@@ -6727,6 +6733,8 @@
6727
6733
  <xsl:if test="$font-size != ''">
6728
6734
  <xsl:attribute name="font-size">
6729
6735
  <xsl:choose>
6736
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
6737
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
6730
6738
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
6731
6739
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
6732
6740
  </xsl:choose>
@@ -8245,12 +8253,16 @@
8245
8253
  <xsl:if test="$font-size != ''">
8246
8254
  <xsl:attribute name="font-size">
8247
8255
  <xsl:choose>
8256
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
8257
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
8248
8258
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
8249
8259
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
8250
8260
  </xsl:choose>
8251
8261
  </xsl:attribute>
8252
8262
  </xsl:if>
8253
8263
 
8264
+
8265
+
8254
8266
  <xsl:apply-templates/>
8255
8267
  </fo:block>
8256
8268
 
data/lib/isodoc/bipm/jcgm.standard.xsl CHANGED
@@ -10,6 +10,8 @@
10
10
  <!-- param for second pass -->
11
11
  <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
12
12
 
13
+ <xsl:param name="align-cross-elements"/>
14
+
13
15
 
14
16
 
15
17
  <xsl:key name="kfn" match="*[local-name()='p']/*[local-name()='fn']" use="@reference"/>
@@ -17,7 +19,14 @@
17
19
 
18
20
 
19
21
  <xsl:variable name="align_cross_elements_default">clause</xsl:variable>
20
- <xsl:variable name="align_cross_elements_doc" select="normalize-space((//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:ext/jcgm:parallel-align-element)"/>
22
+ <xsl:variable name="align_cross_elements_doc">
23
+ <xsl:choose>
24
+ <xsl:when test="normalize-space($align-cross-elements) != ''"><xsl:value-of select="$align-cross-elements"/></xsl:when>
25
+ <xsl:otherwise>
26
+ <xsl:value-of select="normalize-space((//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:ext/jcgm:parallel-align-element)"/>
27
+ </xsl:otherwise>
28
+ </xsl:choose>
29
+ </xsl:variable>
21
30
  <xsl:variable name="align_cross_elements_">
22
31
  <xsl:choose>
23
32
  <xsl:when test="$align_cross_elements_doc != ''">
@@ -2406,6 +2415,11 @@
2406
2415
 
2407
2416
 
2408
2417
 
2418
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
2419
+
2420
+
2421
+
2422
+
2409
2423
  </xsl:attribute-set><xsl:attribute-set name="note-p-style">
2410
2424
 
2411
2425
 
@@ -3606,9 +3620,8 @@
3606
3620
 
3607
3621
  <!-- Table's note name (NOTE, for example) -->
3608
3622
 
3609
- <fo:inline padding-right="2mm">
3623
+ <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
3610
3624
 
3611
-
3612
3625
 
3613
3626
 
3614
3627
 
@@ -4243,6 +4256,8 @@
4243
4256
  <xsl:if test="$font-size != ''">
4244
4257
  <xsl:attribute name="font-size">
4245
4258
  <xsl:choose>
4259
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
4260
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
4246
4261
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
4247
4262
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
4248
4263
  </xsl:choose>
@@ -5701,12 +5716,16 @@
5701
5716
  <xsl:if test="$font-size != ''">
5702
5717
  <xsl:attribute name="font-size">
5703
5718
  <xsl:choose>
5719
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
5720
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
5704
5721
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
5705
5722
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
5706
5723
  </xsl:choose>
5707
5724
  </xsl:attribute>
5708
5725
  </xsl:if>
5709
5726
 
5727
+
5728
+
5710
5729
  <xsl:apply-templates/>
5711
5730
  </fo:block>
5712
5731
 
data/lib/isodoc/bipm/presentation_xml_convert.rb CHANGED
@@ -59,8 +59,8 @@ module IsoDoc
59
59
  end
60
60
 
61
61
  def clause1(elem)
62
- return if elem["unnumbered"] == "true"
63
- return if elem.at(("./ancestor::*[@unnumbered = 'true']"))
62
+ elem.at(("./ancestor::*[@unnumbered = 'true']")) and
63
+ elem["unnumbered"] = "true"
64
64
 
65
65
  super
66
66
  end
data/lib/metanorma/bipm/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module BIPM
3
- VERSION = "1.1.10".freeze
3
+ VERSION = "1.1.11".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-bipm
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.10
4
+ version: 1.1.11
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