metanorma-m3d 1.3.7 → 1.3.8
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.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +3 -2
- data/.github/workflows/ubuntu.yml +3 -2
- data/.github/workflows/windows.yml +3 -2
- data/lib/asciidoctor/m3d/basicdoc.rng +17 -2
- data/lib/asciidoctor/m3d/biblio.rng +11 -4
- data/lib/asciidoctor/m3d/isodoc.rng +6 -6
- data/lib/asciidoctor/m3d/isostandard.rng +10 -5
- data/lib/isodoc/m3d/html/m3d.scss +1 -1
- data/lib/metanorma/m3d/version.rb +1 -1
- data/metanorma-m3d.gemspec +0 -1
- metadata +2 -16
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1a6350916325a7e61a590df2ba3aef05df45391bf9e7d8bc6148038e6a842a28
|
|
4
|
+
data.tar.gz: 58b19e56f6809c1777a65fdcca05f91af2ce97c9f3597fcc94ed17db1319141a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5260e34bb316bb7e80163f2171b0d070ff0ed2d7a027df69ff604544f41cfbf1ac4a9932b55b253fc67dc9087dc01e2213e999dedacd76ead54bd357e7bdaeaa
|
|
7
|
+
data.tar.gz: e435fe525442305182156b4979d268ef57a285ecd642d656acf08fc7f7a0bdde54e6d1df26c3e9c86135e3745b5203f6f5009d9a88bef3a8db1736011414ab54
|
data/.github/workflows/macos.yml
CHANGED
|
@@ -2,13 +2,14 @@
|
|
|
2
2
|
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
3
|
name: macos
|
|
4
4
|
|
|
5
|
-
on: [push]
|
|
5
|
+
on: [push, pull_request]
|
|
6
6
|
|
|
7
7
|
jobs:
|
|
8
8
|
test-macos:
|
|
9
9
|
name: Test on Ruby ${{ matrix.ruby }} macOS
|
|
10
10
|
runs-on: macos-latest
|
|
11
11
|
strategy:
|
|
12
|
+
fail-fast: false
|
|
12
13
|
matrix:
|
|
13
14
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
14
15
|
steps:
|
|
@@ -20,7 +21,7 @@ jobs:
|
|
|
20
21
|
architecture: 'x64'
|
|
21
22
|
- name: Update gems
|
|
22
23
|
run: |
|
|
23
|
-
sudo gem install bundler
|
|
24
|
+
sudo gem install bundler --force
|
|
24
25
|
bundle install --jobs 4 --retry 3
|
|
25
26
|
- name: Use Node
|
|
26
27
|
uses: actions/setup-node@v1
|
|
@@ -2,13 +2,14 @@
|
|
|
2
2
|
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
3
|
name: ubuntu
|
|
4
4
|
|
|
5
|
-
on: [push]
|
|
5
|
+
on: [push, pull_request]
|
|
6
6
|
|
|
7
7
|
jobs:
|
|
8
8
|
test-linux:
|
|
9
9
|
name: Test on Ruby ${{ matrix.ruby }} Ubuntu
|
|
10
10
|
runs-on: ubuntu-latest
|
|
11
11
|
strategy:
|
|
12
|
+
fail-fast: false
|
|
12
13
|
matrix:
|
|
13
14
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
14
15
|
steps:
|
|
@@ -20,7 +21,7 @@ jobs:
|
|
|
20
21
|
architecture: 'x64'
|
|
21
22
|
- name: Update gems
|
|
22
23
|
run: |
|
|
23
|
-
gem install bundler
|
|
24
|
+
gem install bundler
|
|
24
25
|
bundle install --jobs 4 --retry 3
|
|
25
26
|
- name: Use Node
|
|
26
27
|
uses: actions/setup-node@v1
|
|
@@ -2,13 +2,14 @@
|
|
|
2
2
|
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
3
|
name: windows
|
|
4
4
|
|
|
5
|
-
on: [push]
|
|
5
|
+
on: [push, pull_request]
|
|
6
6
|
|
|
7
7
|
jobs:
|
|
8
8
|
test-windows:
|
|
9
9
|
name: Test on Ruby ${{ matrix.ruby }} Windows
|
|
10
10
|
runs-on: windows-latest
|
|
11
11
|
strategy:
|
|
12
|
+
fail-fast: false
|
|
12
13
|
matrix:
|
|
13
14
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
14
15
|
steps:
|
|
@@ -21,7 +22,7 @@ jobs:
|
|
|
21
22
|
- name: Update gems
|
|
22
23
|
shell: pwsh
|
|
23
24
|
run: |
|
|
24
|
-
gem install bundler
|
|
25
|
+
gem install bundler
|
|
25
26
|
bundle config --local path vendor/bundle
|
|
26
27
|
bundle update
|
|
27
28
|
bundle install --jobs 4 --retry 3
|
|
@@ -52,9 +52,9 @@
|
|
|
52
52
|
<optional>
|
|
53
53
|
<ref name="section-title"/>
|
|
54
54
|
</optional>
|
|
55
|
-
<
|
|
55
|
+
<zeroOrMore>
|
|
56
56
|
<ref name="BasicBlock"/>
|
|
57
|
-
</
|
|
57
|
+
</zeroOrMore>
|
|
58
58
|
<zeroOrMore>
|
|
59
59
|
<ref name="note"/>
|
|
60
60
|
</zeroOrMore>
|
|
@@ -284,6 +284,9 @@
|
|
|
284
284
|
<attribute name="id">
|
|
285
285
|
<data type="ID"/>
|
|
286
286
|
</attribute>
|
|
287
|
+
<optional>
|
|
288
|
+
<attribute name="alt"/>
|
|
289
|
+
</optional>
|
|
287
290
|
<optional>
|
|
288
291
|
<ref name="tname"/>
|
|
289
292
|
</optional>
|
|
@@ -564,6 +567,7 @@
|
|
|
564
567
|
<ref name="pagebreak"/>
|
|
565
568
|
<ref name="bookmark"/>
|
|
566
569
|
<ref name="image"/>
|
|
570
|
+
<ref name="index"/>
|
|
567
571
|
</choice>
|
|
568
572
|
</define>
|
|
569
573
|
<define name="PureTextElement">
|
|
@@ -688,6 +692,17 @@
|
|
|
688
692
|
<empty/>
|
|
689
693
|
</element>
|
|
690
694
|
</define>
|
|
695
|
+
<define name="index">
|
|
696
|
+
<element name="index">
|
|
697
|
+
<attribute name="primary"/>
|
|
698
|
+
<optional>
|
|
699
|
+
<attribute name="secondary"/>
|
|
700
|
+
</optional>
|
|
701
|
+
<optional>
|
|
702
|
+
<attribute name="tertiary"/>
|
|
703
|
+
</optional>
|
|
704
|
+
</element>
|
|
705
|
+
</define>
|
|
691
706
|
<!-- bare ID element, used for referencing arbitrary spans of text -->
|
|
692
707
|
<define name="bookmark">
|
|
693
708
|
<element name="bookmark">
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
</data>
|
|
35
35
|
</define>
|
|
36
36
|
<start>
|
|
37
|
-
<ref name="
|
|
37
|
+
<ref name="bibitem"/>
|
|
38
38
|
</start>
|
|
39
39
|
<define name="status">
|
|
40
40
|
<element name="status">
|
|
@@ -278,10 +278,12 @@
|
|
|
278
278
|
</define>
|
|
279
279
|
<define name="organization">
|
|
280
280
|
<element name="organization">
|
|
281
|
-
<
|
|
282
|
-
|
|
281
|
+
<oneOrMore>
|
|
282
|
+
<ref name="orgname"/>
|
|
283
|
+
</oneOrMore>
|
|
284
|
+
<zeroOrMore>
|
|
283
285
|
<ref name="subdivision"/>
|
|
284
|
-
</
|
|
286
|
+
</zeroOrMore>
|
|
285
287
|
<optional>
|
|
286
288
|
<ref name="abbreviation"/>
|
|
287
289
|
</optional>
|
|
@@ -357,6 +359,9 @@
|
|
|
357
359
|
</define>
|
|
358
360
|
<define name="phone">
|
|
359
361
|
<element name="phone">
|
|
362
|
+
<optional>
|
|
363
|
+
<attribute name="type"/>
|
|
364
|
+
</optional>
|
|
360
365
|
<text/>
|
|
361
366
|
</element>
|
|
362
367
|
</define>
|
|
@@ -1024,6 +1029,8 @@
|
|
|
1024
1029
|
<value>correctedBy</value>
|
|
1025
1030
|
<value>revises</value>
|
|
1026
1031
|
<value>revisedBy</value>
|
|
1032
|
+
<value>describes</value>
|
|
1033
|
+
<value>describedBy</value>
|
|
1027
1034
|
</choice>
|
|
1028
1035
|
</define>
|
|
1029
1036
|
<define name="docrelation">
|
|
@@ -207,9 +207,9 @@
|
|
|
207
207
|
</optional>
|
|
208
208
|
<choice>
|
|
209
209
|
<group>
|
|
210
|
-
<
|
|
210
|
+
<zeroOrMore>
|
|
211
211
|
<ref name="BasicBlock"/>
|
|
212
|
-
</
|
|
212
|
+
</zeroOrMore>
|
|
213
213
|
<zeroOrMore>
|
|
214
214
|
<ref name="note"/>
|
|
215
215
|
</zeroOrMore>
|
|
@@ -244,9 +244,9 @@
|
|
|
244
244
|
</optional>
|
|
245
245
|
<choice>
|
|
246
246
|
<group>
|
|
247
|
-
<
|
|
247
|
+
<zeroOrMore>
|
|
248
248
|
<ref name="BasicBlock"/>
|
|
249
|
-
</
|
|
249
|
+
</zeroOrMore>
|
|
250
250
|
<zeroOrMore>
|
|
251
251
|
<ref name="note"/>
|
|
252
252
|
</zeroOrMore>
|
|
@@ -289,9 +289,9 @@
|
|
|
289
289
|
</optional>
|
|
290
290
|
<choice>
|
|
291
291
|
<group>
|
|
292
|
-
<
|
|
292
|
+
<zeroOrMore>
|
|
293
293
|
<ref name="BasicBlock"/>
|
|
294
|
-
</
|
|
294
|
+
</zeroOrMore>
|
|
295
295
|
<zeroOrMore>
|
|
296
296
|
<ref name="note"/>
|
|
297
297
|
</zeroOrMore>
|
|
@@ -6,7 +6,9 @@
|
|
|
6
6
|
</start>
|
|
7
7
|
<define name="organization">
|
|
8
8
|
<element name="organization">
|
|
9
|
-
<
|
|
9
|
+
<oneOrMore>
|
|
10
|
+
<ref name="orgname"/>
|
|
11
|
+
</oneOrMore>
|
|
10
12
|
<optional>
|
|
11
13
|
<ref name="abbreviation"/>
|
|
12
14
|
</optional>
|
|
@@ -74,10 +76,12 @@
|
|
|
74
76
|
<define name="sections">
|
|
75
77
|
<element name="sections">
|
|
76
78
|
<ref name="clause"/>
|
|
77
|
-
<
|
|
78
|
-
<
|
|
79
|
-
|
|
80
|
-
|
|
79
|
+
<optional>
|
|
80
|
+
<choice>
|
|
81
|
+
<ref name="term-clause"/>
|
|
82
|
+
<ref name="terms"/>
|
|
83
|
+
</choice>
|
|
84
|
+
</optional>
|
|
81
85
|
<optional>
|
|
82
86
|
<ref name="definitions"/>
|
|
83
87
|
</optional>
|
|
@@ -395,6 +399,7 @@
|
|
|
395
399
|
</optional>
|
|
396
400
|
<choice>
|
|
397
401
|
<ref name="image"/>
|
|
402
|
+
<ref name="pre"/>
|
|
398
403
|
<oneOrMore>
|
|
399
404
|
<ref name="subfigure"/>
|
|
400
405
|
</oneOrMore>
|
|
@@ -27,7 +27,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
|
|
|
27
27
|
line-height:12.0pt;
|
|
28
28
|
mso-pagination:widow-orphan;
|
|
29
29
|
tab-stops:20.15pt;
|
|
30
|
-
font-size:
|
|
30
|
+
font-size:11.0pt;
|
|
31
31
|
font-family:$bodyfont;
|
|
32
32
|
mso-fareast-font-family:Calibri;
|
|
33
33
|
mso-bidi-font-family:"Courier New";
|
data/metanorma-m3d.gemspec
CHANGED
|
@@ -40,7 +40,6 @@ Gem::Specification.new do |spec|
|
|
|
40
40
|
spec.add_dependency "metanorma-standoc", "~> 1.3.0"
|
|
41
41
|
spec.add_dependency "isodoc", "~> 1.0.0"
|
|
42
42
|
|
|
43
|
-
spec.add_development_dependency "bundler", "~> 2.0.1"
|
|
44
43
|
spec.add_development_dependency "byebug", "~> 9.1"
|
|
45
44
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
|
46
45
|
spec.add_development_dependency "guard", "~> 2.14"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-m3d
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.3.
|
|
4
|
+
version: 1.3.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-12-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: asciimath
|
|
@@ -136,20 +136,6 @@ dependencies:
|
|
|
136
136
|
- - "~>"
|
|
137
137
|
- !ruby/object:Gem::Version
|
|
138
138
|
version: 1.0.0
|
|
139
|
-
- !ruby/object:Gem::Dependency
|
|
140
|
-
name: bundler
|
|
141
|
-
requirement: !ruby/object:Gem::Requirement
|
|
142
|
-
requirements:
|
|
143
|
-
- - "~>"
|
|
144
|
-
- !ruby/object:Gem::Version
|
|
145
|
-
version: 2.0.1
|
|
146
|
-
type: :development
|
|
147
|
-
prerelease: false
|
|
148
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
149
|
-
requirements:
|
|
150
|
-
- - "~>"
|
|
151
|
-
- !ruby/object:Gem::Version
|
|
152
|
-
version: 2.0.1
|
|
153
139
|
- !ruby/object:Gem::Dependency
|
|
154
140
|
name: byebug
|
|
155
141
|
requirement: !ruby/object:Gem::Requirement
|