isodoc 1.6.4 → 1.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (49) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +1 -1
  3. data/.rubocop.yml +1 -1
  4. data/isodoc.gemspec +2 -1
  5. data/lib/isodoc-yaml/i18n-ar.yaml +19 -25
  6. data/lib/isodoc-yaml/i18n-de.yaml +1 -0
  7. data/lib/isodoc-yaml/i18n-en.yaml +2 -0
  8. data/lib/isodoc-yaml/i18n-es.yaml +1 -0
  9. data/lib/isodoc-yaml/i18n-fr.yaml +2 -0
  10. data/lib/isodoc-yaml/i18n-ru.yaml +1 -0
  11. data/lib/isodoc-yaml/i18n-zh-Hans.yaml +2 -0
  12. data/lib/isodoc/convert.rb +4 -2
  13. data/lib/isodoc/function/blocks.rb +6 -5
  14. data/lib/isodoc/function/references.rb +33 -52
  15. data/lib/isodoc/function/section.rb +0 -1
  16. data/lib/isodoc/function/table.rb +21 -22
  17. data/lib/isodoc/function/terms.rb +6 -7
  18. data/lib/isodoc/gem_tasks.rb +8 -9
  19. data/lib/isodoc/html_convert.rb +5 -1
  20. data/lib/isodoc/html_function/comments.rb +12 -12
  21. data/lib/isodoc/html_function/html.rb +2 -2
  22. data/lib/isodoc/html_function/postprocess.rb +195 -185
  23. data/lib/isodoc/html_function/sectionsplit.rb +244 -0
  24. data/lib/isodoc/metadata.rb +22 -20
  25. data/lib/isodoc/metadata_contributor.rb +31 -28
  26. data/lib/isodoc/presentation_function/bibdata.rb +7 -0
  27. data/lib/isodoc/presentation_function/block.rb +7 -4
  28. data/lib/isodoc/presentation_function/inline.rb +7 -12
  29. data/lib/isodoc/presentation_function/section.rb +38 -1
  30. data/lib/isodoc/presentation_xml_convert.rb +2 -0
  31. data/lib/isodoc/version.rb +1 -1
  32. data/lib/isodoc/xref.rb +10 -7
  33. data/lib/isodoc/xref/xref_anchor.rb +45 -44
  34. data/lib/isodoc/xref/xref_counter.rb +113 -103
  35. data/lib/isodoc/xref/xref_gen.rb +39 -11
  36. data/spec/isodoc/blocks_spec.rb +184 -447
  37. data/spec/isodoc/cleanup_spec.rb +40 -42
  38. data/spec/isodoc/i18n_spec.rb +694 -821
  39. data/spec/isodoc/inline_spec.rb +197 -208
  40. data/spec/isodoc/metadata_spec.rb +384 -379
  41. data/spec/isodoc/postproc_spec.rb +121 -30
  42. data/spec/isodoc/presentation_xml_spec.rb +4 -4
  43. data/spec/isodoc/ref_spec.rb +5 -5
  44. data/spec/isodoc/section_spec.rb +216 -199
  45. data/spec/isodoc/sectionsplit_spec.rb +190 -0
  46. data/spec/isodoc/table_spec.rb +41 -42
  47. data/spec/isodoc/terms_spec.rb +1 -1
  48. data/spec/isodoc/xref_spec.rb +684 -1020
  49. metadata +19 -3
data/spec/isodoc/inline_spec.rb CHANGED
@@ -19,13 +19,13 @@ RSpec.describe IsoDoc do
19
19
  output = <<~OUTPUT
20
20
  <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
21
21
  <sections>
22
- <clause id='A'>
22
+ <clause id='A' displayorder="1">
23
23
  <title>1.</title>
24
24
  <formula id='B'>
25
25
  <name>1</name>
26
26
  </formula>
27
27
  </clause>
28
- <clause id='C'>
28
+ <clause id='C' displayorder="2">
29
29
  <title>2.</title>
30
30
  <p>
31
31
  This is
@@ -122,7 +122,7 @@ RSpec.describe IsoDoc do
122
122
  output = <<~OUTPUT
123
123
  <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
124
124
  <preface>
125
- <foreword>
125
+ <foreword displayorder="1">
126
126
  <p/>
127
127
  </foreword>
128
128
  </preface>
@@ -139,19 +139,27 @@ RSpec.describe IsoDoc do
139
139
  <preface><foreword>
140
140
  <p>
141
141
  <ul>
142
- <li><concept term='term'>
142
+ <li><concept><refterm>term</refterm>
143
143
  <xref target='clause1'/>
144
144
  </concept></li>
145
- <li><concept term='term'>
146
- <xref target='clause1'>w[o]rd</xref>
145
+ <li><concept><refterm>term</refterm>
146
+ <renderterm>term</renderterm>
147
+ <xref target='clause1'/>
148
+ </concept></li>
149
+ <li><concept><refterm>term</refterm>
150
+ <renderterm>w[o]rd</renderterm>
151
+ <xref target='clause1'>Clause #1</xref>
147
152
  </concept></li>
148
- <li><concept term='term'>
153
+ <li><concept><refterm>term</refterm>
154
+ <renderterm>term</renderterm>
149
155
  <eref bibitemid="ISO712" type="inline" citeas="ISO 712"/>
150
156
  </concept></li>
151
- <li><concept term='term'>
152
- <eref bibitemid="ISO712" type="inline" citeas="ISO 712">word</eref>
157
+ <li><concept><refterm>term</refterm>
158
+ <renderterm>word</renderterm>
159
+ <eref bibitemid="ISO712" type="inline" citeas="ISO 712">The Aforementioned Citation</eref>
153
160
  </concept></li>
154
- <li><concept>
161
+ <li><concept><refterm>term</refterm>
162
+ <renderterm>word</renderterm>
155
163
  <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
156
164
  <locality type='clause'>
157
165
  <referenceFrom>3.1</referenceFrom>
@@ -161,7 +169,8 @@ RSpec.describe IsoDoc do
161
169
  </locality>
162
170
  </eref>
163
171
  </concept></li>
164
- <li><concept>
172
+ <li><concept><refterm>term</refterm>
173
+ <renderterm>word</renderterm>
165
174
  <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
166
175
  <localityStack>
167
176
  <locality type='clause'>
@@ -175,7 +184,8 @@ RSpec.describe IsoDoc do
175
184
  </localityStack>
176
185
  </eref>
177
186
  </concept></li>
178
- <li><concept>
187
+ <li><concept><refterm>term</refterm>
188
+ <renderterm>word</renderterm>
179
189
  <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
180
190
  <localityStack>
181
191
  <locality type='clause'>
@@ -187,14 +197,16 @@ RSpec.describe IsoDoc do
187
197
  <referenceFrom>b</referenceFrom>
188
198
  </locality>
189
199
  </localityStack>
190
- <em>word</em>
200
+ The Aforementioned Citation
191
201
  </eref>
192
202
  </concept></li>
193
- <li><concept term='term'>
203
+ <li><concept><refterm>term</refterm>
204
+ <renderterm>word</renderterm>
194
205
  <termref base='IEV' target='135-13-13'/>
195
206
  </concept></li>
196
- <li><concept term='term'>
197
- <termref base='IEV' target='135-13-13'><em>word</em> word</termref>
207
+ <li><concept><refterm>term</refterm>
208
+ <renderterm>word</renderterm>
209
+ <termref base='IEV' target='135-13-13'>The IEV database</termref>
198
210
  </concept></li>
199
211
  </ul>
200
212
  </p>
@@ -219,190 +231,166 @@ RSpec.describe IsoDoc do
219
231
  </iso-standard>
220
232
  INPUT
221
233
  presxml = <<~OUTPUT
222
- <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
223
- <preface>
224
- <foreword>
225
- <p>
226
- <ul>
227
- <li>
228
- <em>
229
- <xref target='clause1'>Clause 2</xref>
230
- </em>
231
- </li>
232
- <li>
233
- <em>
234
- <xref target='clause1'>w[o]rd</xref>
235
- </em>
236
- </li>
237
- <li>
238
- <em>
239
- <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>ISO 712</eref>
240
- </em>
241
- </li>
242
- <li>
243
- <em>
244
- <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>word</eref>
245
- </em>
246
- </li>
247
- <li>
248
- <em>
249
- <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>
250
- <locality type='clause'>
251
- <referenceFrom>3.1</referenceFrom>
252
- </locality>
253
- <locality type='figure'>
254
- <referenceFrom>a</referenceFrom>
255
- </locality>
256
- ISO 712, Clause 3.1, Figure a
257
- </eref>
258
- </em>
259
- </li>
260
- <li>
261
- <em>
262
- <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>
263
- <localityStack>
264
- <locality type='clause'>
265
- <referenceFrom>3.1</referenceFrom>
266
- </locality>
267
- </localityStack>
268
- <localityStack>
269
- <locality type='figure'>
270
- <referenceFrom>b</referenceFrom>
271
- </locality>
272
- </localityStack>
273
- ISO 712, Clause 3.1; Figure b
274
- </eref>
275
- </em>
276
- </li>
277
- <li>
278
- <em>
279
- <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>
280
- <localityStack>
281
- <locality type='clause'>
282
- <referenceFrom>3.1</referenceFrom>
283
- </locality>
284
- </localityStack>
285
- <localityStack>
286
- <locality type='figure'>
287
- <referenceFrom>b</referenceFrom>
288
- </locality>
289
- </localityStack>
290
- <em>word</em>
291
- </eref>
292
- </em>
293
- </li>
294
- <li>
295
- [term defined in
296
- <termref base='IEV' target='135-13-13'/>
297
- ]
298
- </li>
299
- <li>
300
- <em>
301
- <termref base='IEV' target='135-13-13'>
302
- <em>word</em>
303
- word
304
- </termref>
305
- </em>
306
- </li>
307
- </ul>
308
- </p>
309
- </foreword>
310
- </preface>
311
- <sections>
312
- <clause id='clause1'>
313
- <title depth='1'>
314
- 2.
315
- <tab/>
316
- Clause 1
317
- </title>
318
- </clause>
319
- </sections>
320
- <bibliography>
321
- <references id='_normative_references' obligation='informative' normative='true'>
322
- <title depth='1'>
323
- 1.
324
- <tab/>
325
- Normative References
326
- </title>
327
- <p>
328
- The following documents are referred to in the text in such a way that
329
- some or all of their content constitutes requirements of this document.
330
- For dated references, only the edition cited applies. For undated
331
- references, the latest edition of the referenced document (including any
332
- amendments) applies.
333
- </p>
334
- <bibitem id='ISO712' type='standard'>
335
- <title format='text/plain'>Cereals or cereal products</title>
336
- <title type='main' format='text/plain'>Cereals and cereal products</title>
337
- <docidentifier type='ISO'>ISO 712</docidentifier>
338
- <contributor>
339
- <role type='publisher'/>
340
- <organization>
341
- <name>International Organization for Standardization</name>
342
- </organization>
343
- </contributor>
344
- </bibitem>
345
- </references>
346
- </bibliography>
347
- </iso-standard>
234
+ <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
235
+ <preface><foreword displayorder="1">
236
+ <p>
237
+ <ul>
238
+ <li>
239
+ [term defined in <xref target="clause1">Clause 2</xref>]
240
+ </li>
241
+ <li>
242
+ <em>term</em>
243
+ [term defined in <xref target="clause1">Clause 2</xref>]
244
+ </li>
245
+ <li>
246
+ <em>w[o]rd</em>
247
+ [term defined in <xref target="clause1">Clause #1</xref>]
248
+ </li>
249
+ <li>
250
+ <em>term</em>
251
+ [term defined in <eref bibitemid="ISO712" type="inline" citeas="ISO 712">ISO 712</eref>]
252
+ </li>
253
+ <li>
254
+ <em>word</em>
255
+ [term defined in <eref bibitemid="ISO712" type="inline" citeas="ISO 712">The Aforementioned Citation</eref>]
256
+ </li>
257
+ <li>
258
+ <em>word</em>
259
+ [term defined in <eref bibitemid="ISO712" type="inline" citeas="ISO 712"><locality type="clause">
260
+ <referenceFrom>3.1</referenceFrom>
261
+ </locality><locality type="figure">
262
+ <referenceFrom>a</referenceFrom>
263
+ </locality>ISO 712, Clause 3.1, Figure a</eref>]
264
+ </li>
265
+ <li>
266
+ <em>word</em>
267
+ [term defined in <eref bibitemid="ISO712" type="inline" citeas="ISO 712"><localityStack>
268
+ <locality type="clause">
269
+ <referenceFrom>3.1</referenceFrom>
270
+ </locality>
271
+ </localityStack><localityStack>
272
+ <locality type="figure">
273
+ <referenceFrom>b</referenceFrom>
274
+ </locality>
275
+ </localityStack>ISO 712, Clause 3.1; Figure b</eref>]
276
+ </li>
277
+ <li>
278
+ <em>word</em>
279
+ [term defined in <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
280
+ <localityStack>
281
+ <locality type="clause">
282
+ <referenceFrom>3.1</referenceFrom>
283
+ </locality>
284
+ </localityStack>
285
+ <localityStack>
286
+ <locality type="figure">
287
+ <referenceFrom>b</referenceFrom>
288
+ </locality>
289
+ </localityStack>
290
+ The Aforementioned Citation
291
+ </eref>]
292
+ </li>
293
+ <li>
294
+ <em>word</em>
295
+ [term defined in <termref base="IEV" target="135-13-13"/>]
296
+ </li>
297
+ <li>
298
+ <em>word</em>
299
+ [term defined in <termref base="IEV" target="135-13-13">The IEV database</termref>]
300
+ </li>
301
+ </ul>
302
+ </p>
303
+ </foreword></preface>
304
+ <sections>
305
+ <clause id="clause1" displayorder="3"><title depth="1">2.<tab/>Clause 1</title></clause>
306
+ </sections>
307
+ <bibliography><references id="_normative_references" obligation="informative" normative="true" displayorder="2"><title depth="1">1.<tab/>Normative References</title>
308
+ <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
309
+ <bibitem id="ISO712" type="standard">
310
+ <title format="text/plain">Cereals or cereal products</title>
311
+ <title type="main" format="text/plain">Cereals and cereal products</title>
312
+ <docidentifier type="ISO">ISO 712</docidentifier>
313
+ <contributor>
314
+ <role type="publisher"/>
315
+ <organization>
316
+ <name>International Organization for Standardization</name>
317
+ </organization>
318
+ </contributor>
319
+ </bibitem>
320
+ </references></bibliography>
321
+ </iso-standard>
348
322
  OUTPUT
349
323
  output = <<~OUTPUT
350
324
  #{HTML_HDR}
351
- <br/>
325
+ <br/>
352
326
  <div>
353
327
  <h1 class='ForewordTitle'>Foreword</h1>
354
328
  <p>
355
329
  <ul>
356
330
  <li>
357
- <i>
358
- <a href='#clause1'>Clause 2</a>
359
- </i>
331
+ [term defined in
332
+ <a href='#clause1'>Clause 2</a>
333
+ ]
334
+ </li>
335
+ <li>
336
+ <i>term</i>
337
+ [term defined in
338
+ <a href='#clause1'>Clause 2</a>
339
+ ]
340
+ </li>
341
+ <li>
342
+ <i>w[o]rd</i>
343
+ [term defined in
344
+ <a href='#clause1'>Clause #1</a>
345
+ ]
360
346
  </li>
361
347
  <li>
362
- <i>
363
- <a href='#clause1'>w[o]rd</a>
364
- </i>
348
+ <i>term</i>
349
+ [term defined in
350
+ <a href='#ISO712'>ISO 712</a>
351
+ ]
365
352
  </li>
366
353
  <li>
367
- <i>
368
- <a href='#ISO712'>ISO 712</a>
369
- </i>
354
+ <i>word</i>
355
+ [term defined in
356
+ <a href='#ISO712'>The Aforementioned Citation</a>
357
+ ]
370
358
  </li>
371
359
  <li>
372
- <i>
373
- <a href='#ISO712'>word</a>
374
- </i>
360
+ <i>word</i>
361
+ [term defined in
362
+ <a href='#ISO712'>ISO 712, Clause 3.1, Figure a</a>
363
+ ]
375
364
  </li>
376
365
  <li>
377
- <i>
378
- <a href='#ISO712'> ISO 712, Clause 3.1, Figure a </a>
379
- </i>
366
+ <i>word</i>
367
+ [term defined in
368
+ <a href='#ISO712'>ISO 712, Clause 3.1; Figure b</a>
369
+ ]
380
370
  </li>
381
371
  <li>
382
- <i>
383
- <a href='#ISO712'> ISO 712, Clause 3.1; Figure b </a>
384
- </i>
372
+ <i>word</i>
373
+ [term defined in
374
+ <a href='#ISO712'> The Aforementioned Citation </a>
375
+ ]
385
376
  </li>
386
377
  <li>
387
- <i>
388
- <a href='#ISO712'>
389
- <i>word</i>
390
- </a>
391
- </i>
378
+ <i>word</i>
379
+ [term defined in Termbase IEV, term ID 135-13-13]
392
380
  </li>
393
- <li> [term defined in Termbase IEV, term ID 135-13-13 ] </li>
394
381
  <li>
395
- <i> Termbase IEV, term ID 135-13-13 </i>
382
+ <i>word</i>
383
+ [term defined in Termbase IEV, term ID 135-13-13]
396
384
  </li>
397
385
  </ul>
398
386
  </p>
399
387
  </div>
400
388
  <p class='zzSTDTitle1'/>
401
389
  <div>
402
- <h1> 1. &#160; Normative References </h1>
390
+ <h1>1.&#160; Normative References</h1>
403
391
  <p>
404
- The following documents are referred to in the text in such a way
405
- that some or all of their content constitutes requirements of this
392
+ The following documents are referred to in the text in such a way that
393
+ some or all of their content constitutes requirements of this
406
394
  document. For dated references, only the edition cited applies. For
407
395
  undated references, the latest edition of the referenced document
408
396
  (including any amendments) applies.
@@ -413,7 +401,7 @@ RSpec.describe IsoDoc do
413
401
  </p>
414
402
  </div>
415
403
  <div id='clause1'>
416
- <h1> 2. &#160; Clause 1 </h1>
404
+ <h1>2.&#160; Clause 1</h1>
417
405
  </div>
418
406
  </div>
419
407
  </body>
@@ -746,7 +734,7 @@ RSpec.describe IsoDoc do
746
734
  INPUT
747
735
  presxml = <<~OUTPUT
748
736
  <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
749
- <preface><foreword>
737
+ <preface><foreword displayorder="1">
750
738
  <p>
751
739
  <eref type="inline" bibitemid="ISO712" citeas="ISO 712">ISO 712</eref>
752
740
  <eref type="inline" bibitemid="ISO712">ISO 712</eref>
@@ -767,7 +755,8 @@ RSpec.describe IsoDoc do
767
755
  <eref type="inline" case="lowercase" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, clause 1</eref>
768
756
  </p>
769
757
  </foreword></preface>
770
- <bibliography><references id="_normative_references" obligation="informative" normative="true"><title depth='1'>1.<tab/>Normative References</title>
758
+ <bibliography><references id="_normative_references" obligation="informative" normative="true" displayorder=
759
+ "2"><title depth='1'>1.<tab/>Normative References</title>
771
760
  <bibitem id="ISO712" type="standard">
772
761
  <title format="text/plain">Cereals and cereal products</title>
773
762
  <docidentifier>ISO 712</docidentifier>
@@ -887,7 +876,7 @@ RSpec.describe IsoDoc do
887
876
  presxml = <<~OUTPUT
888
877
  <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
889
878
  <preface>
890
- <foreword>
879
+ <foreword displayorder="1">
891
880
  <p>
892
881
  <eref type='inline' bibitemid='ISO712' citeas='ISO 712'>ISO 712</eref>
893
882
  <eref type='inline' bibitemid='ISO712'>ISO 712</eref>
@@ -922,7 +911,7 @@ RSpec.describe IsoDoc do
922
911
  </foreword>
923
912
  </preface>
924
913
  <bibliography>
925
- <references id='_normative_references' obligation='informative' normative='true'>
914
+ <references id='_normative_references' obligation='informative' normative='true' displayorder="2">
926
915
  <title depth='1'>1.<tab/>Normative References</title>
927
916
  <bibitem id='ISO712' type='standard'>
928
917
  <title format='text/plain'>Cereals and cereal products</title>
@@ -1103,36 +1092,36 @@ RSpec.describe IsoDoc do
1103
1092
  </iso-standard>
1104
1093
  INPUT
1105
1094
  output = <<~OUTPUT
1106
- <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
1107
- <bibdata>
1108
- <language current='true'>en</language>
1109
- <script current='true'>Latn</script>
1110
- </bibdata>
1111
- <preface>
1112
- <clause id='A'>
1113
- <title depth='1'>ABC</title>
1114
- </clause>
1115
- <clause id='A1'>
1116
- <title depth='1'>ABC/DEF</title>
1117
- </clause>
1118
- <clause id='A2'>
1119
- <title depth='1'>ABC</title>
1120
- </clause>
1121
- <clause id='B'>
1122
- <title depth='1'>GHI/JKL</title>
1123
- </clause>
1124
- <clause id='C'>
1125
- <title depth='1'>DEF</title>
1126
- </clause>
1127
- <clause id='C1'>
1128
- <title depth='1'>ABC/DEF</title>
1129
- </clause>
1130
- <clause id='C2'>
1131
- <title depth='1'>DEF</title>
1132
- </clause>
1133
- <p>A B D E</p>
1134
- </preface>
1135
- </iso-standard>
1095
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
1096
+ <bibdata>
1097
+ <language current='true'>en</language>
1098
+ <script current='true'>Latn</script>
1099
+ </bibdata>
1100
+ <preface>
1101
+ <clause id='A' displayorder='1'>
1102
+ <title depth='1'>ABC</title>
1103
+ </clause>
1104
+ <clause id='A1' displayorder='2'>
1105
+ <title depth='1'>ABC/DEF</title>
1106
+ </clause>
1107
+ <clause id='A2' displayorder='3'>
1108
+ <title depth='1'>ABC</title>
1109
+ </clause>
1110
+ <clause id='B' displayorder='4'>
1111
+ <title depth='1'>GHI/JKL</title>
1112
+ </clause>
1113
+ <clause id='C' displayorder='5'>
1114
+ <title depth='1'>DEF</title>
1115
+ </clause>
1116
+ <clause id='C1' displayorder='6'>
1117
+ <title depth='1'>ABC/DEF</title>
1118
+ </clause>
1119
+ <clause id='C2' displayorder='7'>
1120
+ <title depth='1'>DEF</title>
1121
+ </clause>
1122
+ <p displayorder='8'>A B D E</p>
1123
+ </preface>
1124
+ </iso-standard>
1136
1125
  OUTPUT
1137
1126
  expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
1138
1127
  .convert("test", input, true)
@@ -1163,13 +1152,13 @@ RSpec.describe IsoDoc do
1163
1152
  <?xml version='1.0'?>
1164
1153
  <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
1165
1154
  <sections>
1166
- <clause id='A'>
1155
+ <clause id='A' displayorder="1">
1167
1156
  <title>1.</title>
1168
1157
  <table id='B'>
1169
1158
  <name>Tabelo 1</name>
1170
1159
  </table>
1171
1160
  </clause>
1172
- <clause id='C'>
1161
+ <clause id='C' displayorder="2">
1173
1162
  <title>2.</title>
1174
1163
  <p>
1175
1164
  This is