metanorma-bipm 1.1.7 → 1.1.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/bipm/basicdoc.rng +21 -4
  3. data/lib/asciidoctor/bipm/bipm.rng +22 -17
  4. data/lib/asciidoctor/bipm/isodoc.rng +241 -61
  5. data/lib/asciidoctor/bipm/reqt.rng +23 -2
  6. data/lib/isodoc/bipm/base_convert.rb +12 -1
  7. data/lib/isodoc/bipm/bipm.brochure.xsl +623 -77
  8. data/lib/isodoc/bipm/bipm.guide.xsl +623 -77
  9. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +623 -77
  10. data/lib/isodoc/bipm/bipm.rapport.xsl +623 -77
  11. data/lib/isodoc/bipm/html/htmlstyle.css +7 -1
  12. data/lib/isodoc/bipm/html/htmlstyle.scss +8 -1
  13. data/lib/isodoc/bipm/html_convert.rb +4 -5
  14. data/lib/isodoc/bipm/jcgm.standard.xsl +365 -73
  15. data/lib/isodoc/bipm/presentation_xml_convert.rb +37 -20
  16. data/lib/isodoc/bipm/xref.rb +10 -9
  17. data/lib/metanorma/bipm/version.rb +1 -1
  18. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a37d2fd29c1b02eb058c4c0c373a9ddc7a6cf5b2ec2eec8f042b3c12ef98fe15
4
- data.tar.gz: 2d8183dcbee89f5cf9b2f658cc7ce8fe3cbe6fdfc1d3b475ec4428dc46052c52
3
+ metadata.gz: ddf24d77798cb1b15e5d00dc969800a9a8113bc700ac2150f4d4e0095f336f3c
4
+ data.tar.gz: 428a0e42c5396df23955f3778adb57c83218a3a69bdb32e90af9b77647c68725
5
5
  SHA512:
6
- metadata.gz: aab514fe6c0f136bb64cc8a19b44b053b38ab54d9584d8f12b01c552336ff542f5f820533d8aa55c565dd52ac08fda1cd39d8a27af6b4cdc0dd9f98d7ac68872
7
- data.tar.gz: 8b6f1adc6406fb596bac1f9525e4381e17b2701443eb158a010b988289eccb2a7fd63326d9c690b327fc3329ebb2a23be652b0e6ef3ca562a1516de376432720
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>
@@ -307,7 +312,7 @@
307
312
  <value>CCT</value>
308
313
  <value>CCTF</value>
309
314
  <value>CCU</value>
310
- <value>CCL-CCTF</value>
315
+ <value>CCL-CCTF-WGFS</value>
311
316
  <value>JCGM</value>
312
317
  <value>JCRB</value>
313
318
  <value>JCTLM</value>