metanorma-iso 1.3.3 → 1.3.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.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +37 -0
- data/.github/workflows/ubuntu.yml +37 -0
- data/.github/workflows/windows.yml +40 -0
- data/lib/asciidoctor/iso/basicdoc.rng +3 -0
- data/lib/asciidoctor/iso/isodoc.rng +21 -0
- data/lib/isodoc/iso/base_convert.rb +31 -12
- data/lib/metanorma/iso/version.rb +1 -1
- data/spec/asciidoctor-iso/cleanup_spec.rb +0 -35
- data/spec/isodoc/iso_spec.rb +14 -8
- data/spec/isodoc/postproc_spec.rb +3 -3
- data/spec/isodoc/section_spec.rb +4 -0
- metadata +5 -4
- data/.travis.yml +0 -23
- data/appveyor.yml +0 -37
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: df21fdceaadedcf87b02bbb9cacff0592252d9ecead4b954acb1c31af3f97a28
|
|
4
|
+
data.tar.gz: f34ddbd46525e3e7f790b7e0acee686c1578838f42aee94b03080c28bbf8190b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f2fd1b532bba2b5d0122ed3b172bac166ed3db5d94998067d5580bfcfa0b18469e3d4eb2fbc9c43a9ad6152855080d45cce02351ac2b0f6ca8eb9565e430d32a
|
|
7
|
+
data.tar.gz: 370b9b387ca3225d7bf1970532a9a3c18288ee3b491ad09027751dfc52e919b35f01624195116f2ef6ccd5bee4c0a82eec286ba2cbf2303015cb33d764b0c5ef
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
# Auto-generated !!! Do not edit it manually
|
|
2
|
+
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
|
+
name: macos
|
|
4
|
+
|
|
5
|
+
on: [push]
|
|
6
|
+
|
|
7
|
+
jobs:
|
|
8
|
+
test-macos:
|
|
9
|
+
name: Test on Ruby ${{ matrix.ruby }} macOS
|
|
10
|
+
runs-on: macos-latest
|
|
11
|
+
strategy:
|
|
12
|
+
matrix:
|
|
13
|
+
ruby: [ '2.6', '2.5', '2.4' ]
|
|
14
|
+
steps:
|
|
15
|
+
- uses: actions/checkout@master
|
|
16
|
+
- name: Use Ruby
|
|
17
|
+
uses: actions/setup-ruby@v1
|
|
18
|
+
with:
|
|
19
|
+
ruby-version: ${{ matrix.ruby }}
|
|
20
|
+
architecture: 'x64'
|
|
21
|
+
- name: Update gems
|
|
22
|
+
run: |
|
|
23
|
+
sudo gem install bundler -v "~> 2" --force
|
|
24
|
+
bundle install --jobs 4 --retry 3
|
|
25
|
+
- name: Use Node
|
|
26
|
+
uses: actions/setup-node@v1
|
|
27
|
+
with:
|
|
28
|
+
node-version: '8'
|
|
29
|
+
- name: Install Puppeteer
|
|
30
|
+
run: |
|
|
31
|
+
npm install -g puppeteer
|
|
32
|
+
- name: Install PlantUML
|
|
33
|
+
run: |
|
|
34
|
+
brew install plantuml
|
|
35
|
+
- name: Run specs
|
|
36
|
+
run: |
|
|
37
|
+
bundle exec rake
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
# Auto-generated !!! Do not edit it manually
|
|
2
|
+
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
|
+
name: ubuntu
|
|
4
|
+
|
|
5
|
+
on: [push]
|
|
6
|
+
|
|
7
|
+
jobs:
|
|
8
|
+
test-linux:
|
|
9
|
+
name: Test on Ruby ${{ matrix.ruby }} Ubuntu
|
|
10
|
+
runs-on: ubuntu-latest
|
|
11
|
+
strategy:
|
|
12
|
+
matrix:
|
|
13
|
+
ruby: [ '2.6', '2.5', '2.4' ]
|
|
14
|
+
steps:
|
|
15
|
+
- uses: actions/checkout@master
|
|
16
|
+
- name: Use Ruby
|
|
17
|
+
uses: actions/setup-ruby@v1
|
|
18
|
+
with:
|
|
19
|
+
ruby-version: ${{ matrix.ruby }}
|
|
20
|
+
architecture: 'x64'
|
|
21
|
+
- name: Update gems
|
|
22
|
+
run: |
|
|
23
|
+
gem install bundler -v "~> 2"
|
|
24
|
+
bundle install --jobs 4 --retry 3
|
|
25
|
+
- name: Use Node
|
|
26
|
+
uses: actions/setup-node@v1
|
|
27
|
+
with:
|
|
28
|
+
node-version: '8'
|
|
29
|
+
- name: Install Puppeteer
|
|
30
|
+
run: |
|
|
31
|
+
npm install -g puppeteer
|
|
32
|
+
- name: Install PlantUML
|
|
33
|
+
run: |
|
|
34
|
+
sudo bash -c "curl -L https://github.com/riboseinc/plantuml-install/raw/master/ubuntu.sh | bash"
|
|
35
|
+
- name: Run specs
|
|
36
|
+
run: |
|
|
37
|
+
bundle exec rake
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
# Auto-generated !!! Do not edit it manually
|
|
2
|
+
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
|
+
name: windows
|
|
4
|
+
|
|
5
|
+
on: [push]
|
|
6
|
+
|
|
7
|
+
jobs:
|
|
8
|
+
test-windows:
|
|
9
|
+
name: Test on Ruby ${{ matrix.ruby }} Windows
|
|
10
|
+
runs-on: windows-latest
|
|
11
|
+
strategy:
|
|
12
|
+
matrix:
|
|
13
|
+
ruby: [ '2.6', '2.5', '2.4' ]
|
|
14
|
+
steps:
|
|
15
|
+
- uses: actions/checkout@master
|
|
16
|
+
- name: Use Ruby
|
|
17
|
+
uses: actions/setup-ruby@v1
|
|
18
|
+
with:
|
|
19
|
+
ruby-version: ${{ matrix.ruby }}
|
|
20
|
+
architecture: 'x64'
|
|
21
|
+
- name: Update gems
|
|
22
|
+
shell: pwsh
|
|
23
|
+
run: |
|
|
24
|
+
gem install bundler -v "~> 2"
|
|
25
|
+
bundle config --local path vendor/bundle
|
|
26
|
+
bundle update
|
|
27
|
+
bundle install --jobs 4 --retry 3
|
|
28
|
+
- name: Use Node
|
|
29
|
+
uses: actions/setup-node@v1
|
|
30
|
+
with:
|
|
31
|
+
node-version: '8'
|
|
32
|
+
- name: Install Puppeteer
|
|
33
|
+
run: |
|
|
34
|
+
npm install -g puppeteer
|
|
35
|
+
- name: Install PlantUML
|
|
36
|
+
run: |
|
|
37
|
+
cinst -y plantuml
|
|
38
|
+
- name: Run specs
|
|
39
|
+
run: |
|
|
40
|
+
bundle exec rake
|
|
@@ -44,6 +44,27 @@
|
|
|
44
44
|
</oneOrMore>
|
|
45
45
|
</element>
|
|
46
46
|
</define>
|
|
47
|
+
<define name="references">
|
|
48
|
+
<element name="references">
|
|
49
|
+
<optional>
|
|
50
|
+
<attribute name="id">
|
|
51
|
+
<data type="ID"/>
|
|
52
|
+
</attribute>
|
|
53
|
+
</optional>
|
|
54
|
+
<optional>
|
|
55
|
+
<ref name="section-title"/>
|
|
56
|
+
</optional>
|
|
57
|
+
<zeroOrMore>
|
|
58
|
+
<ref name="BasicBlock"/>
|
|
59
|
+
</zeroOrMore>
|
|
60
|
+
<zeroOrMore>
|
|
61
|
+
<ref name="bibitem"/>
|
|
62
|
+
<zeroOrMore>
|
|
63
|
+
<ref name="note"/>
|
|
64
|
+
</zeroOrMore>
|
|
65
|
+
</zeroOrMore>
|
|
66
|
+
</element>
|
|
67
|
+
</define>
|
|
47
68
|
</include>
|
|
48
69
|
<define name="standard-document">
|
|
49
70
|
<element name="standard-document">
|
|
@@ -80,7 +80,7 @@ module IsoDoc
|
|
|
80
80
|
@anchors[clause["id"]] =
|
|
81
81
|
{ label: num, level: level, xref: num }
|
|
82
82
|
# subclauses are not prefixed with "Clause"
|
|
83
|
-
clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
|
|
83
|
+
clause.xpath(ns("./clause | ./terms | ./term | ./definitions | ./references")).
|
|
84
84
|
each_with_index do |c, i|
|
|
85
85
|
section_names1(c, "#{num}.#{i + 1}", level + 1)
|
|
86
86
|
end
|
|
@@ -88,7 +88,7 @@ module IsoDoc
|
|
|
88
88
|
|
|
89
89
|
def annex_names1(clause, num, level)
|
|
90
90
|
@anchors[clause["id"]] = { label: num, xref: num, level: level }
|
|
91
|
-
clause.xpath(ns("./clause")).each_with_index do |c, i|
|
|
91
|
+
clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
|
|
92
92
|
annex_names1(c, "#{num}.#{i + 1}", level + 1)
|
|
93
93
|
end
|
|
94
94
|
end
|
|
@@ -99,7 +99,8 @@ module IsoDoc
|
|
|
99
99
|
ret += " 第#{from.text}" if from
|
|
100
100
|
ret += "–#{to}" if to
|
|
101
101
|
loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
|
|
102
|
-
ret += " #{loc}" unless subsection && type == "clause" ||
|
|
102
|
+
ret += " #{loc}" unless subsection && type == "clause" ||
|
|
103
|
+
type == "list" || target.match(/^IEV$|^IEC 60050-/)
|
|
103
104
|
ret += ")" if type == "list"
|
|
104
105
|
ret
|
|
105
106
|
end
|
|
@@ -110,7 +111,8 @@ module IsoDoc
|
|
|
110
111
|
return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
|
|
111
112
|
ret = type == "list" ? "" : ","
|
|
112
113
|
loc = @locality[type] || type.sub(/^locality:/, "").capitalize
|
|
113
|
-
ret += " #{loc}" unless subsection && type == "clause" ||
|
|
114
|
+
ret += " #{loc}" unless subsection && type == "clause" ||
|
|
115
|
+
type == "list" || target.match(/^IEV$|^IEC 60050-/)
|
|
114
116
|
ret += " #{from.text}" if from
|
|
115
117
|
ret += "–#{to.text}" if to
|
|
116
118
|
ret += ")" if type == "list"
|
|
@@ -122,11 +124,21 @@ module IsoDoc
|
|
|
122
124
|
l10n(anchor(container, :xref) + delim + linkend)
|
|
123
125
|
end
|
|
124
126
|
|
|
127
|
+
def example_span_label(node, div, name)
|
|
128
|
+
n = get_anchors[node["id"]]
|
|
129
|
+
div.span **{ class: "example_label" } do |p|
|
|
130
|
+
lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @example_lbl :
|
|
131
|
+
l10n("#{@example_lbl} #{n[:label]}")
|
|
132
|
+
p << lbl
|
|
133
|
+
name and !lbl.nil? and p << " — "
|
|
134
|
+
name and name.children.each { |n| parse(n, div) }
|
|
135
|
+
end
|
|
136
|
+
end
|
|
137
|
+
|
|
125
138
|
def example_p_parse(node, div)
|
|
139
|
+
name = node&.at(ns("./name"))&.remove
|
|
126
140
|
div.p do |p|
|
|
127
|
-
p
|
|
128
|
-
s << example_label(node)
|
|
129
|
-
end
|
|
141
|
+
example_span_label(node, p, name)
|
|
130
142
|
insert_tab(p, 1)
|
|
131
143
|
node.first_element_child.children.each { |n| parse(n, p) }
|
|
132
144
|
end
|
|
@@ -135,17 +147,24 @@ module IsoDoc
|
|
|
135
147
|
|
|
136
148
|
def example_parse1(node, div)
|
|
137
149
|
div.p do |p|
|
|
138
|
-
p.
|
|
139
|
-
s << example_label(node)
|
|
140
|
-
end
|
|
150
|
+
example_span_label(node, p, node.at(ns("./name")))
|
|
141
151
|
insert_tab(p, 1)
|
|
142
152
|
end
|
|
143
|
-
node.children.each { |n| parse(n, div) }
|
|
153
|
+
node.children.each { |n| parse(n, div) unless n.name == "name" }
|
|
154
|
+
end
|
|
155
|
+
|
|
156
|
+
def node_begins_with_para(node)
|
|
157
|
+
node.elements.each do |e|
|
|
158
|
+
next if e.name == "name"
|
|
159
|
+
return true if e.name == "p"
|
|
160
|
+
return false
|
|
161
|
+
end
|
|
162
|
+
false
|
|
144
163
|
end
|
|
145
164
|
|
|
146
165
|
def example_parse(node, out)
|
|
147
166
|
out.div **{ id: node["id"], class: "example" } do |div|
|
|
148
|
-
if node
|
|
167
|
+
if node_begins_with_para(node)
|
|
149
168
|
example_p_parse(node, div)
|
|
150
169
|
else
|
|
151
170
|
example_parse1(node, div)
|
|
@@ -597,41 +597,6 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
597
597
|
OUTPUT
|
|
598
598
|
end
|
|
599
599
|
|
|
600
|
-
it "processes subfigures" do
|
|
601
|
-
expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
|
|
602
|
-
#{ASCIIDOC_BLANK_HDR}
|
|
603
|
-
[[figureC-2]]
|
|
604
|
-
.Stages of gelatinization
|
|
605
|
-
====
|
|
606
|
-
.Initial stages: No grains are fully gelatinized (ungelatinized starch granules are visible inside the kernels)
|
|
607
|
-
image::spec/examples/rice_images/rice_image3_1.png[]
|
|
608
|
-
|
|
609
|
-
.Intermediate stages: Some fully gelatinized kernels are visible
|
|
610
|
-
image::spec/examples/rice_images/rice_image3_2.png[]
|
|
611
|
-
|
|
612
|
-
.Final stages: All kernels are fully gelatinized
|
|
613
|
-
image::spec/examples/rice_images/rice_image3_3.png[]
|
|
614
|
-
====
|
|
615
|
-
INPUT
|
|
616
|
-
#{BLANK_HDR}
|
|
617
|
-
<sections>
|
|
618
|
-
<figure id="figureC-2"><figure id="_">
|
|
619
|
-
<name>Initial stages: No grains are fully gelatinized (ungelatinized starch granules are visible inside the kernels)</name>
|
|
620
|
-
<image src="spec/examples/rice_images/rice_image3_1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
|
|
621
|
-
</figure>
|
|
622
|
-
<figure id="_">
|
|
623
|
-
<name>Intermediate stages: Some fully gelatinized kernels are visible</name>
|
|
624
|
-
<image src="spec/examples/rice_images/rice_image3_2.png" id="_" mimetype="image/png" height="auto" width="auto"/>
|
|
625
|
-
</figure>
|
|
626
|
-
<figure id="_">
|
|
627
|
-
<name>Final stages: All kernels are fully gelatinized</name>
|
|
628
|
-
<image src="spec/examples/rice_images/rice_image3_3.png" id="_" mimetype="image/png" height="auto" width="auto"/>
|
|
629
|
-
</figure></figure>
|
|
630
|
-
</sections>
|
|
631
|
-
</iso-standard>
|
|
632
|
-
OUTPUT
|
|
633
|
-
end
|
|
634
|
-
|
|
635
600
|
it "numbers bibliographic notes and footnotes sequentially" do
|
|
636
601
|
expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
|
|
637
602
|
#{ASCIIDOC_BLANK_HDR}
|
data/spec/isodoc/iso_spec.rb
CHANGED
|
@@ -168,6 +168,7 @@ end
|
|
|
168
168
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
169
169
|
<preface><foreword>
|
|
170
170
|
<example id="samplecode">
|
|
171
|
+
<name>Title</name>
|
|
171
172
|
<p>Hello</p>
|
|
172
173
|
</example>
|
|
173
174
|
</foreword></preface>
|
|
@@ -178,7 +179,7 @@ end
|
|
|
178
179
|
<div>
|
|
179
180
|
<h1 class="ForewordTitle">Foreword</h1>
|
|
180
181
|
<div id="samplecode" class="example">
|
|
181
|
-
<p><span class="example_label">EXAMPLE</span>  Hello</p>
|
|
182
|
+
<p><span class="example_label">EXAMPLE — Title</span>  Hello</p>
|
|
182
183
|
</div>
|
|
183
184
|
</div>
|
|
184
185
|
<p class="zzSTDTitle1"/>
|
|
@@ -194,9 +195,10 @@ end
|
|
|
194
195
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
195
196
|
<preface><foreword>
|
|
196
197
|
<example id="samplecode">
|
|
197
|
-
<
|
|
198
|
+
<quote>Hello</quote>
|
|
198
199
|
</example>
|
|
199
200
|
<example id="samplecode2">
|
|
201
|
+
<name>Title</name>
|
|
200
202
|
<p>Hello</p>
|
|
201
203
|
</example>
|
|
202
204
|
</foreword></preface>
|
|
@@ -207,10 +209,11 @@ end
|
|
|
207
209
|
<div>
|
|
208
210
|
<h1 class="ForewordTitle">Foreword</h1>
|
|
209
211
|
<div id="samplecode" class="example">
|
|
210
|
-
<p><span class="example_label">EXAMPLE 1</span> 
|
|
212
|
+
<p><span class="example_label">EXAMPLE 1</span>  </p>
|
|
213
|
+
<div class="Quote">Hello<p class="QuoteAttribution"/></div>
|
|
211
214
|
</div>
|
|
212
215
|
<div id="samplecode2" class="example">
|
|
213
|
-
<p><span class="example_label">EXAMPLE 2</span>  Hello</p>
|
|
216
|
+
<p><span class="example_label">EXAMPLE 2 — Title</span>  Hello</p>
|
|
214
217
|
</div>
|
|
215
218
|
</div>
|
|
216
219
|
<p class="zzSTDTitle1"/>
|
|
@@ -225,6 +228,7 @@ end
|
|
|
225
228
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
226
229
|
<preface><foreword>
|
|
227
230
|
<example id="samplecode">
|
|
231
|
+
<name>Title</name>
|
|
228
232
|
<p>Hello</p>
|
|
229
233
|
</example>
|
|
230
234
|
</foreword></preface>
|
|
@@ -244,7 +248,7 @@ end
|
|
|
244
248
|
<div>
|
|
245
249
|
<h1 class="ForewordTitle">Foreword</h1>
|
|
246
250
|
<div id="samplecode" class="example">
|
|
247
|
-
<p><span class="example_label">EXAMPLE</span><span style="mso-tab-count:1">  </span>Hello</p>
|
|
251
|
+
<p><span class="example_label">EXAMPLE — Title</span><span style="mso-tab-count:1">  </span>Hello</p>
|
|
248
252
|
</div>
|
|
249
253
|
</div>
|
|
250
254
|
<p> </p>
|
|
@@ -268,9 +272,10 @@ end
|
|
|
268
272
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
269
273
|
<preface><foreword>
|
|
270
274
|
<example id="samplecode">
|
|
271
|
-
<
|
|
275
|
+
<quote>Hello</quote>
|
|
272
276
|
</example>
|
|
273
277
|
<example id="samplecode2">
|
|
278
|
+
<name>Title</name>
|
|
274
279
|
<p>Hello</p>
|
|
275
280
|
</example>
|
|
276
281
|
</foreword></preface>
|
|
@@ -290,10 +295,11 @@ end
|
|
|
290
295
|
<div>
|
|
291
296
|
<h1 class="ForewordTitle">Foreword</h1>
|
|
292
297
|
<div id="samplecode" class="example">
|
|
293
|
-
<p><span class="example_label">EXAMPLE 1</span><span style="mso-tab-count:1">  </span
|
|
298
|
+
<p><span class="example_label">EXAMPLE 1</span><span style="mso-tab-count:1">  </span></p>
|
|
299
|
+
<div class="Quote">Hello<p class="QuoteAttribution"/></div>
|
|
294
300
|
</div>
|
|
295
301
|
<div id="samplecode2" class="example">
|
|
296
|
-
<p><span class="example_label">EXAMPLE 2</span><span style="mso-tab-count:1">  </span>Hello</p>
|
|
302
|
+
<p><span class="example_label">EXAMPLE 2 — Title</span><span style="mso-tab-count:1">  </span>Hello</p>
|
|
297
303
|
</div>
|
|
298
304
|
</div>
|
|
299
305
|
<p> </p>
|
|
@@ -23,7 +23,7 @@ RSpec.describe IsoDoc do
|
|
|
23
23
|
INPUT
|
|
24
24
|
expect(File.exist?("test.html")).to be true
|
|
25
25
|
html = File.read("test.html", encoding: "UTF-8")
|
|
26
|
-
expect(html).to match(%r{<title>Cereals and pulses
|
|
26
|
+
expect(html).to match(%r{<title>Cereals and pulses\ \— Specifications and test methods\ \— Rice</title>})
|
|
27
27
|
expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
|
|
28
28
|
expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
|
|
29
29
|
end
|
|
@@ -49,7 +49,7 @@ RSpec.describe IsoDoc do
|
|
|
49
49
|
INPUT
|
|
50
50
|
expect(File.exist?("test.html")).to be true
|
|
51
51
|
html = File.read("test.html", encoding: "UTF-8")
|
|
52
|
-
expect(html).to match(%r{<title>Cereals and pulses
|
|
52
|
+
expect(html).to match(%r{<title>Cereals and pulses\ \— Specifications and test methods\ \— Rice</title>})
|
|
53
53
|
expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
|
|
54
54
|
expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
|
|
55
55
|
end
|
|
@@ -158,7 +158,7 @@ RSpec.describe IsoDoc do
|
|
|
158
158
|
<div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1<span style="mso-tab-count:1">  </span>Terms and definitions</h1>
|
|
159
159
|
<p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1</p><p class="Terms" style="text-align:left;">paddy</p>
|
|
160
160
|
<p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
|
|
161
|
-
<p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified
|
|
161
|
+
<p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
|
|
162
162
|
</div>
|
|
163
163
|
<br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
|
|
164
164
|
<div class="colophon"></div>
|
data/spec/isodoc/section_spec.rb
CHANGED
|
@@ -58,6 +58,7 @@ RSpec.describe IsoDoc do
|
|
|
58
58
|
<appendix id="Q2" inline-header="false" obligation="normative">
|
|
59
59
|
<title>An Appendix</title>
|
|
60
60
|
</appendix>
|
|
61
|
+
<references id="Q3"><title>Annex Bibliography</title></references>
|
|
61
62
|
</annex><bibliography><references id="R" obligation="informative">
|
|
62
63
|
<title>Normative References</title>
|
|
63
64
|
</references><clause id="S" obligation="informative">
|
|
@@ -129,6 +130,9 @@ RSpec.describe IsoDoc do
|
|
|
129
130
|
</div>
|
|
130
131
|
<div id="Q2">
|
|
131
132
|
<h2>Appendix 1 An Appendix</h2>
|
|
133
|
+
</div>
|
|
134
|
+
<div>
|
|
135
|
+
<h2>A.2 Annex Bibliography</h2>
|
|
132
136
|
</div>
|
|
133
137
|
|
|
134
138
|
</div>
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-iso
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.3.
|
|
4
|
+
version: 1.3.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-10-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: asciidoctor
|
|
@@ -247,20 +247,21 @@ extensions: []
|
|
|
247
247
|
extra_rdoc_files: []
|
|
248
248
|
files:
|
|
249
249
|
- ".gitattributes"
|
|
250
|
+
- ".github/workflows/macos.yml"
|
|
251
|
+
- ".github/workflows/ubuntu.yml"
|
|
252
|
+
- ".github/workflows/windows.yml"
|
|
250
253
|
- ".gitignore"
|
|
251
254
|
- ".hound.yml"
|
|
252
255
|
- ".oss-guides.rubocop.yml"
|
|
253
256
|
- ".rubocop.ribose.yml"
|
|
254
257
|
- ".rubocop.tb.yml"
|
|
255
258
|
- ".rubocop.yml"
|
|
256
|
-
- ".travis.yml"
|
|
257
259
|
- CODE_OF_CONDUCT.md
|
|
258
260
|
- Gemfile
|
|
259
261
|
- LICENSE
|
|
260
262
|
- Makefile
|
|
261
263
|
- README.adoc
|
|
262
264
|
- Rakefile
|
|
263
|
-
- appveyor.yml
|
|
264
265
|
- asciidoctor-iso.gemspec.old
|
|
265
266
|
- bin/rspec
|
|
266
267
|
- docs/asciiiso-syntax.adoc
|
data/.travis.yml
DELETED
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
# Auto-generated !!! Do not edit it manually
|
|
2
|
-
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
|
-
language: ruby
|
|
4
|
-
cache: bundler
|
|
5
|
-
os:
|
|
6
|
-
- linux
|
|
7
|
-
- osx
|
|
8
|
-
rvm:
|
|
9
|
-
- 2.6
|
|
10
|
-
- 2.5
|
|
11
|
-
- 2.4
|
|
12
|
-
- ruby-head
|
|
13
|
-
before_install:
|
|
14
|
-
- nvm install 8
|
|
15
|
-
- npm install -g puppeteer
|
|
16
|
-
- npm install
|
|
17
|
-
- gem install bundler -v "~> 2"
|
|
18
|
-
- bundle update
|
|
19
|
-
- curl -L https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/travis.sh | bash
|
|
20
|
-
matrix:
|
|
21
|
-
allow_failures:
|
|
22
|
-
- rvm: ruby-head
|
|
23
|
-
|
data/appveyor.yml
DELETED
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
# Auto-generated !!! Do not edit it manually
|
|
2
|
-
# use ci-master https://github.com/metanorma/metanorma-build-scripts
|
|
3
|
-
version: '{build}'
|
|
4
|
-
|
|
5
|
-
cache:
|
|
6
|
-
- vendor/bundle
|
|
7
|
-
|
|
8
|
-
environment:
|
|
9
|
-
matrix:
|
|
10
|
-
- RUBY_VERSION: 26
|
|
11
|
-
- RUBY_VERSION: 25
|
|
12
|
-
- RUBY_VERSION: 24
|
|
13
|
-
- RUBY_VERSION: _trunk
|
|
14
|
-
|
|
15
|
-
matrix:
|
|
16
|
-
allow_failures:
|
|
17
|
-
- RUBY_VERSION: _trunk
|
|
18
|
-
|
|
19
|
-
install:
|
|
20
|
-
- ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
|
|
21
|
-
- refreshenv
|
|
22
|
-
|
|
23
|
-
build_script:
|
|
24
|
-
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
|
|
25
|
-
- set GIT_TERMINAL_PROMPT=0
|
|
26
|
-
- gem install bundler -v "~> 2"
|
|
27
|
-
- bundle config --local path vendor/bundle
|
|
28
|
-
- bundle update
|
|
29
|
-
- bundle install
|
|
30
|
-
|
|
31
|
-
before_test:
|
|
32
|
-
- ruby -v
|
|
33
|
-
- gem -v
|
|
34
|
-
- bundle -v
|
|
35
|
-
|
|
36
|
-
test_script:
|
|
37
|
-
- bundle exec rake
|