metanorma-generic 3.4.2 → 3.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +9 -0
  3. data/lib/isodoc/generic/metadata.rb +1 -1
  4. data/lib/metanorma/generic/basicdoc.rng +23 -14
  5. data/lib/metanorma/generic/cleanup.rb +0 -37
  6. data/lib/metanorma/generic/converter.rb +0 -1
  7. data/lib/metanorma/generic/isodoc.rng +1 -1
  8. data/lib/metanorma/generic/{mathml3-content.rng → mathml4-content.rng} +104 -80
  9. data/lib/metanorma/generic/mathml4-core.rng +1041 -0
  10. data/lib/metanorma/generic/{mathml3-presentation.rng → mathml4-presentation.rng} +184 -1060
  11. data/lib/metanorma/generic/{mathml3-strict-content.rng → mathml4-strict-content.rng} +92 -8
  12. data/lib/metanorma/generic/mathml4.rng +30 -0
  13. data/lib/metanorma/generic/metanorma-mathml.rng +22 -8
  14. data/lib/metanorma/generic/validate.rb +16 -2
  15. data/lib/metanorma/generic/version.rb +1 -1
  16. data/metanorma-generic.gemspec +1 -1
  17. metadata +8 -10
  18. data/.hound.yml +0 -5
  19. data/lib/metanorma/generic/bibdata_config.rb +0 -26
  20. data/lib/metanorma/generic/mathml3-common.rng +0 -257
  21. data/lib/metanorma/generic/mathml3.rng +0 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: edea86377ca867a3e249d9f5ff441448a6d049d9505744e4dd6a0795cad4ad1d
4
- data.tar.gz: c7bf6e739b48a19c0e9f329d109a30ba90139d59ad309b1a2d03bdc6990a883d
3
+ metadata.gz: 7875f0826e54793396ed7ad236dceae5bc539c09827a401919b2bb06ec6f86f9
4
+ data.tar.gz: b79fc2a02bb9be7b0b3ec909117fd396444a312e44b722be7b26fe27e17160d4
5
5
  SHA512:
6
- metadata.gz: 0eb3f37ae4c629a897a6ebdbb7e844b0cabc796dabd149e35ccce40385cbbed9c1d8aa5a5dbe816420c4640c14a7902cb1feeefefc064441a87d9ecb8e7f2264
7
- data.tar.gz: f932912f5ed48ede677b79ea9368c256d62631d235298991d952454508d02bd46775406f36b1867cb9e347c2d6d21ab96344b00adfb57a9893500eb12180ab37
6
+ metadata.gz: c2951dd8856eedacb8dac2910acd784c2259e13db84a9718b60842619a3903810d6782e57c868fc82d22c5e33a5639fe2d7215b5bb348e553dee368d01612941
7
+ data.tar.gz: 4fc6a41d9741a00420fb7af5f8baff6c310a0332dd9dbaacb8d51099a64151354cc95ffcf106225b41330d62dec31698663928294060f7d54e6377da10438daa
data/.rubocop.yml CHANGED
@@ -2,6 +2,15 @@
2
2
  # See https://github.com/metanorma/cimas
3
3
  inherit_from:
4
4
  - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
5
+ # .rubocop_todo.yml MUST be the last entry. inherit_from is last-wins:
6
+ # if listed before oss-guides, the shared config's stricter Metrics/
7
+ # (MethodLength, BlockLength, etc.) rules override the todo's per-file
8
+ # grandfathering, and the todo becomes inert on those cops. Empirically
9
+ # verified on suma 2026-07-06: with todo listed first, 34 Metrics/* offenses
10
+ # remained; moved last, cleared. Every gem in the metanorma-org fleet
11
+ # already ships a `.rubocop_todo.yml` on its live tree (audited 2026-07-06,
12
+ # 54/54 have it), so this reference is safe to emit unconditionally.
13
+ - .rubocop_todo.yml
5
14
 
6
15
  # Rubocop plugins enabled centrally so every metanorma-org gem picks them up
7
16
  # on cimas sync — best practice belongs at the shared-template layer, not
data/lib/isodoc/generic/metadata.rb CHANGED
@@ -38,7 +38,7 @@ module IsoDoc
38
38
  klass._file = caller_locations(1..1).first.absolute_path
39
39
  end
40
40
 
41
- def images(isoxml, out)
41
+ def images(_isoxml, _out)
42
42
  default_logo_path =
43
43
  File.expand_path(File.join(File.dirname(__FILE__), "html",
44
44
  "logo.jpg"))
data/lib/metanorma/generic/basicdoc.rng CHANGED
@@ -1527,12 +1527,16 @@ to indicate that the index range covers a range of locations between the current
1527
1527
  <ref name="index-primary">
1528
1528
  <a:documentation>Primary index term to be recorded at the current location</a:documentation>
1529
1529
  </ref>
1530
- <ref name="index-secondary">
1531
- <a:documentation>Secondary index term to be recorded at the current location</a:documentation>
1532
- </ref>
1533
- <ref name="index-tertiary">
1534
- <a:documentation>Tertiary index term to be recorded at the current </a:documentation>
1535
- </ref>
1530
+ <optional>
1531
+ <ref name="index-secondary">
1532
+ <a:documentation>Secondary index term to be recorded at the current location</a:documentation>
1533
+ </ref>
1534
+ </optional>
1535
+ <optional>
1536
+ <ref name="index-tertiary">
1537
+ <a:documentation>Tertiary index term to be recorded at the current </a:documentation>
1538
+ </ref>
1539
+ </optional>
1536
1540
  </element>
1537
1541
  </define>
1538
1542
  <define name="index-xref">
@@ -1547,12 +1551,16 @@ The text in the inline element is the primary index term to be be cross-referenc
1547
1551
  <ref name="index-primary">
1548
1552
  <a:documentation>The primary index term to be cross-referenced</a:documentation>
1549
1553
  </ref>
1550
- <ref name="index-secondary">
1551
- <a:documentation>The secondary index term to be cross-referenced</a:documentation>
1552
- </ref>
1553
- <ref name="index-tertiary">
1554
- <a:documentation>The tertiary index term to be cross-referenced</a:documentation>
1555
- </ref>
1554
+ <optional>
1555
+ <ref name="index-secondary">
1556
+ <a:documentation>The secondary index term to be cross-referenced</a:documentation>
1557
+ </ref>
1558
+ </optional>
1559
+ <optional>
1560
+ <ref name="index-tertiary">
1561
+ <a:documentation>The tertiary index term to be cross-referenced</a:documentation>
1562
+ </ref>
1563
+ </optional>
1556
1564
  <element name="target">
1557
1565
  <a:documentation>The index term to be cross-referenced to</a:documentation>
1558
1566
  <oneOrMore>
@@ -1931,9 +1939,10 @@ or as the string "auto"</a:documentation>
1931
1939
  </element>
1932
1940
  </define>
1933
1941
  <define name="mathml">
1934
- <a:documentation>Encoding of MathML: the official W3C MathML 3.0 grammar (namespace
1942
+ <a:documentation>Encoding of MathML: the official W3C MathML 4 grammar (namespace
1935
1943
  http://www.w3.org/1998/Math/MathML), via the metanorma wrapper in
1936
- grammars/mathml/. See grammars/mathml/README.adoc and basicdoc-models#35.</a:documentation>
1944
+ grammars/mathml/. See grammars/mathml/README.adoc, basicdoc-models#35,
1945
+ and the MathML 3 -&gt; 4 migration: basicdoc-models#39 / metanorma#585.</a:documentation>
1937
1946
  <externalRef href="metanorma-mathml.rng"/>
1938
1947
  </define>
1939
1948
  <define name="StemAttributes">
data/lib/metanorma/generic/cleanup.rb CHANGED
@@ -15,47 +15,10 @@ module Metanorma
15
15
  Metanorma::Generic::Configuration::CONFIG_ATTRS.each do |a|
16
16
  conv.meta.set(a, configuration.send(a))
17
17
  end
18
- conv.meta.set(:bibdata, bibdata_hash(xmldoc))
19
18
  @isodoc = conv
20
19
  @isodoc
21
20
  end
22
21
 
23
- def bibdata_hash(xmldoc)
24
- b = xmldoc.at("//bibdata") || xmldoc.at("//xmlns:bibdata") or return nil
25
- stripped = Nokogiri::XML(b.to_xml)
26
- stripped.remove_namespaces!
27
- # Drop @boilerplate="true" docidentifiers before handing the
28
- # bibdata to Relaton::Cli.parse_xml: their content is an
29
- # unresolved Liquid template, and recent relaton-iho /
30
- # relaton-cc / etc. eagerly call pubid in their docidentifier
31
- # content= setter, which crashes on raw Liquid syntax. The
32
- # template variables for substitution come from other bibdata
33
- # fields (seriesabbr, docnumeric, …), not from the
34
- # docidentifier itself, so dropping it here does not affect
35
- # what we feed back into isodoc.meta. Substitution still runs
36
- # on the original xmldoc via standoc's
37
- # docidentifier_boilerplate_isodoc; afterwards
38
- # refresh_isodoc_bibdata re-calls bibdata_hash to seed
39
- # isodoc.meta with the resolved docidentifier.
40
- # See https://github.com/metanorma/metanorma/issues/558.
41
- stripped.xpath("//docidentifier[@boilerplate = 'true']").each(&:remove)
42
- bib = BibdataConfig.from_xml(
43
- "<metanorma>#{stripped.root.to_xml}</metanorma>",
44
- ).bibdata or return nil
45
- YAML.safe_load(bib.to_yaml, permitted_classes: [Date, Symbol],
46
- symbolize_names: true)
47
- end
48
-
49
- # Override standoc's hook: in addition to re-running
50
- # isodoc_bibdata_parse, refresh conv.meta[:bibdata] with the
51
- # bibdata_hash now that docidentifiers have been substituted, so
52
- # downstream consumers (boilerplate Liquid expansion, coverpage
53
- # interpolation, etc.) see the resolved values.
54
- def refresh_isodoc_bibdata(xmldoc, conv)
55
- super
56
- conv.meta.set(:bibdata, bibdata_hash(xmldoc))
57
- end
58
-
59
22
  def boilerplate_file(xmldoc)
60
23
  f = configuration.boilerplate
61
24
  f.nil? and return super
data/lib/metanorma/generic/converter.rb CHANGED
@@ -2,7 +2,6 @@ require "asciidoctor"
2
2
  require "metanorma-standoc"
3
3
  require "fileutils"
4
4
  require_relative "front"
5
- require_relative "bibdata_config"
6
5
  require "metanorma-core"
7
6
  require "pathname"
8
7
 
data/lib/metanorma/generic/isodoc.rng CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
- <!-- VERSION v2.1.6 -->
3
+ <!-- VERSION v2.2.0 -->
4
4
 
5
5
  <!--
6
6
  ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
data/lib/metanorma/generic/{mathml3-content.rng → mathml4-content.rng} RENAMED
@@ -1,22 +1,21 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
- <!--
4
- This is the Mathematical Markup Language (MathML) 3.0, an XML
5
- application for describing mathematical notation and capturing
6
- both its structure and content.
7
-
8
- Copyright 1998-2014 W3C (MIT, ERCIM, Keio, Beihang)
9
-
10
- Use and distribution of this code are permitted under the terms
11
- W3C Software Notice and License
12
- http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
13
- -->
14
- <include href="mathml3-strict-content.rng">
2
+ <!--
3
+ MathML 4 (Content)
4
+ ##################
5
+ -->
6
+ <!--
7
+ Copyright 1998-2026 W3C (MIT, ERCIM, Keio, Beihang)
8
+
9
+ Use and distribution of this code are permitted under the terms
10
+ W3C Software Notice and License
11
+ http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
12
+ -->
13
+ <grammar ns="http://www.w3.org/1998/Math/MathML" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
14
+ <include href="mathml4-strict-content.rng">
15
15
  <define name="cn.content">
16
16
  <zeroOrMore>
17
17
  <choice>
18
18
  <text/>
19
- <ref name="mglyph"/>
20
19
  <ref name="sep"/>
21
20
  <ref name="PresentationExpression"/>
22
21
  </choice>
@@ -46,7 +45,6 @@
46
45
  <zeroOrMore>
47
46
  <choice>
48
47
  <text/>
49
- <ref name="mglyph"/>
50
48
  <ref name="PresentationExpression"/>
51
49
  </choice>
52
50
  </zeroOrMore>
@@ -65,11 +63,22 @@
65
63
  <zeroOrMore>
66
64
  <choice>
67
65
  <text/>
68
- <ref name="mglyph"/>
69
66
  <ref name="PresentationExpression"/>
70
67
  </choice>
71
68
  </zeroOrMore>
72
69
  </define>
70
+ <define name="annotation-xml.attributes" combine="choice">
71
+ <ref name="CommonAtt"/>
72
+ <optional>
73
+ <ref name="cd"/>
74
+ </optional>
75
+ <optional>
76
+ <ref name="name"/>
77
+ </optional>
78
+ <optional>
79
+ <ref name="encoding"/>
80
+ </optional>
81
+ </define>
73
82
  <define name="bvar">
74
83
  <element name="bvar">
75
84
  <ref name="CommonAtt"/>
@@ -113,6 +122,63 @@
113
122
  <ref name="apply.content"/>
114
123
  </define>
115
124
  </include>
125
+ <define name="NonMathMLAtt" combine="choice">
126
+ <attribute>
127
+ <anyName>
128
+ <except>
129
+ <nsName ns=""/>
130
+ <nsName/>
131
+ </except>
132
+ </anyName>
133
+ <data type="string"/>
134
+ </attribute>
135
+ </define>
136
+ <!--
137
+ METANORMA MODIFICATION (basicdoc-models#39): upstream re-adds
138
+ `attribute alttext` to math.attributes here, but mathml4-core.rnc already
139
+ defines it on math; RELAX NG's duplicate-attribute restriction rejects the
140
+ composed grammar (jing: 'duplicate attribute "alttext"').
141
+ Upstream text was:
142
+ math.attributes &=
143
+ attribute alttext {text}?
144
+ -->
145
+ <!--
146
+ METANORMA MODIFICATION (basicdoc-models#39): upstream re-adds the
147
+ `data-other` placeholder to MathMLDataAttributes here; dropped for the
148
+ same reason as the core placeholder (see mathml4-core.rnc modification).
149
+ Upstream text was:
150
+ MathMLDataAttributes &=
151
+ attribute data-other {text}?
152
+ -->
153
+ <define name="CommonAtt" combine="interleave">
154
+ <zeroOrMore>
155
+ <ref name="NonMathMLAtt"/>
156
+ </zeroOrMore>
157
+ <ref name="MathMLDataAttributes"/>
158
+ <optional>
159
+ <attribute name="class">
160
+ <data type="NCName"/>
161
+ </attribute>
162
+ </optional>
163
+ <optional>
164
+ <attribute name="style">
165
+ <data type="string"/>
166
+ </attribute>
167
+ </optional>
168
+ <optional>
169
+ <attribute name="href">
170
+ <data type="anyURI"/>
171
+ </attribute>
172
+ </optional>
173
+ <optional>
174
+ <attribute name="intent"/>
175
+ </optional>
176
+ <optional>
177
+ <attribute name="arg">
178
+ <data type="NCName"/>
179
+ </attribute>
180
+ </optional>
181
+ </define>
116
182
  <define name="base">
117
183
  <attribute name="base"/>
118
184
  </define>
@@ -124,6 +190,18 @@
124
190
  <define name="PresentationExpression" combine="choice">
125
191
  <notAllowed/>
126
192
  </define>
193
+ <define name="DefEncAtt">
194
+ <optional>
195
+ <attribute name="encoding">
196
+ <data type="string"/>
197
+ </attribute>
198
+ </optional>
199
+ <optional>
200
+ <attribute name="definitionURL">
201
+ <data type="anyURI"/>
202
+ </attribute>
203
+ </optional>
204
+ </define>
127
205
  <define name="DomainQ">
128
206
  <zeroOrMore>
129
207
  <choice>
@@ -228,60 +306,6 @@
228
306
  <ref name="ContExp"/>
229
307
  </element>
230
308
  </define>
231
- <define name="DeprecatedContExp">
232
- <choice>
233
- <ref name="reln"/>
234
- <ref name="fn"/>
235
- <ref name="declare"/>
236
- </choice>
237
- </define>
238
- <define name="ContExp" combine="choice">
239
- <ref name="DeprecatedContExp"/>
240
- </define>
241
- <define name="reln">
242
- <element name="reln">
243
- <zeroOrMore>
244
- <ref name="ContExp"/>
245
- </zeroOrMore>
246
- </element>
247
- </define>
248
- <define name="fn">
249
- <element name="fn">
250
- <ref name="ContExp"/>
251
- </element>
252
- </define>
253
- <define name="declare">
254
- <element name="declare">
255
- <optional>
256
- <attribute name="type">
257
- <data type="string"/>
258
- </attribute>
259
- </optional>
260
- <optional>
261
- <attribute name="scope">
262
- <data type="string"/>
263
- </attribute>
264
- </optional>
265
- <optional>
266
- <attribute name="nargs">
267
- <data type="nonNegativeInteger"/>
268
- </attribute>
269
- </optional>
270
- <optional>
271
- <attribute name="occurrence">
272
- <choice>
273
- <value>prefix</value>
274
- <value>infix</value>
275
- <value>function-model</value>
276
- </choice>
277
- </attribute>
278
- </optional>
279
- <ref name="DefEncAtt"/>
280
- <oneOrMore>
281
- <ref name="ContExp"/>
282
- </oneOrMore>
283
- </element>
284
- </define>
285
309
  <define name="interval.class">
286
310
  <ref name="interval"/>
287
311
  </define>
@@ -1253,10 +1277,10 @@
1253
1277
  <define name="nary-stats.class">
1254
1278
  <choice>
1255
1279
  <ref name="mean"/>
1256
- <ref name="sdev"/>
1257
- <ref name="variance"/>
1258
1280
  <ref name="median"/>
1259
1281
  <ref name="mode"/>
1282
+ <ref name="sdev"/>
1283
+ <ref name="variance"/>
1260
1284
  </choice>
1261
1285
  </define>
1262
1286
  <define name="ContExp" combine="choice">
@@ -1269,29 +1293,29 @@
1269
1293
  <empty/>
1270
1294
  </element>
1271
1295
  </define>
1272
- <define name="sdev">
1273
- <element name="sdev">
1296
+ <define name="median">
1297
+ <element name="median">
1274
1298
  <ref name="CommonAtt"/>
1275
1299
  <ref name="DefEncAtt"/>
1276
1300
  <empty/>
1277
1301
  </element>
1278
1302
  </define>
1279
- <define name="variance">
1280
- <element name="variance">
1303
+ <define name="mode">
1304
+ <element name="mode">
1281
1305
  <ref name="CommonAtt"/>
1282
1306
  <ref name="DefEncAtt"/>
1283
1307
  <empty/>
1284
1308
  </element>
1285
1309
  </define>
1286
- <define name="median">
1287
- <element name="median">
1310
+ <define name="sdev">
1311
+ <element name="sdev">
1288
1312
  <ref name="CommonAtt"/>
1289
1313
  <ref name="DefEncAtt"/>
1290
1314
  <empty/>
1291
1315
  </element>
1292
1316
  </define>
1293
- <define name="mode">
1294
- <element name="mode">
1317
+ <define name="variance">
1318
+ <element name="variance">
1295
1319
  <ref name="CommonAtt"/>
1296
1320
  <ref name="DefEncAtt"/>
1297
1321
  <empty/>