metanorma-iso 2.2.1 → 2.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/automerge.yml +31 -0
- data/lib/isodoc/iso/html/style-human.css +1 -1
- data/lib/isodoc/iso/html/style-iso.css +1 -1
- data/lib/isodoc/iso/i18n-en.yaml +9 -4
- data/lib/isodoc/iso/i18n-fr.yaml +9 -3
- data/lib/isodoc/iso/i18n-ru.yaml +9 -2
- data/lib/isodoc/iso/i18n-zh-Hans.yaml +1 -2
- data/lib/isodoc/iso/iso.amendment.xsl +21 -3
- data/lib/isodoc/iso/iso.international-standard.xsl +21 -3
- data/lib/isodoc/iso/presentation_xref.rb +10 -7
- data/lib/isodoc/iso/sections.rb +1 -1
- data/lib/metanorma/iso/basicdoc.rng +0 -27
- data/lib/metanorma/iso/biblio-standoc.rng +164 -0
- data/lib/metanorma/iso/biblio.rng +45 -18
- data/lib/metanorma/iso/isodoc.rng +22 -194
- data/lib/metanorma/iso/isostandard-amd.rng +3 -54
- data/lib/metanorma/iso/isostandard-compile.rng +7 -0
- data/lib/metanorma/iso/isostandard.rng +1 -195
- data/lib/metanorma/iso/relaton-iso.rng +225 -0
- data/lib/metanorma/iso/validate.rb +6 -6
- data/lib/metanorma/iso/version.rb +1 -1
- data/lib/metanorma/requirements/modspec.rb +22 -38
- data/spec/isodoc/inline_spec.rb +1 -1
- data/spec/metanorma/validate_spec.rb +55 -55
- data/spec/requirements/requirement_components_spec.rb +51 -63
- data/spec/requirements/requirements_spec.rb +177 -262
- data/spec/vcr_cassettes/withdrawn_iso.yml +29 -29
- metadata +6 -2
@@ -30,7 +30,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
30
30
|
<name>Table 2 — Permission 1: First</name>
|
31
31
|
<tbody>
|
32
32
|
<tr>
|
33
|
-
<
|
33
|
+
<th>Identifier</th>
|
34
34
|
<td>
|
35
35
|
<tt>/ogc/recommendation/wfs/2</tt>
|
36
36
|
</td>
|
@@ -137,44 +137,35 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
137
137
|
<table id="A1" class="modspec" type="recommend">
|
138
138
|
<name>Table 1 — Permission 1: First</name>
|
139
139
|
<tbody>
|
140
|
-
<tr><
|
141
|
-
<tr><
|
140
|
+
<tr><th>Identifier</th><td><tt>/ogc/recommendation/wfs/2</tt></td></tr>
|
141
|
+
<tr><th>Subject</th><td>user</td></tr>
|
142
|
+
<tr><th>Prerequisites</th><td>/ss/584/2015/level/1<br/>
|
143
|
+
<eref type="inline" bibitemid="rfc2616" citeas="RFC 2616">RFC 2616 (HTTP/1.1)</eref></td></tr>
|
142
144
|
<tr>
|
143
|
-
<
|
145
|
+
<th>Control-class</th>
|
144
146
|
<td>Technical</td>
|
145
147
|
</tr>
|
146
148
|
<tr>
|
147
|
-
<
|
149
|
+
<th>Priority</th>
|
148
150
|
<td>P0</td>
|
149
151
|
</tr>
|
150
152
|
<tr>
|
151
|
-
<
|
152
|
-
<td>System and Communications Protection
|
153
|
+
<th>Family</th>
|
154
|
+
<td>System and Communications Protection<br/>
|
155
|
+
System and Communications Protocols</td>
|
153
156
|
</tr>
|
154
|
-
<tr>
|
155
|
-
|
156
|
-
<td>System and Communications Protocols</td>
|
157
|
-
</tr>
|
158
|
-
<tr>
|
159
|
-
<td>Statement</td><td>
|
160
|
-
<p id='_'>
|
161
|
-
I recommend
|
162
|
-
<em>this</em>
|
163
|
-
.
|
164
|
-
</p>
|
165
|
-
</td>
|
166
|
-
</tr>
|
167
|
-
<tr>
|
168
|
-
<td>Statement</td>
|
169
|
-
<td>
|
170
|
-
<dl>
|
171
|
-
<dt>A</dt>
|
172
|
-
<dd>B</dd>
|
173
|
-
<dt>C</dt>
|
174
|
-
<dd>D</dd>
|
175
|
-
</dl>
|
157
|
+
<tr><th>Statement</th><td>
|
158
|
+
<p id="_">I recommend <em>this</em>.</p>
|
176
159
|
</td>
|
177
160
|
</tr>
|
161
|
+
<tr>
|
162
|
+
<th>A</th>
|
163
|
+
<td>B</td>
|
164
|
+
</tr>
|
165
|
+
<tr>
|
166
|
+
<th>C</th>
|
167
|
+
<td>D</td>
|
168
|
+
</tr>
|
178
169
|
<tr>
|
179
170
|
<td colspan='2'>
|
180
171
|
<p id='_'>The measurement target shall be measured as:</p>
|
@@ -194,49 +185,49 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
194
185
|
</td>
|
195
186
|
</tr>
|
196
187
|
<tr>
|
197
|
-
<
|
188
|
+
<th>Test purpose</th>
|
198
189
|
<td>
|
199
190
|
<p>TEST PURPOSE</p>
|
200
191
|
</td>
|
201
192
|
</tr>
|
202
193
|
<tr>
|
203
|
-
<
|
194
|
+
<th>Test method</th>
|
204
195
|
<td>
|
205
196
|
<p>TEST METHOD</p>
|
206
197
|
</td>
|
207
198
|
</tr>
|
208
199
|
<tr>
|
209
|
-
<
|
200
|
+
<th>Conditions</th>
|
210
201
|
<td>
|
211
202
|
<p>CONDITIONS</p>
|
212
203
|
</td>
|
213
204
|
</tr>
|
214
205
|
<tr>
|
215
|
-
<
|
206
|
+
<th>A</th>
|
216
207
|
<td>
|
217
208
|
<p>FIRST PART</p>
|
218
209
|
</td>
|
219
210
|
</tr>
|
220
211
|
<tr>
|
221
|
-
<
|
212
|
+
<th>B</th>
|
222
213
|
<td>
|
223
214
|
<p>SECOND PART</p>
|
224
215
|
</td>
|
225
216
|
</tr>
|
226
217
|
<tr>
|
227
|
-
<
|
218
|
+
<th>C</th>
|
228
219
|
<td>
|
229
220
|
<p>THIRD PART</p>
|
230
221
|
</td>
|
231
222
|
</tr>
|
232
223
|
<tr>
|
233
|
-
<
|
224
|
+
<th>Reference</th>
|
234
225
|
<td>
|
235
226
|
<p>REFERENCE PART</p>
|
236
227
|
</td>
|
237
228
|
</tr>
|
238
229
|
<tr>
|
239
|
-
<
|
230
|
+
<th>Panda GHz express</th>
|
240
231
|
<td>
|
241
232
|
<p>PANDA PART</p>
|
242
233
|
</td>
|
@@ -279,65 +270,56 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
279
270
|
<table id='A1' class='modspec' style='border-width:1px;border-spacing:0;'>
|
280
271
|
<tbody>
|
281
272
|
<tr>
|
282
|
-
<
|
273
|
+
<th style='font-weight:bold;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;' scope='row'>Identifier</th>
|
283
274
|
<td style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>
|
284
275
|
<tt>/ogc/recommendation/wfs/2</tt>
|
285
276
|
</td>
|
286
277
|
</tr>
|
287
278
|
<tr>
|
288
|
-
<
|
279
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>Subject</th>
|
289
280
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>user</td>
|
290
281
|
</tr>
|
291
282
|
<tr>
|
292
|
-
<
|
293
|
-
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>/ss/584/2015/level/1</td>
|
294
|
-
</tr>
|
295
|
-
<tr>
|
296
|
-
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>Dependency</td>
|
283
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>Prerequisites</th>
|
297
284
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
285
|
+
/ss/584/2015/level/1
|
286
|
+
<br/>
|
298
287
|
<a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
|
299
288
|
</td>
|
300
289
|
</tr>
|
301
290
|
<tr>
|
302
|
-
<
|
291
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>Control-class</th>
|
303
292
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>Technical</td>
|
304
293
|
</tr>
|
305
294
|
<tr>
|
306
|
-
<
|
295
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>Priority</th>
|
307
296
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>P0</td>
|
308
297
|
</tr>
|
309
298
|
<tr>
|
310
|
-
<
|
311
|
-
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
299
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>Family</th>
|
300
|
+
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
301
|
+
System and Communications Protection
|
302
|
+
<br/>
|
303
|
+
System and Communications Protocols
|
304
|
+
</td>
|
316
305
|
</tr>
|
317
|
-
|
318
|
-
<
|
306
|
+
<tr>
|
307
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>Statement</th>
|
319
308
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
320
309
|
<p id='_'>
|
321
|
-
|
310
|
+
I recommend
|
322
311
|
<i>this</i>
|
323
|
-
|
312
|
+
.
|
324
313
|
</p>
|
325
314
|
</td>
|
326
315
|
</tr>
|
327
316
|
<tr>
|
328
|
-
<
|
329
|
-
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
330
|
-
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
<dd>B</dd>
|
335
|
-
<dt>
|
336
|
-
<p>C</p>
|
337
|
-
</dt>
|
338
|
-
<dd>D</dd>
|
339
|
-
</dl>
|
340
|
-
</td>
|
317
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>A</th>
|
318
|
+
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>B</td>
|
319
|
+
</tr>
|
320
|
+
<tr>
|
321
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>C</th>
|
322
|
+
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>D</td>
|
341
323
|
</tr>
|
342
324
|
<tr>
|
343
325
|
<td colspan='2' style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
@@ -368,49 +350,49 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
368
350
|
</td>
|
369
351
|
</tr>
|
370
352
|
<tr>
|
371
|
-
<
|
353
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>Test purpose</th>
|
372
354
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
373
355
|
<p>TEST PURPOSE</p>
|
374
356
|
</td>
|
375
357
|
</tr>
|
376
358
|
<tr>
|
377
|
-
<
|
359
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>Test method</th>
|
378
360
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
379
361
|
<p>TEST METHOD</p>
|
380
362
|
</td>
|
381
363
|
</tr>
|
382
364
|
<tr>
|
383
|
-
<
|
365
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>Conditions</th>
|
384
366
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
385
367
|
<p>CONDITIONS</p>
|
386
368
|
</td>
|
387
369
|
</tr>
|
388
370
|
<tr>
|
389
|
-
<
|
371
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>A</th>
|
390
372
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
391
373
|
<p>FIRST PART</p>
|
392
374
|
</td>
|
393
375
|
</tr>
|
394
376
|
<tr>
|
395
|
-
<
|
377
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>B</th>
|
396
378
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
397
379
|
<p>SECOND PART</p>
|
398
380
|
</td>
|
399
381
|
</tr>
|
400
382
|
<tr>
|
401
|
-
<
|
383
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>C</th>
|
402
384
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
403
385
|
<p>THIRD PART</p>
|
404
386
|
</td>
|
405
387
|
</tr>
|
406
388
|
<tr>
|
407
|
-
<
|
389
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.0pt;' scope='row'>Reference</th>
|
408
390
|
<td style='border-top:none;border-bottom:solid windowtext 1.0pt;'>
|
409
391
|
<p>REFERENCE PART</p>
|
410
392
|
</td>
|
411
393
|
</tr>
|
412
394
|
<tr>
|
413
|
-
<
|
395
|
+
<th style='font-weight:bold;border-top:none;border-bottom:solid windowtext 1.5pt;' scope='row'>Panda GHz express</th>
|
414
396
|
<td style='border-top:none;border-bottom:solid windowtext 1.5pt;'>
|
415
397
|
<p>PANDA PART</p>
|
416
398
|
</td>
|
@@ -450,65 +432,56 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
450
432
|
<table id='A1' class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;' width='100%'>
|
451
433
|
<tbody>
|
452
434
|
<tr>
|
453
|
-
<
|
435
|
+
<th style='font-weight:bold;border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Identifier</th>
|
454
436
|
<td style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
455
437
|
<tt>/ogc/recommendation/wfs/2</tt>
|
456
438
|
</td>
|
457
439
|
</tr>
|
458
440
|
<tr>
|
459
|
-
<
|
441
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Subject</th>
|
460
442
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>user</td>
|
461
443
|
</tr>
|
462
444
|
<tr>
|
463
|
-
<
|
464
|
-
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>/ss/584/2015/level/1</td>
|
465
|
-
</tr>
|
466
|
-
<tr>
|
467
|
-
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Dependency</td>
|
445
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Prerequisites</th>
|
468
446
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
447
|
+
/ss/584/2015/level/1
|
448
|
+
<br/>
|
469
449
|
<a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
|
470
450
|
</td>
|
471
451
|
</tr>
|
472
452
|
<tr>
|
473
|
-
<
|
453
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Control-class</th>
|
474
454
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Technical</td>
|
475
455
|
</tr>
|
476
456
|
<tr>
|
477
|
-
<
|
457
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Priority</th>
|
478
458
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>P0</td>
|
479
459
|
</tr>
|
480
460
|
<tr>
|
481
|
-
<
|
482
|
-
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
483
|
-
|
484
|
-
|
485
|
-
|
486
|
-
|
461
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Family</th>
|
462
|
+
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
463
|
+
System and Communications Protection
|
464
|
+
<br/>
|
465
|
+
System and Communications Protocols
|
466
|
+
</td>
|
487
467
|
</tr>
|
488
|
-
|
489
|
-
<
|
468
|
+
<tr>
|
469
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Statement</th>
|
490
470
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
491
471
|
<p class='ForewordText' id='_'>
|
492
|
-
|
472
|
+
I recommend
|
493
473
|
<i>this</i>
|
494
|
-
|
474
|
+
.
|
495
475
|
</p>
|
496
476
|
</td>
|
497
477
|
</tr>
|
498
478
|
<tr>
|
499
|
-
<
|
500
|
-
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
501
|
-
|
502
|
-
|
503
|
-
|
504
|
-
|
505
|
-
<dd>B</dd>
|
506
|
-
<dt>
|
507
|
-
<p align='left' style='margin-left:0pt;text-align:left;'>C</p>
|
508
|
-
</dt>
|
509
|
-
<dd>D</dd>
|
510
|
-
</dl>
|
511
|
-
</td>
|
479
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>A</th>
|
480
|
+
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>B</td>
|
481
|
+
</tr>
|
482
|
+
<tr>
|
483
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>C</th>
|
484
|
+
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>D</td>
|
512
485
|
</tr>
|
513
486
|
<tr>
|
514
487
|
<td colspan='2' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
@@ -540,49 +513,49 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
540
513
|
</td>
|
541
514
|
</tr>
|
542
515
|
<tr>
|
543
|
-
<
|
516
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Test purpose</th>
|
544
517
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
545
518
|
<p class='ForewordText'>TEST PURPOSE</p>
|
546
519
|
</td>
|
547
520
|
</tr>
|
548
521
|
<tr>
|
549
|
-
<
|
522
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Test method</th>
|
550
523
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
551
524
|
<p class='ForewordText'>TEST METHOD</p>
|
552
525
|
</td>
|
553
526
|
</tr>
|
554
527
|
<tr>
|
555
|
-
<
|
528
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Conditions</th>
|
556
529
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
557
530
|
<p class='ForewordText'>CONDITIONS</p>
|
558
531
|
</td>
|
559
532
|
</tr>
|
560
533
|
<tr>
|
561
|
-
<
|
534
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>A</th>
|
562
535
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
563
536
|
<p class='ForewordText'>FIRST PART</p>
|
564
537
|
</td>
|
565
538
|
</tr>
|
566
539
|
<tr>
|
567
|
-
<
|
540
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>B</th>
|
568
541
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
569
542
|
<p class='ForewordText'>SECOND PART</p>
|
570
543
|
</td>
|
571
544
|
</tr>
|
572
545
|
<tr>
|
573
|
-
<
|
546
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>C</th>
|
574
547
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
575
548
|
<p class='ForewordText'>THIRD PART</p>
|
576
549
|
</td>
|
577
550
|
</tr>
|
578
551
|
<tr>
|
579
|
-
<
|
552
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Reference</th>
|
580
553
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>
|
581
554
|
<p class='ForewordText'>REFERENCE PART</p>
|
582
555
|
</td>
|
583
556
|
</tr>
|
584
557
|
<tr>
|
585
|
-
<
|
558
|
+
<th style='font-weight:bold;border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>Panda GHz express</th>
|
586
559
|
<td style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>
|
587
560
|
<p class='ForewordText'>PANDA PART</p>
|
588
561
|
</td>
|
@@ -696,53 +669,42 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
696
669
|
<name>Table 1 — Conformance test 1: First</name>
|
697
670
|
<tbody>
|
698
671
|
<tr>
|
699
|
-
<
|
672
|
+
<th>Identifier</th>
|
700
673
|
<td><tt>/ogc/recommendation/wfs/2</tt></td>
|
701
674
|
</tr>
|
702
675
|
<tr>
|
703
|
-
<
|
676
|
+
<th>Subject</th>
|
704
677
|
<td>user</td>
|
705
678
|
</tr>
|
706
679
|
<tr>
|
707
|
-
<
|
680
|
+
<th>Prerequisite</th>
|
708
681
|
<td>/ss/584/2015/level/1</td>
|
709
682
|
</tr>
|
710
683
|
<tr>
|
711
|
-
<
|
684
|
+
<th>Control-class</th>
|
712
685
|
<td>Technical</td>
|
713
686
|
</tr>
|
714
687
|
<tr>
|
715
|
-
<
|
688
|
+
<th>Priority</th>
|
716
689
|
<td>P0</td>
|
717
690
|
</tr>
|
718
691
|
<tr>
|
719
|
-
<
|
720
|
-
<td>System and Communications Protection
|
721
|
-
|
722
|
-
<tr>
|
723
|
-
<td>Family</td>
|
724
|
-
<td>System and Communications Protocols</td>
|
725
|
-
</tr>
|
726
|
-
<tr>
|
727
|
-
<td>Statement</td><td>
|
728
|
-
<p id='_'>
|
729
|
-
I recommend
|
730
|
-
<em>this</em>
|
731
|
-
.
|
732
|
-
</p>
|
733
|
-
</td>
|
692
|
+
<th>Family</th>
|
693
|
+
<td>System and Communications Protection<br/>
|
694
|
+
System and Communications Protocols</td>
|
734
695
|
</tr>
|
735
|
-
|
736
|
-
|
737
|
-
<td>
|
738
|
-
<dl>
|
739
|
-
<dt>A</dt>
|
740
|
-
<dd>B</dd>
|
741
|
-
<dt>C</dt>
|
742
|
-
<dd>D</dd>
|
743
|
-
</dl>
|
696
|
+
<tr><th>Statement</th><td>
|
697
|
+
<p id="_">I recommend <em>this</em>.</p>
|
744
698
|
</td>
|
745
699
|
</tr>
|
700
|
+
<tr>
|
701
|
+
<th>A</th>
|
702
|
+
<td>B</td>
|
703
|
+
</tr>
|
704
|
+
<tr>
|
705
|
+
<th>C</th>
|
706
|
+
<td>D</td>
|
707
|
+
</tr>
|
746
708
|
<tr>
|
747
709
|
<td colspan='2'>
|
748
710
|
<p id='_'>The measurement target shall be measured as:</p>
|
@@ -835,22 +797,24 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
835
797
|
<table id="A1" type="recommendtest" class="modspec">
|
836
798
|
<name>Table 1 — Abstract test 1: First</name>
|
837
799
|
<tbody>
|
838
|
-
<tr><
|
839
|
-
<tr><
|
800
|
+
<tr><th>Identifier</th><td><tt>/ogc/recommendation/wfs/2</tt></td></tr>
|
801
|
+
<tr><th>Subject</th><td>user</td></tr>
|
802
|
+
<tr><th>Prerequisite</th><td>/ss/584/2015/level/1</td></tr><tr><th>Control-class</th><td>Technical</td></tr><tr><th>Priority</th><td>P0</td></tr>
|
803
|
+
<tr><th>Family</th><td>System and Communications Protection<br/>
|
804
|
+
System and Communications Protocols</td></tr>
|
840
805
|
|
841
|
-
<tr><
|
806
|
+
<tr><th>Statement</th><td>
|
842
807
|
<p id="_">I recommend <em>this</em>.</p>
|
843
|
-
</td></tr>
|
844
|
-
<tr><td>Statement</td>
|
845
|
-
<td>
|
846
|
-
<dl>
|
847
|
-
<dt>A</dt>
|
848
|
-
<dd>B</dd>
|
849
|
-
<dt>C</dt>
|
850
|
-
<dd>D</dd>
|
851
|
-
</dl>
|
852
808
|
</td>
|
853
809
|
</tr>
|
810
|
+
<tr>
|
811
|
+
<th>A</th>
|
812
|
+
<td>B</td>
|
813
|
+
</tr>
|
814
|
+
<tr>
|
815
|
+
<th>C</th>
|
816
|
+
<td>D</td>
|
817
|
+
</tr>
|
854
818
|
<tr> <td colspan='2'>
|
855
819
|
<p id="_">The measurement target shall be measured as:</p>
|
856
820
|
<formula id="_"><name>1</name>
|
@@ -915,23 +879,20 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
915
879
|
<name>Table 1 — Permissions class 1: First</name>
|
916
880
|
<tbody>
|
917
881
|
<tr>
|
918
|
-
<
|
882
|
+
<th>Identifier</th>
|
919
883
|
<td><tt>/ogc/recommendation/wfs/2</tt></td>
|
920
884
|
</tr>
|
921
885
|
<tr>
|
922
|
-
<
|
886
|
+
<th>Target type</th>
|
923
887
|
<td>user</td>
|
924
888
|
</tr>
|
925
889
|
<tr>
|
926
|
-
<
|
927
|
-
<td>/ss/584/2015/level/1
|
928
|
-
|
929
|
-
<tr>
|
930
|
-
<td>Dependency</td>
|
931
|
-
<td>/ss/584/2015/level/2</td>
|
890
|
+
<th>Prerequisites</th>
|
891
|
+
<td>/ss/584/2015/level/1<br/>
|
892
|
+
/ss/584/2015/level/2</td>
|
932
893
|
</tr>
|
933
894
|
<tr>
|
934
|
-
<
|
895
|
+
<th>Provisions</th>
|
935
896
|
<td>
|
936
897
|
<xref target='B1'>
|
937
898
|
Permission 1:
|
@@ -955,11 +916,11 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
955
916
|
<name>Table 2 — Permission 1: Second</name>
|
956
917
|
<tbody>
|
957
918
|
<tr>
|
958
|
-
<
|
919
|
+
<th>Identifier</th>
|
959
920
|
<td><tt>/ogc/recommendation/wfs/10</tt></td>
|
960
921
|
</tr>
|
961
922
|
<tr>
|
962
|
-
<
|
923
|
+
<th>Included in</th>
|
963
924
|
<td>
|
964
925
|
<xref target='A1'>Permissions class 1: First</xref>
|
965
926
|
</td>
|
@@ -1022,43 +983,35 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1022
983
|
<name>Table 1 — Conformance class 1: First</name>
|
1023
984
|
<tbody>
|
1024
985
|
<tr>
|
1025
|
-
<
|
986
|
+
<th>Identifier</th>
|
1026
987
|
<td><tt>/ogc/recommendation/wfs/2</tt></td>
|
1027
988
|
</tr>
|
1028
989
|
<tr>
|
1029
|
-
<
|
990
|
+
<th>Subject</th>
|
1030
991
|
<td>user</td>
|
1031
992
|
</tr>
|
1032
993
|
<tr>
|
1033
|
-
<
|
994
|
+
<th>Requirements class</th>
|
1034
995
|
<td>
|
1035
996
|
<xref target='B'>Conformance class 2: Second</xref>
|
1036
997
|
</td>
|
1037
998
|
</tr>
|
1038
999
|
<tr>
|
1039
|
-
<
|
1040
|
-
<td>/ss/584/2015/level/1
|
1041
|
-
</tr>
|
1042
|
-
<tr>
|
1043
|
-
<td>Dependency</td>
|
1044
|
-
<td>
|
1000
|
+
<th>Prerequisites</th>
|
1001
|
+
<td>/ss/584/2015/level/1<br/>
|
1045
1002
|
<xref target='B'>Conformance class 2: Second</xref>
|
1046
1003
|
</td>
|
1047
1004
|
</tr>
|
1048
1005
|
<tr>
|
1049
|
-
<
|
1006
|
+
<th>Indirect prerequisites</th>
|
1050
1007
|
<td>
|
1051
1008
|
<link target='http://www.example.com/'/>
|
1052
|
-
|
1053
|
-
</tr>
|
1054
|
-
<tr>
|
1055
|
-
<td>Indirect Dependency</td>
|
1056
|
-
<td>
|
1009
|
+
<br/>
|
1057
1010
|
<xref target='B'>Conformance class 2: Second</xref>
|
1058
1011
|
</td>
|
1059
1012
|
</tr>
|
1060
1013
|
<tr>
|
1061
|
-
<
|
1014
|
+
<th>Conformance tests</th>
|
1062
1015
|
<td>
|
1063
1016
|
<xref target='B2'>
|
1064
1017
|
Permission 1:
|
@@ -1080,7 +1033,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1080
1033
|
<name>Table 2 — Conformance class 2: Second</name>
|
1081
1034
|
<tbody>
|
1082
1035
|
<tr>
|
1083
|
-
<
|
1036
|
+
<th>Identifier</th>
|
1084
1037
|
<td><tt>ABC</tt></td>
|
1085
1038
|
</tr>
|
1086
1039
|
</tbody>
|
@@ -1089,11 +1042,11 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1089
1042
|
<name>Table 3 — Permission 1: Third</name>
|
1090
1043
|
<tbody>
|
1091
1044
|
<tr>
|
1092
|
-
<
|
1045
|
+
<th>Identifier</th>
|
1093
1046
|
<td><tt>Permission 1</tt></td>
|
1094
1047
|
</tr>
|
1095
1048
|
<tr>
|
1096
|
-
<
|
1049
|
+
<th>Included in</th>
|
1097
1050
|
<td>
|
1098
1051
|
<xref target='A1'>
|
1099
1052
|
Conformance class 1:
|
@@ -1162,43 +1115,35 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1162
1115
|
<name>Tableau 1 — Classe de confirmité 1 : First</name>
|
1163
1116
|
<tbody>
|
1164
1117
|
<tr>
|
1165
|
-
<
|
1118
|
+
<th>Identifiant</th>
|
1166
1119
|
<td><tt>/ogc/recommendation/wfs/2</tt></td>
|
1167
1120
|
</tr>
|
1168
1121
|
<tr>
|
1169
|
-
<
|
1122
|
+
<th>Sujet</th>
|
1170
1123
|
<td>user</td>
|
1171
1124
|
</tr>
|
1172
1125
|
<tr>
|
1173
|
-
<
|
1126
|
+
<th>Classe d’exigences</th>
|
1174
1127
|
<td>
|
1175
1128
|
<xref target='B'>Classe de confirmité 2 : Second</xref>
|
1176
1129
|
</td>
|
1177
1130
|
</tr>
|
1178
1131
|
<tr>
|
1179
|
-
<
|
1180
|
-
<td>/ss/584/2015/level/1
|
1181
|
-
</tr>
|
1182
|
-
<tr>
|
1183
|
-
<td>Dépendance</td>
|
1184
|
-
<td>
|
1132
|
+
<th>Prérequis</th>
|
1133
|
+
<td>/ss/584/2015/level/1<br/>
|
1185
1134
|
<xref target='B'>Classe de confirmité 2 : Second</xref>
|
1186
1135
|
</td>
|
1187
1136
|
</tr>
|
1188
1137
|
<tr>
|
1189
|
-
<
|
1138
|
+
<th>Prérequis indirect</th>
|
1190
1139
|
<td>
|
1191
1140
|
<link target='http://www.example.com/'/>
|
1192
|
-
|
1193
|
-
</tr>
|
1194
|
-
<tr>
|
1195
|
-
<td>Dépendance indirecte</td>
|
1196
|
-
<td>
|
1141
|
+
<br/>
|
1197
1142
|
<xref target='B'>Classe de confirmité 2 : Second</xref>
|
1198
1143
|
</td>
|
1199
1144
|
</tr>
|
1200
|
-
|
1201
|
-
<
|
1145
|
+
<tr>
|
1146
|
+
<th>Tests de conformité</th>
|
1202
1147
|
<td>
|
1203
1148
|
<xref target='B2'>
|
1204
1149
|
Autorisation 1 :
|
@@ -1220,7 +1165,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1220
1165
|
<name>Tableau 2 — Classe de confirmité 2 : Second</name>
|
1221
1166
|
<tbody>
|
1222
1167
|
<tr>
|
1223
|
-
<
|
1168
|
+
<th>Identifiant</th>
|
1224
1169
|
<td><tt>ABC</tt></td>
|
1225
1170
|
</tr>
|
1226
1171
|
</tbody>
|
@@ -1229,11 +1174,11 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1229
1174
|
<name>Tableau 3 — Autorisation 1 : Third</name>
|
1230
1175
|
<tbody>
|
1231
1176
|
<tr>
|
1232
|
-
<
|
1177
|
+
<th>Identifiant</th>
|
1233
1178
|
<td><tt>Permission 1</tt></td>
|
1234
1179
|
</tr>
|
1235
1180
|
<tr>
|
1236
|
-
<
|
1181
|
+
<th>Inclus dans</th>
|
1237
1182
|
<td>
|
1238
1183
|
<xref target='A1'>
|
1239
1184
|
Classe de confirmité 1 :
|
@@ -1269,14 +1214,6 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1269
1214
|
<title>First #1</title>
|
1270
1215
|
<identifier>Permission 1</identifier>
|
1271
1216
|
</permission>
|
1272
|
-
<requirement model="ogc" id="A3">
|
1273
|
-
<title>First #2</title>
|
1274
|
-
<identifier>Requirement 1</identifier>
|
1275
|
-
</requirement>
|
1276
|
-
<recommendation model="ogc" id="A4">
|
1277
|
-
<title>First #3</title>
|
1278
|
-
<identifier>Recommendation 1</identifier>
|
1279
|
-
</recommendation>
|
1280
1217
|
</requirement>
|
1281
1218
|
<permission model="ogc" id="A5">
|
1282
1219
|
<title>Second</title>
|
@@ -1295,38 +1232,25 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1295
1232
|
<name>Table 1 — Requirements class 1: First</name>
|
1296
1233
|
<tbody>
|
1297
1234
|
<tr>
|
1298
|
-
<
|
1235
|
+
<th>Identifier</th>
|
1299
1236
|
<td><tt>/ogc/recommendation/wfs/2</tt></td>
|
1300
1237
|
</tr>
|
1301
1238
|
<tr>
|
1302
|
-
<
|
1239
|
+
<th>Target type</th>
|
1303
1240
|
<td>user</td>
|
1304
1241
|
</tr>
|
1305
1242
|
<tr>
|
1306
|
-
<
|
1307
|
-
<td>/ss/584/2015/level/1
|
1243
|
+
<th>Prerequisites</th>
|
1244
|
+
<td>/ss/584/2015/level/1<br/>
|
1245
|
+
/ss/584/2015/level/2</td>
|
1308
1246
|
</tr>
|
1309
1247
|
<tr>
|
1310
|
-
|
1311
|
-
<td>/ss/584/2015/level/2</td>
|
1312
|
-
</tr>
|
1313
|
-
<tr>
|
1314
|
-
<td>Provisions</td>
|
1248
|
+
<th>Provision</th>
|
1315
1249
|
<td>
|
1316
1250
|
<xref target='A5'>
|
1317
1251
|
Permission 1:
|
1318
1252
|
Second
|
1319
1253
|
</xref>
|
1320
|
-
<br/>
|
1321
|
-
<xref target='A3'>
|
1322
|
-
Requirement 1-1:
|
1323
|
-
First #2
|
1324
|
-
</xref>
|
1325
|
-
<br/>
|
1326
|
-
<xref target='A4'>
|
1327
|
-
Recommendation 1-1:
|
1328
|
-
First #3
|
1329
|
-
</xref>
|
1330
1254
|
</td>
|
1331
1255
|
</tr>
|
1332
1256
|
</tbody>
|
@@ -1335,11 +1259,11 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1335
1259
|
<name>Table 2 — Permission 1: Second</name>
|
1336
1260
|
<tbody>
|
1337
1261
|
<tr>
|
1338
|
-
<
|
1262
|
+
<th>Identifier</th>
|
1339
1263
|
<td><tt>Permission 1</tt></td>
|
1340
1264
|
</tr>
|
1341
1265
|
<tr>
|
1342
|
-
<
|
1266
|
+
<th>Included in</th>
|
1343
1267
|
<td>
|
1344
1268
|
<xref target='A1'>
|
1345
1269
|
Requirements class 1:
|
@@ -1397,23 +1321,20 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1397
1321
|
<name>Table 1 — Recommendations class 1: First</name>
|
1398
1322
|
<tbody>
|
1399
1323
|
<tr>
|
1400
|
-
<
|
1324
|
+
<th>Identifier</th>
|
1401
1325
|
<td><tt>/ogc/recommendation/wfs/2</tt></td>
|
1402
1326
|
</tr>
|
1403
1327
|
<tr>
|
1404
|
-
<
|
1328
|
+
<th>Target type</th>
|
1405
1329
|
<td>user</td>
|
1406
1330
|
</tr>
|
1407
1331
|
<tr>
|
1408
|
-
<
|
1409
|
-
<td>/ss/584/2015/level/1
|
1410
|
-
|
1411
|
-
<tr>
|
1412
|
-
<td>Dependency</td>
|
1413
|
-
<td>/ss/584/2015/level/2</td>
|
1332
|
+
<th>Prerequisites</th>
|
1333
|
+
<td>/ss/584/2015/level/1<br/>
|
1334
|
+
/ss/584/2015/level/2</td>
|
1414
1335
|
</tr>
|
1415
1336
|
<tr>
|
1416
|
-
<
|
1337
|
+
<th>Provisions</th>
|
1417
1338
|
<td>
|
1418
1339
|
<xref target='A2'>Permission 1-1:
|
1419
1340
|
First #1
|
@@ -1504,28 +1425,25 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1504
1425
|
<name>Table — Requirement: A New Requirement</name>
|
1505
1426
|
<tbody>
|
1506
1427
|
<tr>
|
1507
|
-
<
|
1428
|
+
<th>Identifier</th>
|
1508
1429
|
<td><tt>/ogc/recommendation/wfs/2</tt></td>
|
1509
1430
|
</tr>
|
1510
1431
|
<tr>
|
1511
|
-
<
|
1432
|
+
<th>Subject</th>
|
1512
1433
|
<td>user</td>
|
1513
1434
|
</tr>
|
1514
1435
|
<tr>
|
1515
|
-
<
|
1436
|
+
<th>Prerequisite</th>
|
1516
1437
|
<td>/ss/584/2015/level/1</td>
|
1517
1438
|
</tr>
|
1518
1439
|
<tr>
|
1519
|
-
<
|
1440
|
+
<th>Statements</th><td>
|
1520
1441
|
<p id='_'>
|
1521
1442
|
I recommend
|
1522
1443
|
<em>this</em>
|
1523
1444
|
.
|
1524
1445
|
</p>
|
1525
|
-
|
1526
|
-
</tr>
|
1527
|
-
<tr>
|
1528
|
-
<td>Statement</td><td>
|
1446
|
+
<br/>
|
1529
1447
|
<p id='_'>As for the measurement targets,</p>
|
1530
1448
|
</td>
|
1531
1449
|
</tr>
|
@@ -1622,28 +1540,25 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
|
|
1622
1540
|
<name>Table 1 — Recommendation 1: First</name>
|
1623
1541
|
<tbody>
|
1624
1542
|
<tr>
|
1625
|
-
<
|
1543
|
+
<th>Identifier</th>
|
1626
1544
|
<td><tt>/ogc/recommendation/wfs/2</tt></td>
|
1627
1545
|
</tr>
|
1628
1546
|
<tr>
|
1629
|
-
<
|
1547
|
+
<th>Subject</th>
|
1630
1548
|
<td>user</td>
|
1631
1549
|
</tr>
|
1632
1550
|
<tr>
|
1633
|
-
<
|
1551
|
+
<th>Prerequisite</th>
|
1634
1552
|
<td>/ss/584/2015/level/1</td>
|
1635
1553
|
</tr>
|
1636
1554
|
<tr>
|
1637
|
-
<
|
1555
|
+
<th>Statements</th><td>
|
1638
1556
|
<p id='_'>
|
1639
1557
|
I recommend
|
1640
1558
|
<em>this</em>
|
1641
1559
|
.
|
1642
1560
|
</p>
|
1643
|
-
|
1644
|
-
</tr>
|
1645
|
-
<tr>
|
1646
|
-
<td>Statement</td><td>
|
1561
|
+
<br/>
|
1647
1562
|
<p id='_'>As for the measurement targets,</p>
|
1648
1563
|
</td>
|
1649
1564
|
</tr>
|