isodoc 1.0.23 → 1.0.28

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 (50) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/macos.yml +10 -2
  3. data/.github/workflows/ubuntu.yml +13 -3
  4. data/.github/workflows/windows.yml +10 -2
  5. data/isodoc.gemspec +1 -1
  6. data/lib/isodoc-yaml/i18n-en.yaml +3 -1
  7. data/lib/isodoc-yaml/i18n-fr.yaml +3 -1
  8. data/lib/isodoc-yaml/i18n-zh-Hans.yaml +3 -1
  9. data/lib/isodoc/base_style/reset.scss +1 -1
  10. data/lib/isodoc/convert.rb +1 -0
  11. data/lib/isodoc/function/blocks.rb +6 -1
  12. data/lib/isodoc/function/cleanup.rb +16 -2
  13. data/lib/isodoc/function/i18n.rb +5 -5
  14. data/lib/isodoc/function/inline.rb +77 -79
  15. data/lib/isodoc/function/inline_simple.rb +72 -0
  16. data/lib/isodoc/function/references.rb +49 -37
  17. data/lib/isodoc/function/section.rb +19 -8
  18. data/lib/isodoc/function/table.rb +0 -1
  19. data/lib/isodoc/function/to_word_html.rb +23 -13
  20. data/lib/isodoc/function/utils.rb +11 -5
  21. data/lib/isodoc/function/xref_gen.rb +2 -1
  22. data/lib/isodoc/function/xref_sect_gen.rb +24 -24
  23. data/lib/isodoc/headlesshtml_convert.rb +5 -0
  24. data/lib/isodoc/html_convert.rb +5 -0
  25. data/lib/isodoc/html_function/footnotes.rb +3 -3
  26. data/lib/isodoc/html_function/html.rb +15 -0
  27. data/lib/isodoc/html_function/postprocess.rb +6 -5
  28. data/lib/isodoc/metadata.rb +10 -3
  29. data/lib/isodoc/metadata_date.rb +19 -7
  30. data/lib/isodoc/pdf_convert.rb +5 -0
  31. data/lib/isodoc/version.rb +1 -1
  32. data/lib/isodoc/word_convert.rb +5 -0
  33. data/lib/isodoc/word_function/body.rb +0 -4
  34. data/lib/isodoc/word_function/footnotes.rb +3 -3
  35. data/lib/isodoc/word_function/postprocess.rb +13 -2
  36. data/lib/isodoc/xslfo_convert.rb +5 -0
  37. data/spec/assets/i18n.yaml +4 -1
  38. data/spec/isodoc/blocks_spec.rb +59 -8
  39. data/spec/isodoc/cleanup_spec.rb +317 -25
  40. data/spec/isodoc/footnotes_spec.rb +20 -5
  41. data/spec/isodoc/i18n_spec.rb +12 -12
  42. data/spec/isodoc/inline_spec.rb +118 -5
  43. data/spec/isodoc/metadata_spec.rb +8 -3
  44. data/spec/isodoc/postproc_spec.rb +34 -12
  45. data/spec/isodoc/ref_spec.rb +120 -51
  46. data/spec/isodoc/section_spec.rb +236 -207
  47. data/spec/isodoc/table_spec.rb +24 -24
  48. data/spec/isodoc/terms_spec.rb +50 -6
  49. data/spec/isodoc/xref_spec.rb +53 -26
  50. metadata +5 -4
data/spec/isodoc/table_spec.rb CHANGED
@@ -68,7 +68,7 @@ RSpec.describe IsoDoc do
68
68
  <div>
69
69
  <h1 class="ForewordTitle">Foreword</h1>
70
70
  <p class="TableTitle" style="text-align:center;">Table 1&#160;&#8212; Repeatability and reproducibility of <i>husked</i> rice yield
71
- <a rel='footnote' href='#fn:1' epub:type='footnote'>
71
+ <a class='FootnoteRef' href='#fn:1'>
72
72
  <sup>1</sup>
73
73
  </a>
74
74
  </p>
@@ -78,41 +78,41 @@ RSpec.describe IsoDoc do
78
78
  </caption>
79
79
  <thead>
80
80
  <tr>
81
- <td rowspan="2" style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Description</td>
82
- <td colspan="4" style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;" scope="colgroup">Rice sample</td>
81
+ <td rowspan="2" style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;" scope="col">Description</td>
82
+ <td colspan="4" style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;" scope="colgroup">Rice sample</td>
83
83
  </tr>
84
84
  <tr>
85
- <td style="text-align:left;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Arborio</td>
86
- <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside class="footnote"><div id="fn:tableD-1a"><span><span id="tableD-1a" class="TableFootnoteRef">a</span>&#160; </span>
85
+ <td style="text-align:left;border-top:none;border-bottom:solid windowtext 1.5pt;" scope="col">Arborio</td>
86
+ <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;" scope="col">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside class="footnote"><div id="fn:tableD-1a"><span><span id="tableD-1a" class="TableFootnoteRef">a</span>&#160; </span>
87
87
  <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p>
88
88
  </div></aside></td>
89
- <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Balilla<a href="#tableD-1a" class="TableFootnoteRef">a</a></td>
90
- <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Thaibonnet</td>
89
+ <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;" scope="col">Balilla<a href="#tableD-1a" class="TableFootnoteRef">a</a></td>
90
+ <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;" scope="col">Thaibonnet</td>
91
91
  </tr>
92
92
  </thead>
93
93
  <tbody>
94
94
  <tr>
95
- <th style="font-weight:bold;text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;" scope="row">Number of laboratories retained after eliminating outliers</th>
96
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;">13</td>
97
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;">11</td>
98
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;">13</td>
99
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;">13</td>
95
+ <th style="font-weight:bold;text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;" scope="row">Number of laboratories retained after eliminating outliers</th>
96
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">13</td>
97
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">11</td>
98
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">13</td>
99
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">13</td>
100
100
  </tr>
101
101
  <tr>
102
- <td style="text-align:left;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;">Mean value, g/100 g</td>
103
- <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;">81,2</td>
104
- <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;">82,0</td>
105
- <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;">81,8</td>
106
- <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;">77,7</td>
102
+ <td style="text-align:left;border-top:none;border-bottom:solid windowtext 1.5pt;">Mean value, g/100 g</td>
103
+ <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;">81,2</td>
104
+ <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;">82,0</td>
105
+ <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;">81,8</td>
106
+ <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;">77,7</td>
107
107
  </tr>
108
108
  </tbody>
109
109
  <tfoot>
110
110
  <tr>
111
- <td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">Reproducibility limit, <span class="stem">(#(R)#)</span> (= 2,83 <span class="stem">(#(s_R)#)</span>)</td>
112
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">2,89</td>
113
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">0,57</td>
114
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">2,26</td>
115
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">6,06</td>
111
+ <td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Reproducibility limit, <span class="stem">(#(R)#)</span> (= 2,83 <span class="stem">(#(s_R)#)</span>)</td>
112
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">2,89</td>
113
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">0,57</td>
114
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">2,26</td>
115
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">6,06</td>
116
116
  </tr>
117
117
  </tfoot>
118
118
  <dl>
@@ -128,7 +128,7 @@ RSpec.describe IsoDoc do
128
128
  <table id="tableD-2" class="MsoISOTable" style="border-width:1px;border-spacing:0;">
129
129
  <tbody>
130
130
  <tr>
131
- <td style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">A</td>
131
+ <td style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">A</td>
132
132
  </tr>
133
133
  </tbody>
134
134
  </table>
@@ -227,7 +227,7 @@ RSpec.describe IsoDoc do
227
227
  </div>
228
228
  <p class="TableTitle" style="text-align:center;">Table 2&#160;&#8212; Repeatability and reproducibility of husked rice yield
229
229
  <span style='mso-bookmark:_Ref'>
230
- <a href='#ftn1' epub:type='footnote'>
230
+ <a href='#ftn1' epub:type='footnote' class='FootnoteRef'>
231
231
  <sup>1</sup>
232
232
  </a>
233
233
  </span>
data/spec/isodoc/terms_spec.rb CHANGED
@@ -28,7 +28,26 @@ RSpec.describe IsoDoc do
28
28
  <modification>
29
29
  <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
30
30
  </modification>
31
- </termsource></term>
31
+ </termsource>
32
+
33
+ <termsource status='identical'>
34
+ <origin citeas=''>
35
+ <termref base='IEV' target='xyz'>t1</termref>
36
+ </origin>
37
+ </termsource>
38
+
39
+ <termsource status='modified'>
40
+ <origin citeas=''>
41
+ <termref base='IEV' target='xyz'/>
42
+ </origin>
43
+ <modification>
44
+ <p id='_'>with adjustments</p>
45
+ </modification>
46
+ </termsource>
47
+
48
+
49
+
50
+ </term>
32
51
 
33
52
  <term id="paddy"><preferred>paddy</preferred><admitted>paddy rice</admitted>
34
53
  <admitted>rough rice</admitted>
@@ -55,7 +74,7 @@ RSpec.describe IsoDoc do
55
74
  INPUT
56
75
  #{HTML_HDR}
57
76
  <p class="zzSTDTitle1"/>
58
- <div id="_terms_and_definitions"><h1>1.&#160; Terms and definitions</h1><p>For the purposes of this document,
77
+ <div id="_terms_and_definitions"><h1>1.&#160; Terms and Definitions</h1><p>For the purposes of this document,
59
78
  the following terms and definitions apply.</p>
60
79
  <p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
61
80
 
@@ -75,7 +94,10 @@ RSpec.describe IsoDoc do
75
94
  <p>[TERMREF]
76
95
  <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
77
96
  [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
78
- [/TERMREF]</p><p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
97
+ [/TERMREF]</p>
98
+ <p>[TERMREF] Termbase IEV, term ID xyz [/TERMREF]</p>
99
+ <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
100
+ <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
79
101
  <p class="AltTerms" style="text-align:left;">rough rice</p>
80
102
  <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
81
103
  <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
@@ -122,7 +144,26 @@ OUTPUT
122
144
  <modification>
123
145
  <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
124
146
  </modification>
125
- </termsource></term>
147
+ </termsource>
148
+
149
+ <termsource status='identical'>
150
+ <origin citeas=''>
151
+ <termref base='IEV' target='xyz'>t1</termref>
152
+ </origin>
153
+ </termsource>
154
+
155
+ <termsource status='modified'>
156
+ <origin citeas=''>
157
+ <termref base='IEV' target='xyz'/>
158
+ </origin>
159
+ <modification>
160
+ <p id='_'>with adjustments</p>
161
+ </modification>
162
+ </termsource>
163
+
164
+
165
+
166
+ </term>
126
167
 
127
168
  <term id="paddy"><preferred>paddy</preferred><admitted>paddy rice</admitted>
128
169
  <admitted>rough rice</admitted>
@@ -149,7 +190,7 @@ OUTPUT
149
190
  INPUT
150
191
  #{WORD_HDR}
151
192
  <p class="zzSTDTitle1"/>
152
- <div id="_terms_and_definitions"><h1>1.<span style="mso-tab-count:1">&#160; </span>Terms and definitions</h1><p>For the purposes of this document,
193
+ <div id="_terms_and_definitions"><h1>1.<span style="mso-tab-count:1">&#160; </span>Terms and Definitions</h1><p>For the purposes of this document,
153
194
  the following terms and definitions apply.</p>
154
195
  <p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
155
196
 
@@ -169,7 +210,10 @@ OUTPUT
169
210
  <p>[TERMREF]
170
211
  <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
171
212
  [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
172
- [/TERMREF]</p><p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
213
+ [/TERMREF]</p>
214
+ <p>[TERMREF] Termbase IEV, term ID xyz [/TERMREF]</p>
215
+ <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
216
+ <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
173
217
  <p class="AltTerms" style="text-align:left;">rough rice</p>
174
218
  <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
175
219
  <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
data/spec/isodoc/xref_spec.rb CHANGED
@@ -176,7 +176,7 @@ RSpec.describe IsoDoc do
176
176
  <a href="#N">Note</a>
177
177
  </p>
178
178
  </div>
179
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
179
+ <div id="terms"><h1>2.&#160; </h1>
180
180
  </div>
181
181
  <div id="widgets">
182
182
  <h1>3.&#160; Widgets</h1>
@@ -345,7 +345,7 @@ RSpec.describe IsoDoc do
345
345
  <a href="#N">Figure 2</a>
346
346
  </p>
347
347
  </div>
348
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
348
+ <div id="terms"><h1>2.&#160; </h1>
349
349
  </div>
350
350
  <div id="widgets">
351
351
  <h1>3.&#160; Widgets</h1>
@@ -492,7 +492,7 @@ RSpec.describe IsoDoc do
492
492
  <div id="scope">
493
493
  <h1>1.&#160; Scope</h1>
494
494
  </div>
495
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
495
+ <div id="terms"><h1>2.&#160; </h1>
496
496
  </div>
497
497
  <div id="widgets">
498
498
  <h1>3.&#160; Widgets</h1>
@@ -642,7 +642,7 @@ RSpec.describe IsoDoc do
642
642
  <a href="#N">Example</a>
643
643
  </p>
644
644
  </div>
645
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
645
+ <div id="terms"><h1>2.&#160; </h1>
646
646
  </div>
647
647
  <div id="widgets">
648
648
  <h1>3.&#160; Widgets</h1>
@@ -781,7 +781,7 @@ RSpec.describe IsoDoc do
781
781
  <a href="#N">Formula (2)</a>
782
782
  </p>
783
783
  </div>
784
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
784
+ <div id="terms"><h1>2.&#160; </h1>
785
785
  </div>
786
786
  <div id="widgets">
787
787
  <h1>3.&#160; Widgets</h1>
@@ -916,7 +916,7 @@ RSpec.describe IsoDoc do
916
916
  <a href="#N">Requirement 2</a>
917
917
  </p>
918
918
  </div>
919
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
919
+ <div id="terms"><h1>2.&#160; </h1>
920
920
  </div>
921
921
  <div id="widgets">
922
922
  <h1>3.&#160; Widgets</h1>
@@ -1061,7 +1061,7 @@ OUTPUT
1061
1061
  <a href="#N">Recommendation 2</a>
1062
1062
  </p>
1063
1063
  </div>
1064
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
1064
+ <div id="terms"><h1>2.&#160; </h1>
1065
1065
  </div>
1066
1066
  <div id="widgets">
1067
1067
  <h1>3.&#160; Widgets</h1>
@@ -1206,7 +1206,7 @@ OUTPUT
1206
1206
  <a href="#N">Permission 2</a>
1207
1207
  </p>
1208
1208
  </div>
1209
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
1209
+ <div id="terms"><h1>2.&#160; </h1>
1210
1210
  </div>
1211
1211
  <div id="widgets">
1212
1212
  <h1>3.&#160; Widgets</h1>
@@ -1491,14 +1491,14 @@ OUTPUT
1491
1491
  <table id="N1" class="MsoISOTable" style="border-width:1px;border-spacing:0;">
1492
1492
  <tbody>
1493
1493
  <tr>
1494
- <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>
1495
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">13</td>
1496
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">11</td>
1494
+ <td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td>
1495
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td>
1496
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td>
1497
1497
  </tr>
1498
1498
  </tbody>
1499
1499
  </table>
1500
1500
  <div id="xyz"><h2>Preparatory</h2>
1501
- <p class="TableTitle" style="text-align:center;">Repeatability and reproducibility of husked rice yield</p><table id="N2" 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>
1501
+ <p class="TableTitle" style="text-align:center;">Repeatability and reproducibility of husked rice yield</p><table id="N2" 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;">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;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
1502
1502
  </div>
1503
1503
  </div>
1504
1504
  <p class="zzSTDTitle1"/>
@@ -1510,9 +1510,9 @@ OUTPUT
1510
1510
  <table id="N" class="MsoISOTable" style="border-width:1px;border-spacing:0;">
1511
1511
  <tbody>
1512
1512
  <tr>
1513
- <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>
1514
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">13</td>
1515
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">11</td>
1513
+ <td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td>
1514
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td>
1515
+ <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td>
1516
1516
  </tr>
1517
1517
  </tbody>
1518
1518
  </table>
@@ -1520,13 +1520,13 @@ OUTPUT
1520
1520
  <a href="#N">Table 2</a>
1521
1521
  </p>
1522
1522
  </div>
1523
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
1523
+ <div id="terms"><h1>2.&#160; </h1>
1524
1524
  </div>
1525
1525
  <div id="widgets">
1526
1526
  <h1>3.&#160; Widgets</h1>
1527
1527
  <div id="widgets1"><h2>3.1.&#160;</h2>
1528
- <p class="TableTitle" style="text-align:center;">Table 3&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note1" 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>
1529
- <p class="TableTitle" style="text-align:center;">Table 4&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note2" 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>
1528
+ <p class="TableTitle" style="text-align:center;">Table 3&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note1" 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;">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;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
1529
+ <p class="TableTitle" style="text-align:center;">Table 4&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="note2" 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;">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;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
1530
1530
  <p> <a href="#note1">Table 3</a> <a href="#note2">Table 4</a> </p>
1531
1531
  </div>
1532
1532
  </div>
@@ -1541,11 +1541,11 @@ OUTPUT
1541
1541
  <b/>
1542
1542
  </h1>
1543
1543
  <div id="annex1a"><h2>A.1.&#160;</h2>
1544
- <p class="TableTitle" style="text-align:center;">Table A.1&#160;&#8212; 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>
1544
+ <p class="TableTitle" style="text-align:center;">Table A.1&#160;&#8212; 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;">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;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
1545
1545
  </div>
1546
1546
  <div id="annex1b"><h2>A.2.&#160;</h2>
1547
- <p class="TableTitle" style="text-align:center;">Repeatability and reproducibility of husked rice yield</p><table id="Anote1" 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>
1548
- <p class="TableTitle" style="text-align:center;">Table A.2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="Anote2" 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>
1547
+ <p class="TableTitle" style="text-align:center;">Repeatability and reproducibility of husked rice yield</p><table id="Anote1" 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;">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;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
1548
+ <p class="TableTitle" style="text-align:center;">Table A.2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p><table id="Anote2" 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;">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;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
1549
1549
  </div>
1550
1550
  </div>
1551
1551
  </div>
@@ -1599,7 +1599,7 @@ OUTPUT
1599
1599
  <div id="scope">
1600
1600
  <h1>1.&#160; Scope</h1>
1601
1601
  </div>
1602
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
1602
+ <div id="terms"><h1>2.&#160; </h1>
1603
1603
  <p class="TermNum" id="_waxy_rice">2.1.</p><p class="Terms" style="text-align:left;">waxy rice</p>
1604
1604
  <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div><p class="TermNum" id="_nonwaxy_rice">2.2.</p><p class="Terms" style="text-align:left;">nonwaxy rice</p>
1605
1605
  <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
@@ -1631,6 +1631,9 @@ OUTPUT
1631
1631
  <xref target="P"/>
1632
1632
  <xref target="Q"/>
1633
1633
  <xref target="Q1"/>
1634
+ <xref target="QQ"/>
1635
+ <xref target="QQ1"/>
1636
+ <xref target="QQ2"/>
1634
1637
  <xref target="R"/>
1635
1638
  <xref target="S"/>
1636
1639
  </p>
@@ -1679,11 +1682,17 @@ OUTPUT
1679
1682
  <title>Annex A.1a</title>
1680
1683
  </clause>
1681
1684
  </clause>
1682
- </annex><bibliography><references id="R" obligation="informative">
1685
+ </annex>
1686
+ <annex id="QQ">
1687
+ <terms id="QQ1">
1688
+ <term id="QQ2"/>
1689
+ </terms>
1690
+ </annex>
1691
+ <bibliography><references id="R" obligation="informative" normative="true">
1683
1692
  <title>Normative References</title>
1684
1693
  </references><clause id="S" obligation="informative">
1685
1694
  <title>Bibliography</title>
1686
- <references id="T" obligation="informative">
1695
+ <references id="T" obligation="informative" normative="false">
1687
1696
  <title>Bibliography Subsection</title>
1688
1697
  </references>
1689
1698
  </clause>
@@ -1709,6 +1718,9 @@ OUTPUT
1709
1718
  <a href="#P">Annex A</a>
1710
1719
  <a href="#Q">Annex A.1</a>
1711
1720
  <a href="#Q1">Annex A.1.1</a>
1721
+ <a href='#QQ'>Annex B</a>
1722
+ <a href='#QQ1'>Annex B</a>
1723
+ <a href='#QQ2'>Annex B.1</a>
1712
1724
  <a href="#R">Clause 2</a>
1713
1725
  <a href="#S">Bibliography</a>
1714
1726
  </p>
@@ -1764,6 +1776,21 @@ OUTPUT
1764
1776
  <div id="Q1">
1765
1777
  <h3>A.1.1.&#160; Annex A.1a</h3>
1766
1778
  </div>
1779
+ </div>
1780
+ </div>
1781
+ <br/>
1782
+ <div id='QQ' class='Section3'>
1783
+ <h1 class='Annex'>
1784
+ <b>Annex B</b>
1785
+ <br/>
1786
+ (informative)
1787
+ <br/>
1788
+ <br/>
1789
+ <b/>
1790
+ </h1>
1791
+ <div id='QQ1'>
1792
+ <h1>B.&#160; </h1>
1793
+ <p class='TermNum' id='QQ2'>B.1.</p>
1767
1794
  </div>
1768
1795
  </div>
1769
1796
  <br/>
@@ -1875,7 +1902,7 @@ OUTPUT
1875
1902
  <li><p>A</p></li>
1876
1903
  </ol>
1877
1904
  </div>
1878
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
1905
+ <div id="terms"><h1>2.&#160; </h1>
1879
1906
  </div>
1880
1907
  <div id="widgets">
1881
1908
  <h1>3.&#160; Widgets</h1>
@@ -2014,7 +2041,7 @@ OUTPUT
2014
2041
  <li id="N"><p>A</p></li>
2015
2042
  </ol>
2016
2043
  </div>
2017
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
2044
+ <div id="terms"><h1>2.&#160; </h1>
2018
2045
  </div>
2019
2046
  <div id="widgets">
2020
2047
  <h1>3.&#160; Widgets</h1>
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: 1.0.23
4
+ version: 1.0.28
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-04-03 00:00:00.000000000 Z
11
+ date: 2020-06-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciimath
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 2.2.1
131
+ version: 2.4.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 2.2.1
138
+ version: 2.4.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: metanorma
141
141
  requirement: !ruby/object:Gem::Requirement
@@ -324,6 +324,7 @@ files:
324
324
  - lib/isodoc/function/cleanup.rb
325
325
  - lib/isodoc/function/i18n.rb
326
326
  - lib/isodoc/function/inline.rb
327
+ - lib/isodoc/function/inline_simple.rb
327
328
  - lib/isodoc/function/lists.rb
328
329
  - lib/isodoc/function/references.rb
329
330
  - lib/isodoc/function/reqt.rb