metanorma-bipm 1.1.6 → 1.1.10

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/bipm.rng +1 -1
  3. data/lib/asciidoctor/bipm/isodoc.rng +49 -11
  4. data/lib/asciidoctor/bipm/reqt.rng +15 -4
  5. data/lib/isodoc/bipm/base_convert.rb +12 -1
  6. data/lib/isodoc/bipm/bipm.brochure.xsl +653 -96
  7. data/lib/isodoc/bipm/bipm.guide.xsl +653 -96
  8. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +653 -96
  9. data/lib/isodoc/bipm/bipm.rapport.xsl +653 -96
  10. data/lib/isodoc/bipm/html/htmlstyle.css +7 -1
  11. data/lib/isodoc/bipm/html/htmlstyle.scss +8 -1
  12. data/lib/isodoc/bipm/html_convert.rb +4 -5
  13. data/lib/isodoc/bipm/jcgm.standard.xsl +399 -97
  14. data/lib/isodoc/bipm/presentation_xml_convert.rb +35 -18
  15. data/lib/isodoc/bipm/xref.rb +10 -9
  16. data/lib/metanorma/bipm/processor.rb +9 -1
  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: a8dff3644b6a7bc5b5b9c7ba7307fa7cf4398ac4c73eafdb421c7690d5896f71
4
- data.tar.gz: 944cd9ec5b7dabffbbf1482fc096af46f288aac9f95391cb154b63348488e34a
3
+ metadata.gz: 86fa29bca65419443c3812628acd23d6125472ee5e1a3ea536a6d6c4758a3a73
4
+ data.tar.gz: 06e241b9292e724447fb4a75e558d7e1a62a47c22f0a65dd026d4afd81b3d150
5
5
  SHA512:
6
- metadata.gz: 95b6ae6c56006f3d8f06501debcf646b7ee776fc6ad15ef472cfec21b66342d3f4b8c03377aa912d46e79917f32a46cd6390b1166a491a0470666d873f1607f6
7
- data.tar.gz: e6b5bc3599137ff6141448f33378a2b5fef5711d7648f2fe5358efc9263f8947fbe24f7f4758d03ed10e1632da19520cc9ef0bcadf397e3a2b8e108196d488b2
6
+ metadata.gz: a7623eaca4e9872c151d36ec2538c4ace868d846dd32cc7a5ef3cdb8005e0469059f23bda5caa1b8ba71f9b8effbc8b8053a46e0f7879cd4941f1b9e38d92af7
7
+ data.tar.gz: ce0f7e7fc21bc1aba3d780658cdf00f11e61d3db5cfb35f8fc73de3f7b30dba68d6117aeb7f37cecdbefafa7241b27a240d80af58b1ddc96161e69a0a4280eb5
data/lib/asciidoctor/bipm/bipm.rng CHANGED
@@ -307,7 +307,7 @@
307
307
  <value>CCT</value>
308
308
  <value>CCTF</value>
309
309
  <value>CCU</value>
310
- <value>CCL-CCTF</value>
310
+ <value>CCL-CCTF-WGFS</value>
311
311
  <value>JCGM</value>
312
312
  <value>JCRB</value>
313
313
  <value>JCTLM</value>
data/lib/asciidoctor/bipm/isodoc.rng CHANGED
@@ -32,6 +32,18 @@
32
32
  <ref name="DocumentType"/>
33
33
  </element>
34
34
  </define>
35
+ <define name="section-title">
36
+ <element name="title">
37
+ <zeroOrMore>
38
+ <ref name="TextElement"/>
39
+ </zeroOrMore>
40
+ </element>
41
+ <zeroOrMore>
42
+ <element name="variant-title">
43
+ <ref name="TypedTitleString"/>
44
+ </element>
45
+ </zeroOrMore>
46
+ </define>
35
47
  <define name="hyperlink">
36
48
  <element name="link">
37
49
  <attribute name="target">
@@ -158,15 +170,17 @@
158
170
  <data type="boolean"/>
159
171
  </attribute>
160
172
  </optional>
161
- <attribute name="type">
162
- <choice>
163
- <value>roman</value>
164
- <value>alphabet</value>
165
- <value>arabic</value>
166
- <value>roman_upper</value>
167
- <value>alphabet_upper</value>
168
- </choice>
169
- </attribute>
173
+ <optional>
174
+ <attribute name="type">
175
+ <choice>
176
+ <value>roman</value>
177
+ <value>alphabet</value>
178
+ <value>arabic</value>
179
+ <value>roman_upper</value>
180
+ <value>alphabet_upper</value>
181
+ </choice>
182
+ </attribute>
183
+ </optional>
170
184
  <oneOrMore>
171
185
  <ref name="li"/>
172
186
  </oneOrMore>
@@ -976,6 +990,16 @@
976
990
  <data type="boolean"/>
977
991
  </attribute>
978
992
  </optional>
993
+ <optional>
994
+ <attribute name="linkmention">
995
+ <data type="boolean"/>
996
+ </attribute>
997
+ </optional>
998
+ <optional>
999
+ <attribute name="linkref">
1000
+ <data type="boolean"/>
1001
+ </attribute>
1002
+ </optional>
979
1003
  <optional>
980
1004
  <element name="refterm">
981
1005
  <zeroOrMore>
@@ -1012,6 +1036,7 @@
1012
1036
  <ref name="svgmap"/>
1013
1037
  <ref name="inputform"/>
1014
1038
  <ref name="toc"/>
1039
+ <ref name="passthrough"/>
1015
1040
  </choice>
1016
1041
  </define>
1017
1042
  <define name="toc">
@@ -1019,6 +1044,14 @@
1019
1044
  <ref name="ul"/>
1020
1045
  </element>
1021
1046
  </define>
1047
+ <define name="passthrough">
1048
+ <element name="passthrough">
1049
+ <optional>
1050
+ <attribute name="formats"/>
1051
+ </optional>
1052
+ <text/>
1053
+ </element>
1054
+ </define>
1022
1055
  <define name="inputform">
1023
1056
  <element name="form">
1024
1057
  <attribute name="id">
@@ -1686,7 +1719,9 @@
1686
1719
  <zeroOrMore>
1687
1720
  <ref name="termgrammar"/>
1688
1721
  </zeroOrMore>
1689
- <ref name="definition"/>
1722
+ <oneOrMore>
1723
+ <ref name="termdefinition"/>
1724
+ </oneOrMore>
1690
1725
  <zeroOrMore>
1691
1726
  <ref name="termnote"/>
1692
1727
  </zeroOrMore>
@@ -1749,7 +1784,7 @@
1749
1784
  </oneOrMore>
1750
1785
  </element>
1751
1786
  </define>
1752
- <define name="definition">
1787
+ <define name="termdefinition">
1753
1788
  <element name="definition">
1754
1789
  <oneOrMore>
1755
1790
  <choice>
@@ -1758,6 +1793,9 @@
1758
1793
  <ref name="formula"/>
1759
1794
  </choice>
1760
1795
  </oneOrMore>
1796
+ <zeroOrMore>
1797
+ <ref name="termsource"/>
1798
+ </zeroOrMore>
1761
1799
  </element>
1762
1800
  </define>
1763
1801
  <define name="termnote">
data/lib/asciidoctor/bipm/reqt.rng CHANGED
@@ -64,9 +64,9 @@
64
64
  <optional>
65
65
  <ref name="label"/>
66
66
  </optional>
67
- <optional>
67
+ <zeroOrMore>
68
68
  <ref name="subject"/>
69
- </optional>
69
+ </zeroOrMore>
70
70
  <zeroOrMore>
71
71
  <ref name="reqinherit"/>
72
72
  </zeroOrMore>
@@ -80,6 +80,7 @@
80
80
  <ref name="verification"/>
81
81
  <ref name="import"/>
82
82
  <ref name="description"/>
83
+ <ref name="component"/>
83
84
  </choice>
84
85
  </zeroOrMore>
85
86
  <optional>
@@ -105,12 +106,16 @@
105
106
  </define>
106
107
  <define name="subject">
107
108
  <element name="subject">
108
- <text/>
109
+ <oneOrMore>
110
+ <ref name="TextElement"/>
111
+ </oneOrMore>
109
112
  </element>
110
113
  </define>
111
114
  <define name="reqinherit">
112
115
  <element name="inherit">
113
- <text/>
116
+ <oneOrMore>
117
+ <ref name="TextElement"/>
118
+ </oneOrMore>
114
119
  </element>
115
120
  </define>
116
121
  <define name="measurementtarget">
@@ -138,6 +143,12 @@
138
143
  <ref name="RequirementSubpart"/>
139
144
  </element>
140
145
  </define>
146
+ <define name="component">
147
+ <element name="component">
148
+ <attribute name="class"/>
149
+ <ref name="RequirementSubpart"/>
150
+ </element>
151
+ </define>
141
152
  <define name="reqt_references">
142
153
  <element name="references">
143
154
  <oneOrMore>
data/lib/isodoc/bipm/base_convert.rb CHANGED
@@ -74,12 +74,23 @@ module IsoDoc
74
74
  def termref_cleanup(docxml)
75
75
  docxml
76
76
  .gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/,
77
- l10n(", #{@i18n.modified} [/TERMREF]"))
77
+ l10n(", #{@i18n.modified} [/TERMREF]"))
78
78
  .gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ")
79
79
  .gsub(/\[TERMREF\]\s*/, l10n("[#{@i18n.source} "))
80
80
  .gsub(%r{\s*\[/TERMREF\]\s*}, l10n("]"))
81
81
  .gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
82
82
  end
83
+
84
+ def error_parse(node, out)
85
+ case node.name
86
+ when "blacksquare" then blacksquare_parse(node, out)
87
+ else super
88
+ end
89
+ end
90
+
91
+ def blacksquare_parse(_node, out)
92
+ out << "&#x25a0;"
93
+ end
83
94
  end
84
95
  end
85
96
  end