isodoc 0.8.5 → 0.8.6

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 (12) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/lib/isodoc/function/blocks.rb +1 -1
  4. data/lib/isodoc/function/references.rb +1 -1
  5. data/lib/isodoc/function/section.rb +15 -20
  6. data/lib/isodoc/function/xref_gen.rb +3 -3
  7. data/lib/isodoc/function/xref_sect_gen.rb +14 -8
  8. data/lib/isodoc/metadata.rb +1 -1
  9. data/lib/isodoc/version.rb +1 -1
  10. data/spec/isodoc/section_spec.rb +58 -2
  11. data/spec/isodoc/xref_spec.rb +287 -83
  12. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dede2446b862431d30638a1f7f05f1048d70b153a343bd5e0ebc021a35f34f83
4
- data.tar.gz: bef3d35e5e3e09a384768c961e4360dab94ec5760a090876ee8754b924c8a3a7
3
+ metadata.gz: a4f2f216823cbdfeb106c0128976a8b169cb948d10f15c2155e9c33c80add4b4
4
+ data.tar.gz: 2cfe4c21e05f213c3608c98eefd19646737b2147ace16e401a80bf574e681cb2
5
5
  SHA512:
6
- metadata.gz: ed5cc8a8cd5fe504f7c6696e905e650840017b358d0d99d90546bed01397cfe7217d19c6a1e852368dc846044fc0a3467229abdd3285ffeedf966d624c162b44
7
- data.tar.gz: 1523ac224ab7527eefe744e352aff22c746fbbc52689b451590a38b62c41c317afb6b4594c2f4ea7e8f9b4ea914144dedd4394cd68a50dbf16f6d607cd889e12
6
+ metadata.gz: 655d05528bc7ad95d7713405fcf3bf7f78d0487b7064b0bd4ae20a1bc700b92b7af7fd320cbff2a806f8618140ffd27b822e7350d163764dcbe441c1a50ebebe
7
+ data.tar.gz: fb82d19c1a01a6c10d7c626bef3dd9dd2e722d3e58d5dc87beb227081e75b36eeb50f8c811e08ca1aefb79616f09a7a46f51658f4b1bc1f5138599a39ba19e0e
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- isodoc (0.8.5)
4
+ isodoc (0.8.6)
5
5
  asciimath
6
6
  html2doc (~> 0.8.1)
7
7
  htmlentities (~> 4.3.4)
data/lib/isodoc/function/blocks.rb CHANGED
@@ -4,7 +4,7 @@ module IsoDoc::Function
4
4
 
5
5
  def note_label(node)
6
6
  n = get_anchors[node["id"]]
7
- return @note_lbl if n.nil? || n[:label].empty?
7
+ return @note_lbl if n.nil? || n[:label].nil? || n[:label].empty?
8
8
  l10n("#{@note_lbl} #{n[:label]}")
9
9
  end
10
10
 
data/lib/isodoc/function/references.rb CHANGED
@@ -132,7 +132,7 @@ module IsoDoc::Function
132
132
  f = isoxml.at(ns(q)) or return num
133
133
  out.div do |div|
134
134
  num = num + 1
135
- clause_name("#{num}.", @normref_lbl, div, nil)
135
+ clause_name(num, @normref_lbl, div, nil)
136
136
  norm_ref_preface(f, div)
137
137
  biblio_list(f, div, false)
138
138
  end
data/lib/isodoc/function/section.rb CHANGED
@@ -1,12 +1,13 @@
1
1
  module IsoDoc::Function
2
2
  module Section
3
3
  def inline_header_title(out, node, c1)
4
+ title = c1&.content || ""
4
5
  out.span **{ class: "zzMoveToFollowing" } do |s|
5
6
  s.b do |b|
6
7
  if get_anchors[node['id']][:label]
7
- b << "#{get_anchors[node['id']][:label]}. #{c1.content} "
8
+ b << "#{get_anchors[node['id']][:label]}. #{title} "
8
9
  else
9
- b << "#{c1.content} "
10
+ b << "#{title} "
10
11
  end
11
12
  end
12
13
  end
@@ -19,19 +20,16 @@ module IsoDoc::Function
19
20
  div.send "h#{get_anchors[node['id']][:level]}" do |h|
20
21
  lbl = get_anchors[node['id']][:label]
21
22
  h << "#{lbl}. " if lbl
22
- c1.children.each { |c2| parse(c2, h) }
23
+ c1&.children&.each { |c2| parse(c2, h) }
23
24
  end
24
25
  end
25
26
  end
26
27
 
27
28
  def clause_parse(node, out)
28
29
  out.div **attr_code(id: node["id"]) do |div|
29
- node.children.each do |c1|
30
- if c1.name == "title"
31
- clause_parse_title(node, div, c1, out)
32
- else
33
- parse(c1, div)
34
- end
30
+ clause_parse_title(node, div, node.at(ns("./title")), out)
31
+ node.children.reject { |c1| c1.name == "title" }.each do |c1|
32
+ parse(c1, div)
35
33
  end
36
34
  end
37
35
  end
@@ -40,7 +38,7 @@ module IsoDoc::Function
40
38
  header_class = {} if header_class.nil?
41
39
  div.h1 **attr_code(header_class) do |h1|
42
40
  if num
43
- h1 << num
41
+ h1 << "#{num}."
44
42
  insert_tab(h1, 1)
45
43
  end
46
44
  h1 << title
@@ -55,13 +53,10 @@ module IsoDoc::Function
55
53
  def clause(isoxml, out)
56
54
  isoxml.xpath(ns(MIDDLE_CLAUSE)).each do |c|
57
55
  out.div **attr_code(id: c["id"]) do |s|
58
- c.elements.each do |c1|
59
- if c1.name == "title"
60
- clause_name("#{get_anchors[c['id']][:label]}.",
61
- c1.content, s, nil)
62
- else
63
- parse(c1, s)
64
- end
56
+ clause_name(get_anchors[c['id']][:label],
57
+ c&.at(ns("./title"))&.content, s, nil)
58
+ c.elements.reject { |c1| c1.name == "title" }.each do |c1|
59
+ parse(c1, s)
65
60
  end
66
61
  end
67
62
  end
@@ -92,7 +87,7 @@ module IsoDoc::Function
92
87
  f = isoxml.at(ns("//clause[title = 'Scope']")) or return num
93
88
  out.div **attr_code(id: f["id"]) do |div|
94
89
  num = num + 1
95
- clause_name("#{num}.", @scope_lbl, div, nil)
90
+ clause_name(num, @scope_lbl, div, nil)
96
91
  f.elements.each do |e|
97
92
  parse(e, div) unless e.name == "title"
98
93
  end
@@ -141,7 +136,7 @@ module IsoDoc::Function
141
136
  f = isoxml.at(ns(TERM_CLAUSE)) or return num
142
137
  out.div **attr_code(id: f["id"]) do |div|
143
138
  num = num + 1
144
- clause_name("#{num}.", terms_defs_title(f), div, nil)
139
+ clause_name(num, terms_defs_title(f), div, nil)
145
140
  term_defs_boilerplate(div, isoxml.xpath(ns(".//termdocsource")),
146
141
  f.at(ns(".//term")), f.at(ns("./p")))
147
142
  f.elements.each do |e|
@@ -160,7 +155,7 @@ module IsoDoc::Function
160
155
  f = isoxml.at(ns("//sections/definitions")) or return num
161
156
  out.div **attr_code(id: f["id"], class: "Symbols") do |div|
162
157
  num = num + 1
163
- clause_name("#{num}.", @symbols_lbl, div, nil)
158
+ clause_name(num, @symbols_lbl, div, nil)
164
159
  f.elements.each do |e|
165
160
  parse(e, div) unless e.name == "title"
166
161
  end
data/lib/isodoc/function/xref_gen.rb CHANGED
@@ -53,7 +53,7 @@ module IsoDoc::Function
53
53
  next if @anchors[n["id"]]
54
54
  next if n["id"].nil? || n["id"].empty?
55
55
  idx = notes.size == 1 ? "" : " #{i + 1}"
56
- @anchors[n["id"]] = anchor_struct(idx, s, @note_xref_lbl)
56
+ @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl)
57
57
  end
58
58
  note_anchor_names(s.xpath(ns("./clause | ./appendix")))
59
59
  end
@@ -70,7 +70,7 @@ module IsoDoc::Function
70
70
  next if @anchors[n["id"]]
71
71
  next if n["id"].nil? || n["id"].empty?
72
72
  idx = notes.size == 1 ? "" : " #{i + 1}"
73
- @anchors[n["id"]] = anchor_struct(idx, s, @example_xref_lbl)
73
+ @anchors[n["id"]] = anchor_struct(idx, n, @example_xref_lbl)
74
74
  end
75
75
  example_anchor_names(s.xpath(ns("./clause | ./appendix")))
76
76
  end
@@ -83,7 +83,7 @@ module IsoDoc::Function
83
83
  notes.each_with_index do |n, i|
84
84
  next if n["id"].nil? || n["id"].empty?
85
85
  idx = notes.size == 1 ? "" : " #{i + 1}"
86
- @anchors[n["id"]] = anchor_struct(idx, s, @list_lbl)
86
+ @anchors[n["id"]] = anchor_struct(idx, n, @list_lbl)
87
87
  list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
88
88
  end
89
89
  list_anchor_names(s.xpath(ns("./clause | ./appendix")))
data/lib/isodoc/function/xref_sect_gen.rb CHANGED
@@ -12,8 +12,8 @@ module IsoDoc::Function
12
12
  def initial_anchor_names(d)
13
13
  preface_names(d.at(ns("//foreword")))
14
14
  preface_names(d.at(ns("//introduction")))
15
- n = 0
16
- n = section_names(d.at(ns("//clause[title = 'Scope']")), n, 1)
15
+ sequential_asset_names(d.xpath(ns("//foreword | //introduction")))
16
+ n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
17
17
  n = section_names(d.at(ns(
18
18
  "//references[title = 'Normative References' or title = 'Normative references']")), n, 1)
19
19
  n = section_names(d.at(ns("//sections/terms | "\
@@ -25,11 +25,18 @@ module IsoDoc::Function
25
25
  termexample_anchor_names(d)
26
26
  end
27
27
 
28
+ def preface_clause_name(c)
29
+ ret = c.at(ns("./title"))&.text || c.name.capitalize
30
+ ret
31
+ end
32
+
28
33
  # in StanDoc, prefaces have no numbering; they are referenced only by title
29
34
  def preface_names(clause)
30
35
  return if clause.nil?
36
+ @anchors[clause["id"]] =
37
+ { label: nil, level: 1, xref: preface_clause_name(clause) }
31
38
  clause.xpath(ns("./clause")).each_with_index do |c, i|
32
- preface_names1(c, c.at(ns("./title"))&.text, "#{clause.at(ns('./title'))&.text}, #{i+1}", 2)
39
+ preface_names1(c, c.at(ns("./title"))&.text, "#{preface_clause_name(clause)}, #{i+1}", 2)
33
40
  end
34
41
  end
35
42
 
@@ -37,7 +44,6 @@ module IsoDoc::Function
37
44
  label = title || parent_title
38
45
  @anchors[clause["id"]] =
39
46
  { label: nil, level: level, xref: label }
40
- # subclauses are not prefixed with "Clause"
41
47
  clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
42
48
  each_with_index do |c, i|
43
49
  preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i+1}", level + 1)
@@ -75,8 +81,7 @@ module IsoDoc::Function
75
81
 
76
82
  def section_names1(clause, num, level)
77
83
  @anchors[clause["id"]] =
78
- { label: num, level: level, xref: num }
79
- # subclauses are not prefixed with "Clause"
84
+ { label: num, level: level, xref: l10n("#{@clause_lbl} #{num}") }
80
85
  clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
81
86
  each_with_index do |c, i|
82
87
  section_names1(c, "#{num}.#{i + 1}", level + 1)
@@ -100,8 +105,9 @@ module IsoDoc::Function
100
105
  end
101
106
 
102
107
  def annex_names1(clause, num, level)
103
- @anchors[clause["id"]] = { label: num, xref: num, level: level }
104
- clause.xpath(ns(".//clause")).each_with_index do |c, i|
108
+ @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
109
+ level: level }
110
+ clause.xpath(ns("./clause")).each_with_index do |c, i|
105
111
  annex_names1(c, "#{num}.#{i + 1}", level + 1)
106
112
  end
107
113
  end
data/lib/isodoc/metadata.rb CHANGED
@@ -85,7 +85,7 @@ module IsoDoc
85
85
  def doctype(isoxml, _out)
86
86
  b = isoxml.at(ns("//bibdata")) || return
87
87
  return unless b["type"]
88
- t = b["type"].split(/-/).map{ |w| w.capitalize }.join(" ")
88
+ t = b["type"].split(/[- ]/).map{ |w| w.capitalize }.join(" ")
89
89
  set(:doctype, t)
90
90
  ics = []
91
91
  isoxml.xpath(ns("//bibdata/ics/code")).each { |i| ics << i.text }
data/lib/isodoc/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module IsoDoc
2
- VERSION = "0.8.5".freeze
2
+ VERSION = "0.8.6".freeze
3
3
  end
data/spec/isodoc/section_spec.rb CHANGED
@@ -42,7 +42,10 @@ RSpec.describe IsoDoc do
42
42
  </clause>
43
43
  <clause id="O" inline-header="false" obligation="normative">
44
44
  <title>Clause 4.2</title>
45
- </clause></clause>
45
+ </clause>
46
+ <clause id="O1" inline-header="false" obligation="normative">
47
+ </clause>
48
+ </clause>
46
49
 
47
50
  </sections><annex id="P" inline-header="false" obligation="normative">
48
51
  <title>Annex</title>
@@ -120,6 +123,9 @@ RSpec.describe IsoDoc do
120
123
  </div>
121
124
  <div id="O">
122
125
  <h2>5.2. Clause 4.2</h2>
126
+ </div>
127
+ <div id="O1">
128
+ <h2>5.3. </h2>
123
129
  </div>
124
130
  </div>
125
131
  <br/>
@@ -187,7 +193,10 @@ OUTPUT
187
193
  </clause>
188
194
  <clause id="O" inline-header="false" obligation="normative">
189
195
  <title>Clause 4.2</title>
190
- </clause></clause>
196
+ </clause>
197
+ <clause id="O1" inline-header="false" obligation="normative">
198
+ </clause>
199
+ </clause>
191
200
 
192
201
  </sections><annex id="P" inline-header="false" obligation="normative">
193
202
  <title>Annex</title>
@@ -280,6 +289,9 @@ OUTPUT
280
289
  </div>
281
290
  <div id="O">
282
291
  <h2>5.2. Clause 4.2</h2>
292
+ </div>
293
+ <div id="O1">
294
+ <h2>5.3. </h2>
283
295
  </div>
284
296
  </div>
285
297
  <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
@@ -502,4 +514,48 @@ OUTPUT
502
514
  OUTPUT
503
515
  end
504
516
 
517
+ it "processes sections without titles" do
518
+ expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
519
+ <iso-standard xmlns="http://riboseinc.com/isoxml">
520
+ <preface>
521
+ <introduction id="M" inline-header="false" obligation="normative"><clause id="N" inline-header="false" obligation="normative">
522
+ <title>Intro</title>
523
+ </clause>
524
+ <clause id="O" inline-header="true" obligation="normative">
525
+ </clause></clause>
526
+ </preface>
527
+ <sections>
528
+ <clause id="M1" inline-header="false" obligation="normative"><clause id="N1" inline-header="false" obligation="normative">
529
+ </clause>
530
+ <clause id="O1" inline-header="true" obligation="normative">
531
+ </clause></clause>
532
+ </sections>
533
+
534
+ </iso-standard>
535
+ INPUT
536
+ #{HTML_HDR}
537
+ <br/>
538
+ <div class="Section3" id="M">
539
+ <h1 class="IntroTitle">Introduction</h1>
540
+ <div id="N"><h2>Intro</h2>
541
+
542
+ </div>
543
+ <div id="O"><span class="zzMoveToFollowing"><b> </b></span>
544
+ </div>
545
+ </div>
546
+ <p class="zzSTDTitle1"/>
547
+ <div id="M1">
548
+ <h1>1.&#160; </h1>
549
+ <div id="N1"><h2>1.1. </h2>
550
+ </div>
551
+ <div id="O1"><span class="zzMoveToFollowing"><b>1.2. </b></span>
552
+ </div>
553
+ </div>
554
+ </div>
555
+ </body>
556
+ </html>
557
+ OUTPUT
558
+ end
559
+
560
+
505
561
  end
data/spec/isodoc/xref_spec.rb CHANGED
@@ -7,6 +7,8 @@ RSpec.describe IsoDoc do
7
7
  <preface>
8
8
  <foreword>
9
9
  <p>
10
+ <xref target="N1"/>
11
+ <xref target="N2"/>
10
12
  <xref target="N"/>
11
13
  <xref target="note1"/>
12
14
  <xref target="note2"/>
@@ -15,6 +17,16 @@ RSpec.describe IsoDoc do
15
17
  <xref target="Anote2"/>
16
18
  </p>
17
19
  </foreword>
20
+ <introduction id="intro">
21
+ <note id="N1">
22
+ <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83e">These results are based on a study carried out on three different types of kernel.</p>
23
+ </note>
24
+ <clause id="xyz"><title>Preparatory</title>
25
+ <note id="N2">
26
+ <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83d">These results are based on a study carried out on three different types of kernel.</p>
27
+ </note>
28
+ </clause>
29
+ </introduction>
18
30
  </preface>
19
31
  <sections>
20
32
  <clause id="scope"><title>Scope</title>
@@ -60,14 +72,26 @@ RSpec.describe IsoDoc do
60
72
  <div>
61
73
  <h1 class="ForewordTitle">Foreword</h1>
62
74
  <p>
75
+ <a href="#N1">Introduction, Note</a>
76
+ <a href="#N2">Preparatory, Note</a>
63
77
  <a href="#N">Clause 1, Note</a>
64
- <a href="#note1">3.1, Note 1</a>
65
- <a href="#note2">3.1, Note 2</a>
66
- <a href="#AN">A.1, Note</a>
67
- <a href="#Anote1">A.2, Note 1</a>
68
- <a href="#Anote2">A.2, Note 2</a>
78
+ <a href="#note1">Clause 3.1, Note 1</a>
79
+ <a href="#note2">Clause 3.1, Note 2</a>
80
+ <a href="#AN">Annex A.1, Note</a>
81
+ <a href="#Anote1">Annex A.2, Note 1</a>
82
+ <a href="#Anote2">Annex A.2, Note 2</a>
69
83
  </p>
70
84
  </div>
85
+ <br/>
86
+ <div class="Section3" id="intro">
87
+ <h1 class="IntroTitle">Introduction</h1>
88
+ <div id="N1" class="Note">
89
+ <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
90
+ </div>
91
+ <div id="xyz"><h2>Preparatory</h2>
92
+ <div id="N2" class="Note"><p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
93
+ </div>
94
+ </div>
71
95
  <p class="zzSTDTitle1"/>
72
96
  <div id="scope">
73
97
  <h1>1.&#160; Scope</h1>
@@ -91,7 +115,7 @@ RSpec.describe IsoDoc do
91
115
  </div>
92
116
  <div id="widgets">
93
117
  <h1>3.&#160; Widgets</h1>
94
- <div id="widgets1">
118
+ <div id="widgets1"><h2>3.1. </h2>
95
119
  <div id="note1" class="Note"><p><span class="note_label">NOTE 1</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
96
120
  <div id="note2" class="Note"><p><span class="note_label">NOTE 2</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
97
121
  <p> <a href="#note1">Note 1</a> <a href="#note2">Note 2</a> </p>
@@ -100,10 +124,10 @@ RSpec.describe IsoDoc do
100
124
  </div>
101
125
  <br/>
102
126
  <div id="annex1" class="Section3">
103
- <div id="annex1a">
127
+ <div id="annex1a"><h2>A.1. </h2>
104
128
  <div id="AN" class="Note"><p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
105
129
  </div>
106
- <div id="annex1b">
130
+ <div id="annex1b"><h2>A.2. </h2>
107
131
  <div id="Anote1" class="Note"><p><span class="note_label">NOTE 1</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
108
132
  <div id="Anote2" class="Note"><p><span class="note_label">NOTE 2</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
109
133
  </div>
@@ -120,6 +144,8 @@ RSpec.describe IsoDoc do
120
144
  <preface>
121
145
  <foreword id="fwd">
122
146
  <p>
147
+ <xref target="N1"/>
148
+ <xref target="N2"/>
123
149
  <xref target="N"/>
124
150
  <xref target="note1"/>
125
151
  <xref target="note2"/>
@@ -128,6 +154,18 @@ RSpec.describe IsoDoc do
128
154
  <xref target="Anote2"/>
129
155
  </p>
130
156
  </foreword>
157
+ <introduction id="intro">
158
+ <figure id="N1">
159
+ <name>Split-it-right sample divider</name>
160
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
161
+ </figure>
162
+ <clause id="xyz"><title>Preparatory</title>
163
+ <figure id="N2">
164
+ <name>Split-it-right sample divider</name>
165
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
166
+ </figure>
167
+ </clause>
168
+ </introduction>
131
169
  </preface>
132
170
  <sections>
133
171
  <clause id="scope"><title>Scope</title>
@@ -177,23 +215,39 @@ RSpec.describe IsoDoc do
177
215
  <div id="fwd">
178
216
  <h1 class="ForewordTitle">Foreword</h1>
179
217
  <p>
180
- <a href="#N">Figure 1</a>
181
- <a href="#note1">Figure 2</a>
182
- <a href="#note2">Figure 3</a>
218
+ <a href="#N1">Figure 1</a>
219
+ <a href="#N2">Figure 2</a>
220
+ <a href="#N">Figure 3</a>
221
+ <a href="#note1">Figure 4</a>
222
+ <a href="#note2">Figure 5</a>
183
223
  <a href="#AN">Figure A.1</a>
184
224
  <a href="#Anote1">Figure A.2</a>
185
225
  <a href="#Anote2">Figure A.3</a>
186
226
  </p>
187
227
  </div>
228
+ <br/>
229
+ <div class="Section3" id="intro">
230
+ <h1 class="IntroTitle">Introduction</h1>
231
+ <div id="N1" class="figure">
232
+
233
+ <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
234
+ <p class="FigureTitle" align="center">Figure 1&#160;&#8212; Split-it-right sample divider</p></div>
235
+ <div id="xyz"><h2>Preparatory</h2>
236
+ <div id="N2" class="figure">
237
+
238
+ <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
239
+ <p class="FigureTitle" align="center">Figure 2&#160;&#8212; Split-it-right sample divider</p></div>
240
+ </div>
241
+ </div>
188
242
  <p class="zzSTDTitle1"/>
189
243
  <div id="scope">
190
244
  <h1>1.&#160; Scope</h1>
191
245
  <div id="N" class="figure">
192
246
 
193
247
  <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
194
- <p class="FigureTitle" align="center">Figure 1&#160;&#8212; Split-it-right sample divider</p></div>
248
+ <p class="FigureTitle" align="center">Figure 3&#160;&#8212; Split-it-right sample divider</p></div>
195
249
  <p>
196
- <a href="#N">Figure 1</a>
250
+ <a href="#N">Figure 3</a>
197
251
  </p>
198
252
  </div>
199
253
  <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -209,27 +263,27 @@ RSpec.describe IsoDoc do
209
263
  </div>
210
264
  <div id="widgets">
211
265
  <h1>3.&#160; Widgets</h1>
212
- <div id="widgets1">
266
+ <div id="widgets1"><h2>3.1. </h2>
213
267
  <div id="note1" class="figure">
214
268
 
215
269
  <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
216
- <p class="FigureTitle" align="center">Figure 2&#160;&#8212; Split-it-right sample divider</p></div>
270
+ <p class="FigureTitle" align="center">Figure 4&#160;&#8212; Split-it-right sample divider</p></div>
217
271
  <div id="note2" class="figure">
218
272
 
219
273
  <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
220
- <p class="FigureTitle" align="center">Figure 3&#160;&#8212; Split-it-right sample divider</p></div>
221
- <p> <a href="#note1">Figure 2</a> <a href="#note2">Figure 3</a> </p>
274
+ <p class="FigureTitle" align="center">Figure 5&#160;&#8212; Split-it-right sample divider</p></div>
275
+ <p> <a href="#note1">Figure 4</a> <a href="#note2">Figure 5</a> </p>
222
276
  </div>
223
277
  </div>
224
278
  <br/>
225
279
  <div id="annex1" class="Section3">
226
- <div id="annex1a">
280
+ <div id="annex1a"><h2>A.1. </h2>
227
281
  <div id="AN" class="figure">
228
282
 
229
283
  <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
230
284
  <p class="FigureTitle" align="center">Figure A.1&#160;&#8212; Split-it-right sample divider</p></div>
231
285
  </div>
232
- <div id="annex1b">
286
+ <div id="annex1b"><h2>A.2. </h2>
233
287
  <div id="Anote1" class="figure">
234
288
 
235
289
  <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
@@ -329,7 +383,7 @@ RSpec.describe IsoDoc do
329
383
  </div>
330
384
  <div id="widgets">
331
385
  <h1>3.&#160; Widgets</h1>
332
- <div id="widgets1">
386
+ <div id="widgets1"><h2>3.1. </h2>
333
387
  <div id="N" class="figure">
334
388
  <div id="note1" class="figure">
335
389
 
@@ -345,9 +399,9 @@ RSpec.describe IsoDoc do
345
399
  </div>
346
400
  <br/>
347
401
  <div id="annex1" class="Section3">
348
- <div id="annex1a">
402
+ <div id="annex1a"><h2>A.1. </h2>
349
403
  </div>
350
- <div id="annex1b">
404
+ <div id="annex1b"><h2>A.2. </h2>
351
405
  <div id="AN" class="figure">
352
406
  <div id="Anote1" class="figure">
353
407
 
@@ -372,6 +426,8 @@ RSpec.describe IsoDoc do
372
426
  <preface>
373
427
  <foreword>
374
428
  <p>
429
+ <xref target="N1"/>
430
+ <xref target="N2"/>
375
431
  <xref target="N"/>
376
432
  <xref target="note1"/>
377
433
  <xref target="note2"/>
@@ -380,6 +436,16 @@ RSpec.describe IsoDoc do
380
436
  <xref target="Anote2"/>
381
437
  </p>
382
438
  </foreword>
439
+ <introduction id="intro">
440
+ <example id="N1">
441
+ <p>Hello</p>
442
+ </example>
443
+ <clause id="xyz"><title>Preparatory</title>
444
+ <example id="N2">
445
+ <p>Hello</p>
446
+ </example>
447
+ </clause>
448
+ </introduction>
383
449
  </preface>
384
450
  <sections>
385
451
  <clause id="scope"><title>Scope</title>
@@ -423,14 +489,33 @@ RSpec.describe IsoDoc do
423
489
  <div>
424
490
  <h1 class="ForewordTitle">Foreword</h1>
425
491
  <p>
492
+ <a href="#N1">Introduction, Example</a>
493
+ <a href="#N2">Preparatory, Example</a>
426
494
  <a href="#N">Clause 1, Example</a>
427
- <a href="#note1">3.1, Example 1</a>
428
- <a href="#note2">3.1, Example 2</a>
429
- <a href="#AN">A.1, Example</a>
430
- <a href="#Anote1">A.2, Example 1</a>
431
- <a href="#Anote2">A.2, Example 2</a>
495
+ <a href="#note1">Clause 3.1, Example 1</a>
496
+ <a href="#note2">Clause 3.1, Example 2</a>
497
+ <a href="#AN">Annex A.1, Example</a>
498
+ <a href="#Anote1">Annex A.2, Example 1</a>
499
+ <a href="#Anote2">Annex A.2, Example 2</a>
432
500
  </p>
433
501
  </div>
502
+ <br/>
503
+ <div class="Section3" id="intro">
504
+ <h1 class="IntroTitle">Introduction</h1>
505
+ <table id="N1" class="example">
506
+ <tr>
507
+ <td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE</td>
508
+ <td valign="top" class="example">
509
+ <p>Hello</p>
510
+ </td>
511
+ </tr>
512
+ </table>
513
+ <div id="xyz"><h2>Preparatory</h2>
514
+ <table id="N2" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE</td><td valign="top" class="example">
515
+ <p>Hello</p>
516
+ </td></tr></table>
517
+ </div>
518
+ </div>
434
519
  <p class="zzSTDTitle1"/>
435
520
  <div id="scope">
436
521
  <h1>1.&#160; Scope</h1>
@@ -459,7 +544,7 @@ RSpec.describe IsoDoc do
459
544
  </div>
460
545
  <div id="widgets">
461
546
  <h1>3.&#160; Widgets</h1>
462
- <div id="widgets1">
547
+ <div id="widgets1"><h2>3.1. </h2>
463
548
  <table id="note1" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE 1</td><td valign="top" class="example">
464
549
  <p>Hello</p>
465
550
  </td></tr></table>
@@ -471,12 +556,12 @@ RSpec.describe IsoDoc do
471
556
  </div>
472
557
  <br/>
473
558
  <div id="annex1" class="Section3">
474
- <div id="annex1a">
559
+ <div id="annex1a"><h2>A.1. </h2>
475
560
  <table id="AN" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE</td><td valign="top" class="example">
476
561
  <p>Hello</p>
477
562
  </td></tr></table>
478
563
  </div>
479
- <div id="annex1b">
564
+ <div id="annex1b"><h2>A.2. </h2>
480
565
  <table id="Anote1" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE 1</td><td valign="top" class="example">
481
566
  <p>Hello</p>
482
567
  </td></tr></table>
@@ -497,6 +582,8 @@ RSpec.describe IsoDoc do
497
582
  <preface>
498
583
  <foreword>
499
584
  <p>
585
+ <xref target="N1"/>
586
+ <xref target="N2"/>
500
587
  <xref target="N"/>
501
588
  <xref target="note1"/>
502
589
  <xref target="note2"/>
@@ -505,6 +592,16 @@ RSpec.describe IsoDoc do
505
592
  <xref target="Anote2"/>
506
593
  </p>
507
594
  </foreword>
595
+ <introduction id="intro">
596
+ <formula id="N1">
597
+ <stem type="AsciiMath">r = 1 %</stem>
598
+ </formula>
599
+ <clause id="xyz"><title>Preparatory</title>
600
+ <formula id="N2">
601
+ <stem type="AsciiMath">r = 1 %</stem>
602
+ </formula>
603
+ </clause>
604
+ </introduction>
508
605
  </preface>
509
606
  <sections>
510
607
  <clause id="scope"><title>Scope</title>
@@ -562,20 +659,30 @@ RSpec.describe IsoDoc do
562
659
  <div>
563
660
  <h1 class="ForewordTitle">Foreword</h1>
564
661
  <p>
565
- <a href="#N">Clause 1, Formula (1)</a>
566
- <a href="#note1">3.1, Formula (2)</a>
567
- <a href="#note2">3.1, Formula (3)</a>
568
- <a href="#AN">A.1, Formula (A.1)</a>
569
- <a href="#Anote1">A.2, Formula (A.2)</a>
570
- <a href="#Anote2">A.2, Formula (A.3)</a>
662
+ <a href="#N1">Introduction, Formula (1)</a>
663
+ <a href="#N2">Preparatory, Formula (2)</a>
664
+ <a href="#N">Clause 1, Formula (3)</a>
665
+ <a href="#note1">Clause 3.1, Formula (4)</a>
666
+ <a href="#note2">Clause 3.1, Formula (5)</a>
667
+ <a href="#AN">Annex A.1, Formula (A.1)</a>
668
+ <a href="#Anote1">Annex A.2, Formula (A.2)</a>
669
+ <a href="#Anote2">Annex A.2, Formula (A.3)</a>
571
670
  </p>
572
671
  </div>
672
+ <br/>
673
+ <div class="Section3" id="intro">
674
+ <h1 class="IntroTitle">Introduction</h1>
675
+ <div id="N1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div>
676
+ <div id="xyz"><h2>Preparatory</h2>
677
+ <div id="N2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</div>
678
+ </div>
679
+ </div>
573
680
  <p class="zzSTDTitle1"/>
574
681
  <div id="scope">
575
682
  <h1>1.&#160; Scope</h1>
576
- <div id="N" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div>
683
+ <div id="N" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</div>
577
684
  <p>
578
- <a href="#N">Formula (1)</a>
685
+ <a href="#N">Formula (3)</a>
579
686
  </p>
580
687
  </div>
581
688
  <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -591,18 +698,18 @@ RSpec.describe IsoDoc do
591
698
  </div>
592
699
  <div id="widgets">
593
700
  <h1>3.&#160; Widgets</h1>
594
- <div id="widgets1">
595
- <div id="note1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</div>
596
- <div id="note2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</div>
597
- <p> <a href="#note1">Formula (2)</a> <a href="#note2">Formula (3)</a> </p>
701
+ <div id="widgets1"><h2>3.1. </h2>
702
+ <div id="note1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (4)</div>
703
+ <div id="note2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (5)</div>
704
+ <p> <a href="#note1">Formula (4)</a> <a href="#note2">Formula (5)</a> </p>
598
705
  </div>
599
706
  </div>
600
707
  <br/>
601
708
  <div id="annex1" class="Section3">
602
- <div id="annex1a">
709
+ <div id="annex1a"><h2>A.1. </h2>
603
710
  <div id="AN" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.1)</div>
604
711
  </div>
605
- <div id="annex1b">
712
+ <div id="annex1b"><h2>A.2. </h2>
606
713
  <div id="Anote1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.2)</div>
607
714
  <div id="Anote2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.3)</div>
608
715
  </div>
@@ -619,6 +726,8 @@ RSpec.describe IsoDoc do
619
726
  <preface>
620
727
  <foreword>
621
728
  <p>
729
+ <xref target="N1"/>
730
+ <xref target="N2"/>
622
731
  <xref target="N"/>
623
732
  <xref target="note1"/>
624
733
  <xref target="note2"/>
@@ -627,6 +736,30 @@ RSpec.describe IsoDoc do
627
736
  <xref target="Anote2"/>
628
737
  </p>
629
738
  </foreword>
739
+ <introduction id="intro">
740
+ <table id="N1">
741
+ <name>Repeatability and reproducibility of husked rice yield</name>
742
+ <tbody>
743
+ <tr>
744
+ <td align="left">Number of laboratories retained after eliminating outliers</td>
745
+ <td align="center">13</td>
746
+ <td align="center">11</td>
747
+ </tr>
748
+ </tbody>
749
+ </table>
750
+ <clause id="xyz"><title>Preparatory</title>
751
+ <table id="N2">
752
+ <name>Repeatability and reproducibility of husked rice yield</name>
753
+ <tbody>
754
+ <tr>
755
+ <td align="left">Number of laboratories retained after eliminating outliers</td>
756
+ <td align="center">13</td>
757
+ <td align="center">11</td>
758
+ </tr>
759
+ </tbody>
760
+ </table>
761
+ </clause>
762
+ </introduction>
630
763
  </preface>
631
764
  <sections>
632
765
  <clause id="scope"><title>Scope</title>
@@ -712,19 +845,38 @@ RSpec.describe IsoDoc do
712
845
  <div>
713
846
  <h1 class="ForewordTitle">Foreword</h1>
714
847
  <p>
715
- <a href="#N">Table 1</a>
716
- <a href="#note1">Table 2</a>
717
- <a href="#note2">Table 3</a>
848
+ <a href="#N1">Table 1</a>
849
+ <a href="#N2">Table 2</a>
850
+ <a href="#N">Table 3</a>
851
+ <a href="#note1">Table 4</a>
852
+ <a href="#note2">Table 5</a>
718
853
  <a href="#AN">Table A.1</a>
719
854
  <a href="#Anote1">Table A.2</a>
720
855
  <a href="#Anote2">Table A.3</a>
721
856
  </p>
722
857
  </div>
858
+ <br/>
859
+ <div class="Section3" id="intro">
860
+ <h1 class="IntroTitle">Introduction</h1>
861
+ <p class="TableTitle" align="center">Table 1&#160;&#8212; Repeatability and reproducibility of husked rice yield</p>
862
+ <table id="N1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
863
+ <tbody>
864
+ <tr>
865
+ <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td>
866
+ <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td>
867
+ <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td>
868
+ </tr>
869
+ </tbody>
870
+ </table>
871
+ <div id="xyz"><h2>Preparatory</h2>
872
+ <p class="TableTitle" align="center">Table 2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="N2" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
873
+ </div>
874
+ </div>
723
875
  <p class="zzSTDTitle1"/>
724
876
  <div id="scope">
725
877
  <h1>1.&#160; Scope</h1>
726
878
  <p class="TableTitle" align="center">
727
- Table 1&#160;&#8212; Repeatability and reproducibility of husked rice yield
879
+ Table 3&#160;&#8212; Repeatability and reproducibility of husked rice yield
728
880
  </p>
729
881
  <table id="N" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
730
882
  <tbody>
@@ -736,7 +888,7 @@ RSpec.describe IsoDoc do
736
888
  </tbody>
737
889
  </table>
738
890
  <p>
739
- <a href="#N">Table 1</a>
891
+ <a href="#N">Table 3</a>
740
892
  </p>
741
893
  </div>
742
894
  <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
@@ -752,18 +904,18 @@ RSpec.describe IsoDoc do
752
904
  </div>
753
905
  <div id="widgets">
754
906
  <h1>3.&#160; Widgets</h1>
755
- <div id="widgets1">
756
- <p class="TableTitle" align="center">Table 2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
757
- <p class="TableTitle" align="center">Table 3&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note2" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
758
- <p> <a href="#note1">Table 2</a> <a href="#note2">Table 3</a> </p>
907
+ <div id="widgets1"><h2>3.1. </h2>
908
+ <p class="TableTitle" align="center">Table 4&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
909
+ <p class="TableTitle" align="center">Table 5&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note2" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
910
+ <p> <a href="#note1">Table 4</a> <a href="#note2">Table 5</a> </p>
759
911
  </div>
760
912
  </div>
761
913
  <br/>
762
914
  <div id="annex1" class="Section3">
763
- <div id="annex1a">
915
+ <div id="annex1a"><h2>A.1. </h2>
764
916
  <p class="TableTitle" align="center">Table A.1&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="AN" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
765
917
  </div>
766
- <div id="annex1b">
918
+ <div id="annex1b"><h2>A.2. </h2>
767
919
  <p class="TableTitle" align="center">Table A.2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="Anote1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
768
920
  <p class="TableTitle" align="center">Table A.3&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="Anote2" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><tbody><tr><td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
769
921
  </div>
@@ -810,9 +962,9 @@ RSpec.describe IsoDoc do
810
962
  <div>
811
963
  <h1 class="ForewordTitle">Foreword</h1>
812
964
  <p>
813
- <a href="#note1">2.1, Note 1</a>
814
- <a href="#note2">2.2, Note 1</a>
815
- <a href="#note3">2.2, Note 2</a>
965
+ <a href="#note1">Clause 2.1, Note 1</a>
966
+ <a href="#note2">Clause 2.2, Note 1</a>
967
+ <a href="#note3">Clause 2.2, Note 2</a>
816
968
  </p>
817
969
  </div>
818
970
  <p class="zzSTDTitle1"/>
@@ -928,16 +1080,16 @@ RSpec.describe IsoDoc do
928
1080
  <a href="#C1">Introduction, 2</a>
929
1081
  <a href="#D">Clause 1</a>
930
1082
  <a href="#H">Clause 3</a>
931
- <a href="#I">3.1</a>
932
- <a href="#J">3.1.1</a>
933
- <a href="#K">3.2</a>
1083
+ <a href="#I">Clause 3.1</a>
1084
+ <a href="#J">Clause 3.1.1</a>
1085
+ <a href="#K">Clause 3.2</a>
934
1086
  <a href="#L">Clause 4</a>
935
1087
  <a href="#M">Clause 5</a>
936
- <a href="#N">5.1</a>
937
- <a href="#O">5.2</a>
1088
+ <a href="#N">Clause 5.1</a>
1089
+ <a href="#O">Clause 5.2</a>
938
1090
  <a href="#P">Annex A</a>
939
- <a href="#Q">A.1</a>
940
- <a href="#Q1">A.1.1</a>
1091
+ <a href="#Q">Annex A.1</a>
1092
+ <a href="#Q1">Annex A.1.1</a>
941
1093
  <a href="#R">Clause 2</a>
942
1094
  </p>
943
1095
  </div>
@@ -947,7 +1099,7 @@ RSpec.describe IsoDoc do
947
1099
  <div id="C">
948
1100
  <h2>Introduction Subsection</h2>
949
1101
  </div>
950
- <div id="C1">Text</div>
1102
+ <div id="C1"><h2/>Text</div>
951
1103
  </div>
952
1104
  <p class="zzSTDTitle1"/>
953
1105
  <div id="D">
@@ -1024,6 +1176,8 @@ RSpec.describe IsoDoc do
1024
1176
  <preface>
1025
1177
  <foreword>
1026
1178
  <p>
1179
+ <xref target="N1"/>
1180
+ <xref target="N2"/>
1027
1181
  <xref target="N"/>
1028
1182
  <xref target="note1"/>
1029
1183
  <xref target="note2"/>
@@ -1032,6 +1186,16 @@ RSpec.describe IsoDoc do
1032
1186
  <xref target="Anote2"/>
1033
1187
  </p>
1034
1188
  </foreword>
1189
+ <introduction id="intro">
1190
+ <ol id="N1">
1191
+ <li><p>A</p></li>
1192
+ </ol>
1193
+ <clause id="xyz"><title>Preparatory</title>
1194
+ <ol id="N2">
1195
+ <li><p>A</p></li>
1196
+ </ol>
1197
+ </clause>
1198
+ </introduction>
1035
1199
  </preface>
1036
1200
  <sections>
1037
1201
  <clause id="scope"><title>Scope</title>
@@ -1073,14 +1237,28 @@ RSpec.describe IsoDoc do
1073
1237
  <div>
1074
1238
  <h1 class="ForewordTitle">Foreword</h1>
1075
1239
  <p>
1240
+ <a href="#N1">Introduction, List</a>
1241
+ <a href="#N2">Preparatory, List</a>
1076
1242
  <a href="#N">Clause 1, List</a>
1077
- <a href="#note1">3.1, List 1</a>
1078
- <a href="#note2">3.1, List 2</a>
1079
- <a href="#AN">A.1, List</a>
1080
- <a href="#Anote1">A.2, List 1</a>
1081
- <a href="#Anote2">A.2, List 2</a>
1243
+ <a href="#note1">Clause 3.1, List 1</a>
1244
+ <a href="#note2">Clause 3.1, List 2</a>
1245
+ <a href="#AN">Annex A.1, List</a>
1246
+ <a href="#Anote1">Annex A.2, List 1</a>
1247
+ <a href="#Anote2">Annex A.2, List 2</a>
1082
1248
  </p>
1083
1249
  </div>
1250
+ <br/>
1251
+ <div class="Section3" id="intro">
1252
+ <h1 class="IntroTitle">Introduction</h1>
1253
+ <ol type="a">
1254
+ <li><p>A</p></li>
1255
+ </ol>
1256
+ <div id="xyz"><h2>Preparatory</h2>
1257
+ <ol type="a">
1258
+ <li><p>A</p></li>
1259
+ </ol>
1260
+ </div>
1261
+ </div>
1084
1262
  <p class="zzSTDTitle1"/>
1085
1263
  <div id="scope">
1086
1264
  <h1>1.&#160; Scope</h1>
@@ -1101,7 +1279,7 @@ RSpec.describe IsoDoc do
1101
1279
  </div>
1102
1280
  <div id="widgets">
1103
1281
  <h1>3.&#160; Widgets</h1>
1104
- <div id="widgets1">
1282
+ <div id="widgets1"><h2>3.1. </h2>
1105
1283
  <ol type="a">
1106
1284
  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
1107
1285
  </ol>
@@ -1112,12 +1290,12 @@ RSpec.describe IsoDoc do
1112
1290
  </div>
1113
1291
  <br/>
1114
1292
  <div id="annex1" class="Section3">
1115
- <div id="annex1a">
1293
+ <div id="annex1a"><h2>A.1. </h2>
1116
1294
  <ol type="a">
1117
1295
  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
1118
1296
  </ol>
1119
1297
  </div>
1120
- <div id="annex1b">
1298
+ <div id="annex1b"><h2>A.2. </h2>
1121
1299
  <ol type="a">
1122
1300
  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
1123
1301
  </ol>
@@ -1138,6 +1316,8 @@ RSpec.describe IsoDoc do
1138
1316
  <preface>
1139
1317
  <foreword>
1140
1318
  <p>
1319
+ <xref target="N1"/>
1320
+ <xref target="N2"/>
1141
1321
  <xref target="N"/>
1142
1322
  <xref target="note1"/>
1143
1323
  <xref target="note2"/>
@@ -1146,10 +1326,20 @@ RSpec.describe IsoDoc do
1146
1326
  <xref target="Anote2"/>
1147
1327
  </p>
1148
1328
  </foreword>
1329
+ <introduction id="intro">
1330
+ <ol id="N01">
1331
+ <li id="N1"><p>A</p></li>
1332
+ </ol>
1333
+ <clause id="xyz"><title>Preparatory</title>
1334
+ <ol id="N02">
1335
+ <li id="N2"><p>A</p></li>
1336
+ </ol>
1337
+ </clause>
1338
+ </introduction>
1149
1339
  </preface>
1150
1340
  <sections>
1151
1341
  <clause id="scope"><title>Scope</title>
1152
- <ol id="N1">
1342
+ <ol id="N0">
1153
1343
  <li id="N"><p>A</p></li>
1154
1344
  </ol>
1155
1345
  </clause>
@@ -1187,14 +1377,28 @@ RSpec.describe IsoDoc do
1187
1377
  <div>
1188
1378
  <h1 class="ForewordTitle">Foreword</h1>
1189
1379
  <p>
1380
+ <a href="#N1">Introduction, a)</a>
1381
+ <a href="#N2">Preparatory, a)</a>
1190
1382
  <a href="#N">Clause 1, a)</a>
1191
- <a href="#note1">3.1, List 1 a)</a>
1192
- <a href="#note2">3.1, List 2 a)</a>
1193
- <a href="#AN">A.1, a)</a>
1194
- <a href="#Anote1">A.2, List 1 a)</a>
1195
- <a href="#Anote2">A.2, List 2 a)</a>
1383
+ <a href="#note1">Clause 3.1, List 1 a)</a>
1384
+ <a href="#note2">Clause 3.1, List 2 a)</a>
1385
+ <a href="#AN">Annex A.1, a)</a>
1386
+ <a href="#Anote1">Annex A.2, List 1 a)</a>
1387
+ <a href="#Anote2">Annex A.2, List 2 a)</a>
1196
1388
  </p>
1197
1389
  </div>
1390
+ <br/>
1391
+ <div class="Section3" id="intro">
1392
+ <h1 class="IntroTitle">Introduction</h1>
1393
+ <ol type="a">
1394
+ <li><p>A</p></li>
1395
+ </ol>
1396
+ <div id="xyz"><h2>Preparatory</h2>
1397
+ <ol type="a">
1398
+ <li><p>A</p></li>
1399
+ </ol>
1400
+ </div>
1401
+ </div>
1198
1402
  <p class="zzSTDTitle1"/>
1199
1403
  <div id="scope">
1200
1404
  <h1>1.&#160; Scope</h1>
@@ -1215,7 +1419,7 @@ RSpec.describe IsoDoc do
1215
1419
  </div>
1216
1420
  <div id="widgets">
1217
1421
  <h1>3.&#160; Widgets</h1>
1218
- <div id="widgets1">
1422
+ <div id="widgets1"><h2>3.1. </h2>
1219
1423
  <ol type="a">
1220
1424
  <li><p>A</p></li>
1221
1425
  </ol>
@@ -1226,12 +1430,12 @@ RSpec.describe IsoDoc do
1226
1430
  </div>
1227
1431
  <br/>
1228
1432
  <div id="annex1" class="Section3">
1229
- <div id="annex1a">
1433
+ <div id="annex1a"><h2>A.1. </h2>
1230
1434
  <ol type="a">
1231
1435
  <li><p>A</p></li>
1232
1436
  </ol>
1233
1437
  </div>
1234
- <div id="annex1b">
1438
+ <div id="annex1b"><h2>A.2. </h2>
1235
1439
  <ol type="a">
1236
1440
  <li><p>A</p></li>
1237
1441
  </ol>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: isodoc
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.5
4
+ version: 0.8.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-08-04 00:00:00.000000000 Z
11
+ date: 2018-08-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciimath