isodoc 1.0.20 → 1.0.21
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/base_style/reset.scss +3 -0
- data/lib/isodoc/function/blocks.rb +7 -52
- data/lib/isodoc/function/blocks_example.rb +53 -0
- data/lib/isodoc/function/cleanup.rb +29 -0
- data/lib/isodoc/function/lists.rb +5 -0
- data/lib/isodoc/function/references.rb +6 -15
- data/lib/isodoc/function/section.rb +3 -0
- data/lib/isodoc/function/table.rb +2 -1
- data/lib/isodoc/function/xref_gen.rb +1 -133
- data/lib/isodoc/function/xref_gen_seq.rb +154 -0
- data/lib/isodoc/html_function/footnotes.rb +2 -1
- data/lib/isodoc/version.rb +1 -1
- data/lib/isodoc/word_function/body.rb +18 -2
- data/lib/isodoc/word_function/footnotes.rb +2 -1
- data/lib/isodoc/word_function/postprocess.rb +9 -0
- data/lib/isodoc/word_function/table.rb +1 -0
- data/spec/isodoc/blocks_spec.rb +116 -8
- data/spec/isodoc/cleanup_spec.rb +178 -0
- data/spec/isodoc/lists_spec.rb +96 -0
- data/spec/isodoc/postproc_spec.rb +122 -0
- data/spec/isodoc/section_spec.rb +32 -2
- data/spec/isodoc/table_spec.rb +25 -9
- data/spec/isodoc/xref_spec.rb +105 -17
- metadata +4 -2
data/spec/isodoc/lists_spec.rb
CHANGED
|
@@ -36,6 +36,102 @@ RSpec.describe IsoDoc do
|
|
|
36
36
|
OUTPUT
|
|
37
37
|
end
|
|
38
38
|
|
|
39
|
+
it "processes unordered checklists" do
|
|
40
|
+
expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
41
|
+
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
42
|
+
<preface><foreword>
|
|
43
|
+
<ul id="_61961034-0fb1-436b-b281-828857a59ddb">
|
|
44
|
+
<li checkedcheckbox="true" uncheckedcheckbox="false">
|
|
45
|
+
<p id="_cb370dd3-8463-4ec7-aa1a-96f644e2e9a2">updated normative references;</p>
|
|
46
|
+
</li>
|
|
47
|
+
<li checkedcheckbox="false" uncheckedcheckbox="true">
|
|
48
|
+
<p id="_60eb765c-1f6c-418a-8016-29efa06bf4f9">deletion of 4.3.</p>
|
|
49
|
+
</li>
|
|
50
|
+
</ul>
|
|
51
|
+
</foreword></preface>
|
|
52
|
+
</iso-standard>
|
|
53
|
+
INPUT
|
|
54
|
+
#{HTML_HDR}
|
|
55
|
+
<br/>
|
|
56
|
+
<div>
|
|
57
|
+
<h1 class='ForewordTitle'>Foreword</h1>
|
|
58
|
+
<ul id='_61961034-0fb1-436b-b281-828857a59ddb'>
|
|
59
|
+
<li>
|
|
60
|
+
<span class='zzMoveToFollowing'>
|
|
61
|
+
<input type='checkbox'/>
|
|
62
|
+
</span>
|
|
63
|
+
<p id='_cb370dd3-8463-4ec7-aa1a-96f644e2e9a2'>updated normative references;</p>
|
|
64
|
+
</li>
|
|
65
|
+
<li>
|
|
66
|
+
<span class='zzMoveToFollowing'>
|
|
67
|
+
<input type='checkbox' checked='checked'/>
|
|
68
|
+
</span>
|
|
69
|
+
<p id='_60eb765c-1f6c-418a-8016-29efa06bf4f9'>deletion of 4.3.</p>
|
|
70
|
+
</li>
|
|
71
|
+
</ul>
|
|
72
|
+
</div>
|
|
73
|
+
<p class='zzSTDTitle1'/>
|
|
74
|
+
</div>
|
|
75
|
+
</body>
|
|
76
|
+
</html>
|
|
77
|
+
OUTPUT
|
|
78
|
+
end
|
|
79
|
+
|
|
80
|
+
it "processes unordered checklists (Word)" do
|
|
81
|
+
expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
82
|
+
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
83
|
+
<preface><foreword>
|
|
84
|
+
<ul id="_61961034-0fb1-436b-b281-828857a59ddb">
|
|
85
|
+
<li checkedcheckbox="true" uncheckedcheckbox="false">
|
|
86
|
+
<p id="_cb370dd3-8463-4ec7-aa1a-96f644e2e9a2">updated normative references;</p>
|
|
87
|
+
</li>
|
|
88
|
+
<li checkedcheckbox="false" uncheckedcheckbox="true">
|
|
89
|
+
<p id="_60eb765c-1f6c-418a-8016-29efa06bf4f9">deletion of 4.3.</p>
|
|
90
|
+
</li>
|
|
91
|
+
</ul>
|
|
92
|
+
</foreword></preface>
|
|
93
|
+
</iso-standard>
|
|
94
|
+
INPUT
|
|
95
|
+
<html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
|
|
96
|
+
<head><style/></head>
|
|
97
|
+
<body lang='EN-US' link='blue' vlink='#954F72'>
|
|
98
|
+
<div class='WordSection1'>
|
|
99
|
+
<p> </p>
|
|
100
|
+
</div>
|
|
101
|
+
<p>
|
|
102
|
+
<br clear='all' class='section'/>
|
|
103
|
+
</p>
|
|
104
|
+
<div class='WordSection2'>
|
|
105
|
+
<p>
|
|
106
|
+
<br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
|
|
107
|
+
</p>
|
|
108
|
+
<div>
|
|
109
|
+
<h1 class='ForewordTitle'>Foreword</h1>
|
|
110
|
+
<ul id='_61961034-0fb1-436b-b281-828857a59ddb'>
|
|
111
|
+
<li>
|
|
112
|
+
<span class='zzMoveToFollowing'>☑ </span>
|
|
113
|
+
<p id='_cb370dd3-8463-4ec7-aa1a-96f644e2e9a2'>updated normative references;</p>
|
|
114
|
+
</li>
|
|
115
|
+
<li>
|
|
116
|
+
<span class='zzMoveToFollowing'>☐ </span>
|
|
117
|
+
<p id='_60eb765c-1f6c-418a-8016-29efa06bf4f9'>deletion of 4.3.</p>
|
|
118
|
+
</li>
|
|
119
|
+
</ul>
|
|
120
|
+
</div>
|
|
121
|
+
<p> </p>
|
|
122
|
+
</div>
|
|
123
|
+
<p>
|
|
124
|
+
<br clear='all' class='section'/>
|
|
125
|
+
</p>
|
|
126
|
+
<div class='WordSection3'>
|
|
127
|
+
<p class='zzSTDTitle1'/>
|
|
128
|
+
</div>
|
|
129
|
+
</body>
|
|
130
|
+
</html>
|
|
131
|
+
OUTPUT
|
|
132
|
+
end
|
|
133
|
+
|
|
134
|
+
|
|
39
135
|
it "processes ordered lists" do
|
|
40
136
|
expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
41
137
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
@@ -1441,4 +1441,126 @@ expect(xmlpp(html.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).
|
|
|
1441
1441
|
OUTPUT
|
|
1442
1442
|
end
|
|
1443
1443
|
|
|
1444
|
+
it "expands out nested tables in Word" do
|
|
1445
|
+
expect(xmlpp(IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", filename: "test"}).word_cleanup(Nokogiri::XML(<<~INPUT)).to_xml).sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>")).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
1446
|
+
<html>
|
|
1447
|
+
<head/>
|
|
1448
|
+
<body>
|
|
1449
|
+
<div class="main-section">
|
|
1450
|
+
<table id="_7830dff8-419e-4b9e-85cf-a063689f44ca" class="recommend" style="border-collapse:collapse;border-spacing:0;"><thead><tr style="background:#A5A5A5;"><th style="vertical-align:top;" class="recommend" colspan="2"><p class="RecommendationTitle">Requirement 1:</p></th></tr></thead><tbody><tr><td style="vertical-align:top;" class="recommend" colspan="2"><p>requirement label</p></td></tr>
|
|
1451
|
+
|
|
1452
|
+
<table id="_a0f8c202-fd34-460c-bd5e-b2f4cc29210d" class="recommend" style="border-collapse:collapse;border-spacing:0;"><thead><tr style="background:#A5A5A5;"><th style="vertical-align:top;" class="recommend" colspan="2"><p class="RecommendationTitle">Requirement 1-1:</p></th></tr></thead><tbody><tr style="background:#C9C9C9;"><td style="vertical-align:top;" class="recommend" colspan="2">
|
|
1453
|
+
<p id="_2e2c247b-ce4c-48c5-96dd-f3e090a5b4a7">Description text</p>
|
|
1454
|
+
</td></tr></tbody></table>
|
|
1455
|
+
</tbody></table>
|
|
1456
|
+
</div>
|
|
1457
|
+
<div id="_second_sample"><h2>1.2.<span style="mso-tab-count:1">  </span>Second sample</h2>
|
|
1458
|
+
|
|
1459
|
+
<table id="_9846c486-14e5-4b1c-bb2f-55cc254dd309" class="recommend" style="border-collapse:collapse;border-spacing:0;"><thead><tr style="background:#A5A5A5;"><th style="vertical-align:top;" class="recommend" colspan="2"><p class="RecommendationTitle">Requirement 2:</p></th></tr></thead><tbody><tr><td style="vertical-align:top;" class="recommend" colspan="2"><p>requirement label</p></td></tr><table id="_62de974c-7128-44d6-ba86-99f818f1d467" class="recommend" style="border-collapse:collapse;border-spacing:0;"><thead><tr style="background:#A5A5A5;"><th style="vertical-align:top;" class="recommend" colspan="2"><p class="RecommendationTitle">Requirement 2-1:</p></th></tr></thead><tbody><tr style="background:#C9C9C9;"><td style="vertical-align:top;" class="recommend" colspan="2">
|
|
1460
|
+
<p id="_30b90b08-bd71-4497-bbcc-8c61fbb9f772">Description text</p>
|
|
1461
|
+
</td></tr></tbody></table>
|
|
1462
|
+
<table id="_fede5681-71f6-47bb-bc65-7bd0b11acd01" class="recommend" style="border-collapse:collapse;border-spacing:0;"><thead><tr style="background:#A5A5A5;"><th style="vertical-align:top;" class="recommend" colspan="2"><p class="RecommendationTitle">Requirement 2-2:</p></th></tr></thead><tbody><tr><td style="vertical-align:top;" class="recommend" colspan="2">
|
|
1463
|
+
<p id="_8daa3d74-90fd-4a57-9169-de457a68cfda">Description text</p>
|
|
1464
|
+
</td></tr></tbody></table></tbody></table>
|
|
1465
|
+
</div>
|
|
1466
|
+
</body>
|
|
1467
|
+
</html>
|
|
1468
|
+
INPUT
|
|
1469
|
+
<html>
|
|
1470
|
+
<head/>
|
|
1471
|
+
<body>
|
|
1472
|
+
<div class='main-section'>
|
|
1473
|
+
<table id='_7830dff8-419e-4b9e-85cf-a063689f44ca' class='recommend' style='border-collapse:collapse;border-spacing:0;'>
|
|
1474
|
+
<thead>
|
|
1475
|
+
<tr style='background:#A5A5A5;'>
|
|
1476
|
+
<th style='vertical-align:top;' class='recommend' colspan='2'>
|
|
1477
|
+
<p class='RecommendationTitle'>Requirement 1:</p>
|
|
1478
|
+
</th>
|
|
1479
|
+
</tr>
|
|
1480
|
+
</thead>
|
|
1481
|
+
<tbody>
|
|
1482
|
+
<tr>
|
|
1483
|
+
<td style='vertical-align:top;' class='recommend' colspan='2'>
|
|
1484
|
+
<p>requirement label</p>
|
|
1485
|
+
</td>
|
|
1486
|
+
</tr>
|
|
1487
|
+
</tbody>
|
|
1488
|
+
</table>
|
|
1489
|
+
<table id='_a0f8c202-fd34-460c-bd5e-b2f4cc29210d' class='recommend' style='border-collapse:collapse;border-spacing:0;'>
|
|
1490
|
+
<thead>
|
|
1491
|
+
<tr style='background:#A5A5A5;'>
|
|
1492
|
+
<th style='vertical-align:top;' class='recommend' colspan='2'>
|
|
1493
|
+
<p class='RecommendationTitle'>Requirement 1-1:</p>
|
|
1494
|
+
</th>
|
|
1495
|
+
</tr>
|
|
1496
|
+
</thead>
|
|
1497
|
+
<tbody>
|
|
1498
|
+
<tr style='background:#C9C9C9;'>
|
|
1499
|
+
<td style='vertical-align:top;' class='recommend' colspan='2'>
|
|
1500
|
+
<p id='_2e2c247b-ce4c-48c5-96dd-f3e090a5b4a7'>Description text</p>
|
|
1501
|
+
</td>
|
|
1502
|
+
</tr>
|
|
1503
|
+
</tbody>
|
|
1504
|
+
</table>
|
|
1505
|
+
</div>
|
|
1506
|
+
<div id='_second_sample'>
|
|
1507
|
+
<h2>
|
|
1508
|
+
1.2.
|
|
1509
|
+
<span style='mso-tab-count:1'>  </span>
|
|
1510
|
+
Second sample
|
|
1511
|
+
</h2>
|
|
1512
|
+
<table id='_9846c486-14e5-4b1c-bb2f-55cc254dd309' class='recommend' style='border-collapse:collapse;border-spacing:0;'>
|
|
1513
|
+
<thead>
|
|
1514
|
+
<tr style='background:#A5A5A5;'>
|
|
1515
|
+
<th style='vertical-align:top;' class='recommend' colspan='2'>
|
|
1516
|
+
<p class='RecommendationTitle'>Requirement 2:</p>
|
|
1517
|
+
</th>
|
|
1518
|
+
</tr>
|
|
1519
|
+
</thead>
|
|
1520
|
+
<tbody>
|
|
1521
|
+
<tr>
|
|
1522
|
+
<td style='vertical-align:top;' class='recommend' colspan='2'>
|
|
1523
|
+
<p>requirement label</p>
|
|
1524
|
+
</td>
|
|
1525
|
+
</tr>
|
|
1526
|
+
</tbody>
|
|
1527
|
+
</table>
|
|
1528
|
+
<table id='_62de974c-7128-44d6-ba86-99f818f1d467' class='recommend' style='border-collapse:collapse;border-spacing:0;'>
|
|
1529
|
+
<thead>
|
|
1530
|
+
<tr style='background:#A5A5A5;'>
|
|
1531
|
+
<th style='vertical-align:top;' class='recommend' colspan='2'>
|
|
1532
|
+
<p class='RecommendationTitle'>Requirement 2-1:</p>
|
|
1533
|
+
</th>
|
|
1534
|
+
</tr>
|
|
1535
|
+
</thead>
|
|
1536
|
+
<tbody>
|
|
1537
|
+
<tr style='background:#C9C9C9;'>
|
|
1538
|
+
<td style='vertical-align:top;' class='recommend' colspan='2'>
|
|
1539
|
+
<p id='_30b90b08-bd71-4497-bbcc-8c61fbb9f772'>Description text</p>
|
|
1540
|
+
</td>
|
|
1541
|
+
</tr>
|
|
1542
|
+
</tbody>
|
|
1543
|
+
</table>
|
|
1544
|
+
<table id='_fede5681-71f6-47bb-bc65-7bd0b11acd01' class='recommend' style='border-collapse:collapse;border-spacing:0;'>
|
|
1545
|
+
<thead>
|
|
1546
|
+
<tr style='background:#A5A5A5;'>
|
|
1547
|
+
<th style='vertical-align:top;' class='recommend' colspan='2'>
|
|
1548
|
+
<p class='RecommendationTitle'>Requirement 2-2:</p>
|
|
1549
|
+
</th>
|
|
1550
|
+
</tr>
|
|
1551
|
+
</thead>
|
|
1552
|
+
<tbody>
|
|
1553
|
+
<tr>
|
|
1554
|
+
<td style='vertical-align:top;' class='recommend' colspan='2'>
|
|
1555
|
+
<p id='_8daa3d74-90fd-4a57-9169-de457a68cfda'>Description text</p>
|
|
1556
|
+
</td>
|
|
1557
|
+
</tr>
|
|
1558
|
+
</tbody>
|
|
1559
|
+
</table>
|
|
1560
|
+
</div>
|
|
1561
|
+
</body>
|
|
1562
|
+
</html>
|
|
1563
|
+
OUTPUT
|
|
1564
|
+
end
|
|
1565
|
+
|
|
1444
1566
|
end
|
data/spec/isodoc/section_spec.rb
CHANGED
|
@@ -114,7 +114,10 @@ RSpec.describe IsoDoc do
|
|
|
114
114
|
</clause>
|
|
115
115
|
<references id="Q2"><title>Annex Bibliography</title></references>
|
|
116
116
|
</clause>
|
|
117
|
-
</annex
|
|
117
|
+
</annex>
|
|
118
|
+
<annex id="P1" inline-header="false" obligation="normative">
|
|
119
|
+
</annex>
|
|
120
|
+
<bibliography><references id="R" obligation="informative">
|
|
118
121
|
<title>Normative References</title>
|
|
119
122
|
</references><clause id="S" obligation="informative">
|
|
120
123
|
<title>Bibliography</title>
|
|
@@ -227,6 +230,17 @@ RSpec.describe IsoDoc do
|
|
|
227
230
|
</div>
|
|
228
231
|
|
|
229
232
|
</div>
|
|
233
|
+
<br/>
|
|
234
|
+
<div id='P1' class='Section3'>
|
|
235
|
+
<h1 class='Annex'>
|
|
236
|
+
<b>Annex B</b>
|
|
237
|
+
<br/>
|
|
238
|
+
(normative)
|
|
239
|
+
<br/>
|
|
240
|
+
<br/>
|
|
241
|
+
<b/>
|
|
242
|
+
</h1>
|
|
243
|
+
</div>
|
|
230
244
|
<br/>
|
|
231
245
|
<div>
|
|
232
246
|
<h1 class="Section3">Bibliography</h1>
|
|
@@ -325,7 +339,10 @@ OUTPUT
|
|
|
325
339
|
<title>Annex A.1a</title>
|
|
326
340
|
</clause>
|
|
327
341
|
</clause>
|
|
328
|
-
</annex
|
|
342
|
+
</annex>
|
|
343
|
+
<annex id="P1" inline-header="false" obligation="normative">
|
|
344
|
+
</annex>
|
|
345
|
+
<bibliography><references id="R" obligation="informative">
|
|
329
346
|
<title>Normative References</title>
|
|
330
347
|
</references><clause id="S" obligation="informative">
|
|
331
348
|
<title>Bibliography</title>
|
|
@@ -454,6 +471,19 @@ OUTPUT
|
|
|
454
471
|
</div>
|
|
455
472
|
</div>
|
|
456
473
|
</div>
|
|
474
|
+
<p>
|
|
475
|
+
<br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
|
|
476
|
+
</p>
|
|
477
|
+
<div id='P1' class='Section3'>
|
|
478
|
+
<h1 class='Annex'>
|
|
479
|
+
<b>Annex B</b>
|
|
480
|
+
<br/>
|
|
481
|
+
(normative)
|
|
482
|
+
<br/>
|
|
483
|
+
<br/>
|
|
484
|
+
<b/>
|
|
485
|
+
</h1>
|
|
486
|
+
</div>
|
|
457
487
|
<p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
|
|
458
488
|
<div>
|
|
459
489
|
<h1 class="Section3">Bibliography</h1>
|
data/spec/isodoc/table_spec.rb
CHANGED
|
@@ -6,8 +6,8 @@ RSpec.describe IsoDoc do
|
|
|
6
6
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
7
7
|
<preface>
|
|
8
8
|
<foreword>
|
|
9
|
-
<table id="tableD-1" alt="tool tip" summary="long desc">
|
|
10
|
-
<name>Repeatability and reproducibility of <em>husked</em> rice yield</name>
|
|
9
|
+
<table id="tableD-1" alt="tool tip" summary="long desc" width="70%">
|
|
10
|
+
<name>Repeatability and reproducibility of <em>husked</em> rice yield<fn reference="1"><p>X</p></fn></name>
|
|
11
11
|
<thead>
|
|
12
12
|
<tr>
|
|
13
13
|
<td rowspan="2" align="left">Description</td>
|
|
@@ -67,8 +67,12 @@ RSpec.describe IsoDoc do
|
|
|
67
67
|
<br/>
|
|
68
68
|
<div>
|
|
69
69
|
<h1 class="ForewordTitle">Foreword</h1>
|
|
70
|
-
<p class="TableTitle" style="text-align:center;">Table 1 — Repeatability and reproducibility of <i>husked</i> rice yield
|
|
71
|
-
<
|
|
70
|
+
<p class="TableTitle" style="text-align:center;">Table 1 — Repeatability and reproducibility of <i>husked</i> rice yield
|
|
71
|
+
<a rel='footnote' href='#fn:1' epub:type='footnote'>
|
|
72
|
+
<sup>1</sup>
|
|
73
|
+
</a>
|
|
74
|
+
</p>
|
|
75
|
+
<table id="tableD-1" class="MsoISOTable" style="border-width:1px;border-spacing:0;width:70%;" title="tool tip">
|
|
72
76
|
<caption>
|
|
73
77
|
<span style="display:none">long desc</span>
|
|
74
78
|
</caption>
|
|
@@ -130,6 +134,9 @@ RSpec.describe IsoDoc do
|
|
|
130
134
|
</table>
|
|
131
135
|
</div>
|
|
132
136
|
<p class="zzSTDTitle1"/>
|
|
137
|
+
<aside id='fn:1' class='footnote'>
|
|
138
|
+
<p>X</p>
|
|
139
|
+
</aside>
|
|
133
140
|
</div>
|
|
134
141
|
</body>
|
|
135
142
|
</html>
|
|
@@ -137,15 +144,15 @@ RSpec.describe IsoDoc do
|
|
|
137
144
|
end
|
|
138
145
|
|
|
139
146
|
it "processes IsoXML tables (Word)" do
|
|
140
|
-
expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
147
|
+
expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
141
148
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
142
149
|
<preface>
|
|
143
150
|
<foreword>
|
|
144
151
|
<table id="tableD-0">
|
|
145
152
|
<tbody><tr><td>A</td></tr></tbody>
|
|
146
153
|
</table>
|
|
147
|
-
<table id="tableD-1" alt="tool tip" summary="long desc">
|
|
148
|
-
<name>Repeatability and reproducibility of husked rice yield</name>
|
|
154
|
+
<table id="tableD-1" alt="tool tip" summary="long desc" width="70%">
|
|
155
|
+
<name>Repeatability and reproducibility of husked rice yield<fn reference="1"><p>X</p></fn></name>
|
|
149
156
|
<thead>
|
|
150
157
|
<tr>
|
|
151
158
|
<td rowspan="2" align="left">Description</td>
|
|
@@ -218,9 +225,15 @@ RSpec.describe IsoDoc do
|
|
|
218
225
|
</tbody>
|
|
219
226
|
</table>
|
|
220
227
|
</div>
|
|
221
|
-
<p class="TableTitle" style="text-align:center;">Table 2 — Repeatability and reproducibility of husked rice yield
|
|
228
|
+
<p class="TableTitle" style="text-align:center;">Table 2 — Repeatability and reproducibility of husked rice yield
|
|
229
|
+
<span style='mso-bookmark:_Ref'>
|
|
230
|
+
<a href='#ftn1' epub:type='footnote'>
|
|
231
|
+
<sup>1</sup>
|
|
232
|
+
</a>
|
|
233
|
+
</span>
|
|
234
|
+
</p>
|
|
222
235
|
<div align="center" class="table_container">
|
|
223
|
-
<table id="tableD-1" class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;" title="tool tip" summary="long desc">
|
|
236
|
+
<table id="tableD-1" class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;" title="tool tip" summary="long desc" width="70%">
|
|
224
237
|
<thead>
|
|
225
238
|
<tr>
|
|
226
239
|
<td rowspan="2" align="left" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;">Description</td>
|
|
@@ -279,6 +292,9 @@ RSpec.describe IsoDoc do
|
|
|
279
292
|
<p><br clear="all" class="section"/></p>
|
|
280
293
|
<div class="WordSection3">
|
|
281
294
|
<p class="zzSTDTitle1"/>
|
|
295
|
+
<aside id='ftn1'>
|
|
296
|
+
<p>X</p>
|
|
297
|
+
</aside>
|
|
282
298
|
</div>
|
|
283
299
|
</body>
|
|
284
300
|
</html>
|
data/spec/isodoc/xref_spec.rb
CHANGED
|
@@ -178,6 +178,14 @@ RSpec.describe IsoDoc do
|
|
|
178
178
|
</div>
|
|
179
179
|
<br/>
|
|
180
180
|
<div id="annex1" class="Section3">
|
|
181
|
+
<h1 class='Annex'>
|
|
182
|
+
<b>Annex A</b>
|
|
183
|
+
<br/>
|
|
184
|
+
(informative)
|
|
185
|
+
<br/>
|
|
186
|
+
<br/>
|
|
187
|
+
<b/>
|
|
188
|
+
</h1>
|
|
181
189
|
<div id="annex1a"><h2>A.1. </h2>
|
|
182
190
|
<div id="AN" class="Note"><p><span class="note_label">NOTE</span>  These results are based on a study carried out on three different types of kernel.</p></div>
|
|
183
191
|
</div>
|
|
@@ -365,6 +373,14 @@ RSpec.describe IsoDoc do
|
|
|
365
373
|
</div>
|
|
366
374
|
<br/>
|
|
367
375
|
<div id="annex1" class="Section3">
|
|
376
|
+
<h1 class='Annex'>
|
|
377
|
+
<b>Annex A</b>
|
|
378
|
+
<br/>
|
|
379
|
+
(informative)
|
|
380
|
+
<br/>
|
|
381
|
+
<br/>
|
|
382
|
+
<b/>
|
|
383
|
+
</h1>
|
|
368
384
|
<div id="annex1a"><h2>A.1.  </h2>
|
|
369
385
|
<div id="AN" class="figure">
|
|
370
386
|
|
|
@@ -485,6 +501,14 @@ RSpec.describe IsoDoc do
|
|
|
485
501
|
</div>
|
|
486
502
|
<br/>
|
|
487
503
|
<div id="annex1" class="Section3">
|
|
504
|
+
<h1 class='Annex'>
|
|
505
|
+
<b>Annex A</b>
|
|
506
|
+
<br/>
|
|
507
|
+
(informative)
|
|
508
|
+
<br/>
|
|
509
|
+
<br/>
|
|
510
|
+
<b/>
|
|
511
|
+
</h1>
|
|
488
512
|
<div id="annex1a"><h2>A.1. </h2>
|
|
489
513
|
</div>
|
|
490
514
|
<div id="annex1b"><h2>A.2. </h2>
|
|
@@ -623,6 +647,14 @@ RSpec.describe IsoDoc do
|
|
|
623
647
|
</div>
|
|
624
648
|
<br/>
|
|
625
649
|
<div id="annex1" class="Section3">
|
|
650
|
+
<h1 class='Annex'>
|
|
651
|
+
<b>Annex A</b>
|
|
652
|
+
<br/>
|
|
653
|
+
(informative)
|
|
654
|
+
<br/>
|
|
655
|
+
<br/>
|
|
656
|
+
<b/>
|
|
657
|
+
</h1>
|
|
626
658
|
<div id="annex1a"><h2>A.1. </h2>
|
|
627
659
|
<div id="AN" class="example"><p class="example-title">EXAMPLE</p>
|
|
628
660
|
<p>Hello</p>
|
|
@@ -717,9 +749,9 @@ RSpec.describe IsoDoc do
|
|
|
717
749
|
<a href="#N">Clause 1, Formula (2)</a>
|
|
718
750
|
<a href="#note1">Clause 3.1, Formula (3)</a>
|
|
719
751
|
<a href="#note2">Clause 3.1, Formula (4)</a>
|
|
720
|
-
<a href="#AN">
|
|
721
|
-
<a href="#Anote1">
|
|
722
|
-
<a href="#Anote2">
|
|
752
|
+
<a href="#AN">Formula (A.1)</a>
|
|
753
|
+
<a href="#Anote1">Formula ((??))</a>
|
|
754
|
+
<a href="#Anote2">Formula (A.2)</a>
|
|
723
755
|
</p>
|
|
724
756
|
</div>
|
|
725
757
|
<br/>
|
|
@@ -750,6 +782,14 @@ RSpec.describe IsoDoc do
|
|
|
750
782
|
</div>
|
|
751
783
|
<br/>
|
|
752
784
|
<div id="annex1" class="Section3">
|
|
785
|
+
<h1 class='Annex'>
|
|
786
|
+
<b>Annex A</b>
|
|
787
|
+
<br/>
|
|
788
|
+
(informative)
|
|
789
|
+
<br/>
|
|
790
|
+
<br/>
|
|
791
|
+
<b/>
|
|
792
|
+
</h1>
|
|
753
793
|
<div id="annex1a"><h2>A.1. </h2>
|
|
754
794
|
<div id="AN" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (A.1)</p></div>
|
|
755
795
|
</div>
|
|
@@ -838,9 +878,9 @@ RSpec.describe IsoDoc do
|
|
|
838
878
|
<a href="#N">Clause 1, Requirement 2</a>
|
|
839
879
|
<a href="#note1">Clause 3.1, Requirement 3</a>
|
|
840
880
|
<a href="#note2">Clause 3.1, Requirement 4</a>
|
|
841
|
-
<a href="#AN">
|
|
842
|
-
<a href="#Anote1">
|
|
843
|
-
<a href="#Anote2">
|
|
881
|
+
<a href="#AN">Requirement A.1</a>
|
|
882
|
+
<a href="#Anote1">Requirement (??)</a>
|
|
883
|
+
<a href="#Anote2">Requirement A.2</a>
|
|
844
884
|
</p>
|
|
845
885
|
</div>
|
|
846
886
|
<br/>
|
|
@@ -881,6 +921,14 @@ RSpec.describe IsoDoc do
|
|
|
881
921
|
</div>
|
|
882
922
|
<br/>
|
|
883
923
|
<div id="annex1" class="Section3">
|
|
924
|
+
<h1 class='Annex'>
|
|
925
|
+
<b>Annex A</b>
|
|
926
|
+
<br/>
|
|
927
|
+
(informative)
|
|
928
|
+
<br/>
|
|
929
|
+
<br/>
|
|
930
|
+
<b/>
|
|
931
|
+
</h1>
|
|
884
932
|
<div id="annex1a"><h2>A.1. </h2>
|
|
885
933
|
<div class="require"><p class="RecommendationTitle">Requirement A.1:</p>
|
|
886
934
|
<span class="stem">(#(r = 1 %)#)</span>
|
|
@@ -975,9 +1023,9 @@ OUTPUT
|
|
|
975
1023
|
<a href="#N">Clause 1, Recommendation 2</a>
|
|
976
1024
|
<a href="#note1">Clause 3.1, Recommendation 3</a>
|
|
977
1025
|
<a href="#note2">Clause 3.1, Recommendation 4</a>
|
|
978
|
-
<a href="#AN">
|
|
979
|
-
<a href="#Anote1">
|
|
980
|
-
<a href="#Anote2">
|
|
1026
|
+
<a href="#AN">Recommendation A.1</a>
|
|
1027
|
+
<a href="#Anote1">Recommendation (??)</a>
|
|
1028
|
+
<a href="#Anote2">Recommendation A.2</a>
|
|
981
1029
|
</p>
|
|
982
1030
|
</div>
|
|
983
1031
|
<br/>
|
|
@@ -1018,6 +1066,14 @@ OUTPUT
|
|
|
1018
1066
|
</div>
|
|
1019
1067
|
<br/>
|
|
1020
1068
|
<div id="annex1" class="Section3">
|
|
1069
|
+
<h1 class='Annex'>
|
|
1070
|
+
<b>Annex A</b>
|
|
1071
|
+
<br/>
|
|
1072
|
+
(informative)
|
|
1073
|
+
<br/>
|
|
1074
|
+
<br/>
|
|
1075
|
+
<b/>
|
|
1076
|
+
</h1>
|
|
1021
1077
|
<div id="annex1a"><h2>A.1. </h2>
|
|
1022
1078
|
<div class="recommend"><p class="RecommendationTitle">Recommendation A.1:</p>
|
|
1023
1079
|
<span class="stem">(#(r = 1 %)#)</span>
|
|
@@ -1112,9 +1168,9 @@ OUTPUT
|
|
|
1112
1168
|
<a href="#N">Clause 1, Permission 2</a>
|
|
1113
1169
|
<a href="#note1">Clause 3.1, Permission 3</a>
|
|
1114
1170
|
<a href="#note2">Clause 3.1, Permission 4</a>
|
|
1115
|
-
<a href="#AN">
|
|
1116
|
-
<a href="#Anote1">
|
|
1117
|
-
<a href="#Anote2">
|
|
1171
|
+
<a href="#AN">Permission A.1</a>
|
|
1172
|
+
<a href="#Anote1">Permission (??)</a>
|
|
1173
|
+
<a href="#Anote2">Permission A.2</a>
|
|
1118
1174
|
</p>
|
|
1119
1175
|
</div>
|
|
1120
1176
|
<br/>
|
|
@@ -1155,6 +1211,14 @@ OUTPUT
|
|
|
1155
1211
|
</div>
|
|
1156
1212
|
<br/>
|
|
1157
1213
|
<div id="annex1" class="Section3">
|
|
1214
|
+
<h1 class='Annex'>
|
|
1215
|
+
<b>Annex A</b>
|
|
1216
|
+
<br/>
|
|
1217
|
+
(informative)
|
|
1218
|
+
<br/>
|
|
1219
|
+
<br/>
|
|
1220
|
+
<b/>
|
|
1221
|
+
</h1>
|
|
1158
1222
|
<div id="annex1a"><h2>A.1. </h2>
|
|
1159
1223
|
<div class="permission"><p class="RecommendationTitle">Permission A.1:</p>
|
|
1160
1224
|
<span class="stem">(#(r = 1 %)#)</span>
|
|
@@ -1232,11 +1296,11 @@ OUTPUT
|
|
|
1232
1296
|
<a href="#N">Clause 1, Permission 1-1-1</a>
|
|
1233
1297
|
<a href="#Q1">Clause 1, Requirement 1-1</a>
|
|
1234
1298
|
<a href="#R1">Clause 1, Recommendation 1-1</a>
|
|
1235
|
-
<a href="#AN1">
|
|
1236
|
-
<a href="#AN2">
|
|
1237
|
-
<a href="#AN">
|
|
1238
|
-
<a href="#AQ1">
|
|
1239
|
-
<a href="#AR1">
|
|
1299
|
+
<a href="#AN1">Permission A.1</a>
|
|
1300
|
+
<a href="#AN2">Permission A.1-1</a>
|
|
1301
|
+
<a href="#AN">Permission A.1-1-1</a>
|
|
1302
|
+
<a href="#AQ1">Requirement A.1-1</a>
|
|
1303
|
+
<a href="#AR1">Recommendation A.1-1</a>
|
|
1240
1304
|
</p>
|
|
1241
1305
|
</div>
|
|
1242
1306
|
<p class="zzSTDTitle1"/>
|
|
@@ -1457,6 +1521,14 @@ OUTPUT
|
|
|
1457
1521
|
</div>
|
|
1458
1522
|
<br/>
|
|
1459
1523
|
<div id="annex1" class="Section3">
|
|
1524
|
+
<h1 class='Annex'>
|
|
1525
|
+
<b>Annex A</b>
|
|
1526
|
+
<br/>
|
|
1527
|
+
(informative)
|
|
1528
|
+
<br/>
|
|
1529
|
+
<br/>
|
|
1530
|
+
<b/>
|
|
1531
|
+
</h1>
|
|
1460
1532
|
<div id="annex1a"><h2>A.1. </h2>
|
|
1461
1533
|
<p class="TableTitle" style="text-align:center;">Table A.1 — Repeatability and reproducibility of husked rice yield</p><table id="AN" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">11</td></tr></tbody></table>
|
|
1462
1534
|
</div>
|
|
@@ -1807,6 +1879,14 @@ OUTPUT
|
|
|
1807
1879
|
</div>
|
|
1808
1880
|
<br/>
|
|
1809
1881
|
<div id="annex1" class="Section3">
|
|
1882
|
+
<h1 class='Annex'>
|
|
1883
|
+
<b>Annex A</b>
|
|
1884
|
+
<br/>
|
|
1885
|
+
(informative)
|
|
1886
|
+
<br/>
|
|
1887
|
+
<br/>
|
|
1888
|
+
<b/>
|
|
1889
|
+
</h1>
|
|
1810
1890
|
<div id="annex1a"><h2>A.1. </h2>
|
|
1811
1891
|
<ol type="a" id="AN">
|
|
1812
1892
|
<p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
|
|
@@ -1938,6 +2018,14 @@ OUTPUT
|
|
|
1938
2018
|
</div>
|
|
1939
2019
|
<br/>
|
|
1940
2020
|
<div id="annex1" class="Section3">
|
|
2021
|
+
<h1 class='Annex'>
|
|
2022
|
+
<b>Annex A</b>
|
|
2023
|
+
<br/>
|
|
2024
|
+
(informative)
|
|
2025
|
+
<br/>
|
|
2026
|
+
<br/>
|
|
2027
|
+
<b/>
|
|
2028
|
+
</h1>
|
|
1941
2029
|
<div id="annex1a"><h2>A.1. </h2>
|
|
1942
2030
|
<ol type="a" id="ANl">
|
|
1943
2031
|
<li id="AN"><p>A</p></li>
|