isodoc 1.0.22 → 1.0.27

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 +12 -5
  3. data/.github/workflows/ubuntu.yml +27 -6
  4. data/.github/workflows/windows.yml +13 -7
  5. data/README.adoc +3 -2
  6. data/lib/isodoc-yaml/i18n-en.yaml +18 -1
  7. data/lib/isodoc-yaml/i18n-fr.yaml +18 -1
  8. data/lib/isodoc-yaml/i18n-zh-Hans.yaml +18 -1
  9. data/lib/isodoc/base_style/bands.scss +6 -3
  10. data/lib/isodoc/base_style/reset.scss +1 -1
  11. data/lib/isodoc/convert.rb +1 -0
  12. data/lib/isodoc/function/blocks.rb +5 -0
  13. data/lib/isodoc/function/cleanup.rb +12 -1
  14. data/lib/isodoc/function/i18n.rb +5 -5
  15. data/lib/isodoc/function/inline.rb +47 -12
  16. data/lib/isodoc/function/references.rb +47 -33
  17. data/lib/isodoc/function/reqt.rb +21 -6
  18. data/lib/isodoc/function/section.rb +18 -8
  19. data/lib/isodoc/function/table.rb +0 -1
  20. data/lib/isodoc/function/to_word_html.rb +4 -2
  21. data/lib/isodoc/function/utils.rb +10 -4
  22. data/lib/isodoc/function/xref_gen.rb +2 -1
  23. data/lib/isodoc/function/xref_sect_gen.rb +24 -24
  24. data/lib/isodoc/headlesshtml_convert.rb +5 -0
  25. data/lib/isodoc/html_convert.rb +5 -0
  26. data/lib/isodoc/html_function/footnotes.rb +2 -2
  27. data/lib/isodoc/html_function/html.rb +3 -0
  28. data/lib/isodoc/html_function/postprocess.rb +3 -2
  29. data/lib/isodoc/metadata.rb +30 -7
  30. data/lib/isodoc/metadata_date.rb +39 -0
  31. data/lib/isodoc/pdf_convert.rb +5 -0
  32. data/lib/isodoc/version.rb +1 -1
  33. data/lib/isodoc/word_convert.rb +5 -0
  34. data/lib/isodoc/word_function/body.rb +0 -4
  35. data/lib/isodoc/word_function/footnotes.rb +2 -2
  36. data/lib/isodoc/word_function/postprocess.rb +13 -2
  37. data/lib/isodoc/word_function/table.rb +1 -3
  38. data/lib/isodoc/xslfo_convert.rb +5 -0
  39. data/spec/isodoc/blocks_spec.rb +188 -8
  40. data/spec/isodoc/cleanup_spec.rb +181 -18
  41. data/spec/isodoc/i18n_spec.rb +12 -12
  42. data/spec/isodoc/inline_spec.rb +65 -5
  43. data/spec/isodoc/metadata_spec.rb +77 -2
  44. data/spec/isodoc/postproc_spec.rb +33 -11
  45. data/spec/isodoc/ref_spec.rb +12 -6
  46. data/spec/isodoc/section_spec.rb +220 -205
  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 +64 -26
  50. metadata +3 -2
data/spec/isodoc/table_spec.rb CHANGED
@@ -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>
@@ -217,7 +217,7 @@ RSpec.describe IsoDoc do
217
217
  <h1 class="ForewordTitle">Foreword</h1>
218
218
  <p class="TableTitle" style="text-align:center;">Table 1</p>
219
219
  <div align="center" class="table_container">
220
- <table id="tableD-0" 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;">
220
+ <table id="tableD-0" class="MsoISOTable" style="mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;">
221
221
  <tbody>
222
222
  <tr>
223
223
  <td 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;">A</td>
@@ -233,7 +233,7 @@ RSpec.describe IsoDoc do
233
233
  </span>
234
234
  </p>
235
235
  <div align="center" class="table_container">
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%">
236
+ <table id="tableD-1" class="MsoISOTable" style="mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;" title="tool tip" summary="long desc" width="70%">
237
237
  <thead>
238
238
  <tr>
239
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>
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
@@ -63,6 +63,17 @@ RSpec.describe IsoDoc do
63
63
  INPUT
64
64
  end
65
65
 
66
+ it "does not warn of missing crossreference if text is supplied" do
67
+ expect { IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true) }.not_to output(/No label has been processed for ID N1/).to_stderr
68
+ <iso-standard xmlns="http://riboseinc.com/isoxml">
69
+ <preface>
70
+ <foreword>
71
+ <p>
72
+ <xref target="N1">abc</xref>
73
+ </preface>
74
+ </iso-standard>
75
+ INPUT
76
+ end
66
77
 
67
78
  it "cross-references notes" do
68
79
  expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
@@ -165,7 +176,7 @@ RSpec.describe IsoDoc do
165
176
  <a href="#N">Note</a>
166
177
  </p>
167
178
  </div>
168
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
179
+ <div id="terms"><h1>2.&#160; </h1>
169
180
  </div>
170
181
  <div id="widgets">
171
182
  <h1>3.&#160; Widgets</h1>
@@ -334,7 +345,7 @@ RSpec.describe IsoDoc do
334
345
  <a href="#N">Figure 2</a>
335
346
  </p>
336
347
  </div>
337
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
348
+ <div id="terms"><h1>2.&#160; </h1>
338
349
  </div>
339
350
  <div id="widgets">
340
351
  <h1>3.&#160; Widgets</h1>
@@ -481,7 +492,7 @@ RSpec.describe IsoDoc do
481
492
  <div id="scope">
482
493
  <h1>1.&#160; Scope</h1>
483
494
  </div>
484
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
495
+ <div id="terms"><h1>2.&#160; </h1>
485
496
  </div>
486
497
  <div id="widgets">
487
498
  <h1>3.&#160; Widgets</h1>
@@ -631,7 +642,7 @@ RSpec.describe IsoDoc do
631
642
  <a href="#N">Example</a>
632
643
  </p>
633
644
  </div>
634
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
645
+ <div id="terms"><h1>2.&#160; </h1>
635
646
  </div>
636
647
  <div id="widgets">
637
648
  <h1>3.&#160; Widgets</h1>
@@ -770,7 +781,7 @@ RSpec.describe IsoDoc do
770
781
  <a href="#N">Formula (2)</a>
771
782
  </p>
772
783
  </div>
773
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
784
+ <div id="terms"><h1>2.&#160; </h1>
774
785
  </div>
775
786
  <div id="widgets">
776
787
  <h1>3.&#160; Widgets</h1>
@@ -905,7 +916,7 @@ RSpec.describe IsoDoc do
905
916
  <a href="#N">Requirement 2</a>
906
917
  </p>
907
918
  </div>
908
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
919
+ <div id="terms"><h1>2.&#160; </h1>
909
920
  </div>
910
921
  <div id="widgets">
911
922
  <h1>3.&#160; Widgets</h1>
@@ -1050,7 +1061,7 @@ OUTPUT
1050
1061
  <a href="#N">Recommendation 2</a>
1051
1062
  </p>
1052
1063
  </div>
1053
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
1064
+ <div id="terms"><h1>2.&#160; </h1>
1054
1065
  </div>
1055
1066
  <div id="widgets">
1056
1067
  <h1>3.&#160; Widgets</h1>
@@ -1195,7 +1206,7 @@ OUTPUT
1195
1206
  <a href="#N">Permission 2</a>
1196
1207
  </p>
1197
1208
  </div>
1198
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
1209
+ <div id="terms"><h1>2.&#160; </h1>
1199
1210
  </div>
1200
1211
  <div id="widgets">
1201
1212
  <h1>3.&#160; Widgets</h1>
@@ -1480,14 +1491,14 @@ OUTPUT
1480
1491
  <table id="N1" class="MsoISOTable" style="border-width:1px;border-spacing:0;">
1481
1492
  <tbody>
1482
1493
  <tr>
1483
- <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>
1484
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">13</td>
1485
- <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>
1486
1497
  </tr>
1487
1498
  </tbody>
1488
1499
  </table>
1489
1500
  <div id="xyz"><h2>Preparatory</h2>
1490
- <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>
1491
1502
  </div>
1492
1503
  </div>
1493
1504
  <p class="zzSTDTitle1"/>
@@ -1499,9 +1510,9 @@ OUTPUT
1499
1510
  <table id="N" class="MsoISOTable" style="border-width:1px;border-spacing:0;">
1500
1511
  <tbody>
1501
1512
  <tr>
1502
- <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>
1503
- <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">13</td>
1504
- <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>
1505
1516
  </tr>
1506
1517
  </tbody>
1507
1518
  </table>
@@ -1509,13 +1520,13 @@ OUTPUT
1509
1520
  <a href="#N">Table 2</a>
1510
1521
  </p>
1511
1522
  </div>
1512
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
1523
+ <div id="terms"><h1>2.&#160; </h1>
1513
1524
  </div>
1514
1525
  <div id="widgets">
1515
1526
  <h1>3.&#160; Widgets</h1>
1516
1527
  <div id="widgets1"><h2>3.1.&#160;</h2>
1517
- <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>
1518
- <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>
1519
1530
  <p> <a href="#note1">Table 3</a> <a href="#note2">Table 4</a> </p>
1520
1531
  </div>
1521
1532
  </div>
@@ -1530,11 +1541,11 @@ OUTPUT
1530
1541
  <b/>
1531
1542
  </h1>
1532
1543
  <div id="annex1a"><h2>A.1.&#160;</h2>
1533
- <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>
1534
1545
  </div>
1535
1546
  <div id="annex1b"><h2>A.2.&#160;</h2>
1536
- <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>
1537
- <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>
1538
1549
  </div>
1539
1550
  </div>
1540
1551
  </div>
@@ -1588,7 +1599,7 @@ OUTPUT
1588
1599
  <div id="scope">
1589
1600
  <h1>1.&#160; Scope</h1>
1590
1601
  </div>
1591
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
1602
+ <div id="terms"><h1>2.&#160; </h1>
1592
1603
  <p class="TermNum" id="_waxy_rice">2.1.</p><p class="Terms" style="text-align:left;">waxy rice</p>
1593
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>
1594
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>
@@ -1620,6 +1631,9 @@ OUTPUT
1620
1631
  <xref target="P"/>
1621
1632
  <xref target="Q"/>
1622
1633
  <xref target="Q1"/>
1634
+ <xref target="QQ"/>
1635
+ <xref target="QQ1"/>
1636
+ <xref target="QQ2"/>
1623
1637
  <xref target="R"/>
1624
1638
  <xref target="S"/>
1625
1639
  </p>
@@ -1668,11 +1682,17 @@ OUTPUT
1668
1682
  <title>Annex A.1a</title>
1669
1683
  </clause>
1670
1684
  </clause>
1671
- </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">
1672
1692
  <title>Normative References</title>
1673
1693
  </references><clause id="S" obligation="informative">
1674
1694
  <title>Bibliography</title>
1675
- <references id="T" obligation="informative">
1695
+ <references id="T" obligation="informative" normative="false">
1676
1696
  <title>Bibliography Subsection</title>
1677
1697
  </references>
1678
1698
  </clause>
@@ -1698,6 +1718,9 @@ OUTPUT
1698
1718
  <a href="#P">Annex A</a>
1699
1719
  <a href="#Q">Annex A.1</a>
1700
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>
1701
1724
  <a href="#R">Clause 2</a>
1702
1725
  <a href="#S">Bibliography</a>
1703
1726
  </p>
@@ -1753,6 +1776,21 @@ OUTPUT
1753
1776
  <div id="Q1">
1754
1777
  <h3>A.1.1.&#160; Annex A.1a</h3>
1755
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>
1756
1794
  </div>
1757
1795
  </div>
1758
1796
  <br/>
@@ -1864,7 +1902,7 @@ OUTPUT
1864
1902
  <li><p>A</p></li>
1865
1903
  </ol>
1866
1904
  </div>
1867
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
1905
+ <div id="terms"><h1>2.&#160; </h1>
1868
1906
  </div>
1869
1907
  <div id="widgets">
1870
1908
  <h1>3.&#160; Widgets</h1>
@@ -2003,7 +2041,7 @@ OUTPUT
2003
2041
  <li id="N"><p>A</p></li>
2004
2042
  </ol>
2005
2043
  </div>
2006
- <div id="terms"><h1>2.&#160; Terms and definitions</h1>
2044
+ <div id="terms"><h1>2.&#160; </h1>
2007
2045
  </div>
2008
2046
  <div id="widgets">
2009
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.22
4
+ version: 1.0.27
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-03-20 00:00:00.000000000 Z
11
+ date: 2020-05-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciimath
@@ -345,6 +345,7 @@ files:
345
345
  - lib/isodoc/html_function/html.rb
346
346
  - lib/isodoc/html_function/postprocess.rb
347
347
  - lib/isodoc/metadata.rb
348
+ - lib/isodoc/metadata_date.rb
348
349
  - lib/isodoc/pdf_convert.rb
349
350
  - lib/isodoc/version.rb
350
351
  - lib/isodoc/word_convert.rb