metanorma-bipm 1.1.8 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (19) 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 +435 -78
  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 +298 -45
  8. data/lib/isodoc/bipm/bipm.guide.xsl +298 -45
  9. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +298 -45
  10. data/lib/isodoc/bipm/bipm.rapport.xsl +298 -45
  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 +184 -12
  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. data/metanorma-bipm.gemspec +2 -2
  19. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0f258a2387575d227d79ffe3950fa8768f29cd319eaf4e929197a635304ef247
4
- data.tar.gz: e4f8f7a88bdec337362131fd8535a96f904dba6b703fcc8d9604fca5026563e9
3
+ metadata.gz: 7a64c1f0428fdd961b33b791976e15f340eafd5f4e4a917f20cb43c5c6441338
4
+ data.tar.gz: 30990cca266ae702579aa863c639ee7098c245dc6e262a1a3cace5c5bff013f9
5
5
  SHA512:
6
- metadata.gz: 2f3819a2b709b1befe0df2ed04f53647b12cee97be3494b8477e3326f5ec531f2558274e1fae49b5be4071117e0e34cef0ff47a4dacadee28ec46be064cb61b2
7
- data.tar.gz: '031558adb23c13e72bf4995e78a7979c26b0438f897ae85f4181dfa03870d2062701df86f80ab3e894f5816aaabbc9c7e3ad5b3865f4febc265821c02dd08244'
6
+ metadata.gz: 3a1ab4a1fd26f8200b7db0374f7b077aac27f561159d5816e4a768400006b8e137d01378ca5904b5a4c89dd31f50b623141354fbd94c0df0c71748b0bea86e60
7
+ data.tar.gz: 2ce37ad144dd33dcd2cdfd06e323a79f4ee619b5563c16ab10ee18cdcc74ceb3b92f50148576850928150480bbd7d1375b25244b270a0aa8a852f9afefa7f36b
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>