metanorma-ieee 1.3.10 → 1.4.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -120,7 +120,7 @@ module IsoDoc
120
120
  formula_parse1(node, div)
121
121
  formula_where(node.at(ns("./dl")), div)
122
122
  node.children.each do |n|
123
- %w(stem dl fmt-name).include? n.name and next
123
+ %w(fmt-stem dl fmt-name).include? n.name and next
124
124
  parse(n, div)
125
125
  end
126
126
  end
@@ -1,5 +1,5 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <grammar ns='https://www.metanorma.org/ns/ieee' xmlns="http://relaxng.org/ns/structure/1.0">
2
+ <grammar ns='https://www.metanorma.org/ns/standoc' xmlns="http://relaxng.org/ns/structure/1.0">
3
3
  <!--
4
4
  VERSION v1.2.1
5
5
  Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
@@ -8,9 +8,6 @@
8
8
  -->
9
9
  <include href="relaton-ieee.rng"/>
10
10
  <include href="isodoc.rng">
11
- <start>
12
- <ref name="ieee-standard"/>
13
- </start>
14
11
  <define name="sections">
15
12
  <element name="sections">
16
13
  <optional>
@@ -27,31 +24,31 @@
27
24
  </oneOrMore>
28
25
  </element>
29
26
  </define>
27
+ <define name="standard-document">
28
+ <element name="metanorma">
29
+ <ref name="Root-Attributes"/>
30
+ <ref name="bibdata"/>
31
+ <zeroOrMore>
32
+ <ref name="termdocsource"/>
33
+ </zeroOrMore>
34
+ <optional>
35
+ <ref name="misccontainer"/>
36
+ </optional>
37
+ <optional>
38
+ <ref name="boilerplate"/>
39
+ </optional>
40
+ <ref name="preface"/>
41
+ <oneOrMore>
42
+ <ref name="sections"/>
43
+ </oneOrMore>
44
+ <zeroOrMore>
45
+ <ref name="annex"/>
46
+ </zeroOrMore>
47
+ <ref name="bibliography"/>
48
+ <zeroOrMore>
49
+ <ref name="indexsect"/>
50
+ </zeroOrMore>
51
+ </element>
52
+ </define>
30
53
  </include>
31
- <define name="ieee-standard">
32
- <element name="ieee-standard">
33
- <ref name="Root-Attributes"/>
34
- <ref name="bibdata"/>
35
- <zeroOrMore>
36
- <ref name="termdocsource"/>
37
- </zeroOrMore>
38
- <optional>
39
- <ref name="misccontainer"/>
40
- </optional>
41
- <optional>
42
- <ref name="boilerplate"/>
43
- </optional>
44
- <ref name="preface"/>
45
- <oneOrMore>
46
- <ref name="sections"/>
47
- </oneOrMore>
48
- <zeroOrMore>
49
- <ref name="annex"/>
50
- </zeroOrMore>
51
- <ref name="bibliography"/>
52
- <zeroOrMore>
53
- <ref name="indexsect"/>
54
- </zeroOrMore>
55
- </element>
56
- </define>
57
54
  </grammar>
@@ -17,7 +17,7 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <!-- VERSION v1.4.1 -->
20
+ <!-- VERSION v2.0.0 -->
21
21
  <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">
22
22
  <include href="reqt.rng"/>
23
23
  <include href="basicdoc.rng">
@@ -459,11 +459,14 @@ gives an explicit page orientation</a:documentation>
459
459
  <a:documentation>Description of location in a reference, which can be combined with other locations in a single citation</a:documentation>
460
460
  </ref>
461
461
  </zeroOrMore>
462
- <zeroOrMore>
463
- <ref name="PureTextElement">
462
+ <optional>
463
+ <element name="display-text">
464
464
  <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
465
- </ref>
466
- </zeroOrMore>
465
+ <oneOrMore>
466
+ <ref name="PureTextElement"/>
467
+ </oneOrMore>
468
+ </element>
469
+ </optional>
467
470
  </define>
468
471
  </include>
469
472
  <!-- end overrides -->
@@ -1205,10 +1208,13 @@ numbers</a:documentation>
1205
1208
  <value>presentation</value>
1206
1209
  </choice>
1207
1210
  </attribute>
1211
+ <attribute name="flavor">
1212
+ <a:documentation>Metanorma flavor, indicating SDO whose requiremnts the realisation aligns to</a:documentation>
1213
+ </attribute>
1208
1214
  </define>
1209
1215
  <define name="standard-document">
1210
1216
  <a:documentation>Representation of a standardisation document</a:documentation>
1211
- <element name="standard-document">
1217
+ <element name="metanorma">
1212
1218
  <ref name="Root-Attributes"/>
1213
1219
  <ref name="bibdata">
1214
1220
  <a:documentation>Bibliographic description of the document itself, expressed in the Relaton model</a:documentation>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ieee
3
- VERSION = "1.3.10".freeze
3
+ VERSION = "1.4.0".freeze
4
4
  end
5
5
  end
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
25
25
  spec.require_paths = ["lib"]
26
26
  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
27
27
 
28
- spec.add_dependency "metanorma-standoc", "~> 2.10.2"
28
+ spec.add_dependency "metanorma-standoc", "~> 3.0.0"
29
29
  spec.add_dependency "mnconvert", "~> 1.20"
30
30
  spec.add_dependency "pubid"
31
31
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ieee
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.10
4
+ version: 1.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-02-03 00:00:00.000000000 Z
11
+ date: 2025-02-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.10.2
19
+ version: 3.0.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 2.10.2
26
+ version: 3.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: mnconvert
29
29
  requirement: !ruby/object:Gem::Requirement