metanorma-iso 1.8.4 → 1.9.0.1

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 (39) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +1 -1
  3. data/.rubocop.yml +1 -1
  4. data/lib/asciidoctor/iso/cleanup.rb +0 -1
  5. data/lib/asciidoctor/iso/isodoc.rng +50 -8
  6. data/lib/asciidoctor/iso/isostandard.rng +7 -3
  7. data/lib/asciidoctor/iso/section.rb +3 -0
  8. data/lib/asciidoctor/iso/validate.rb +4 -17
  9. data/lib/asciidoctor/iso/validate_section.rb +50 -34
  10. data/lib/asciidoctor/iso/validate_style.rb +3 -3
  11. data/lib/isodoc/iso/base_convert.rb +41 -16
  12. data/lib/isodoc/iso/html/isodoc.css +475 -20
  13. data/lib/isodoc/iso/html/isodoc.scss +456 -23
  14. data/lib/isodoc/iso/html/wordstyle.css +202 -31
  15. data/lib/isodoc/iso/html/wordstyle.scss +194 -32
  16. data/lib/isodoc/iso/iso.amendment.xsl +480 -388
  17. data/lib/isodoc/iso/iso.international-standard.xsl +480 -388
  18. data/lib/isodoc/iso/isosts_convert.rb +12 -13
  19. data/lib/isodoc/iso/metadata.rb +2 -2
  20. data/lib/isodoc/iso/presentation_xml_convert.rb +62 -9
  21. data/lib/isodoc/iso/sts_convert.rb +4 -5
  22. data/lib/isodoc/iso/word_convert.rb +153 -39
  23. data/lib/isodoc/iso/xref.rb +17 -1
  24. data/lib/metanorma/iso/version.rb +1 -1
  25. data/metanorma-iso.gemspec +4 -4
  26. data/spec/asciidoctor/section_spec.rb +128 -7
  27. data/spec/asciidoctor/validate_spec.rb +15 -15
  28. data/spec/isodoc/amd_spec.rb +193 -201
  29. data/spec/isodoc/blocks_spec.rb +100 -88
  30. data/spec/isodoc/i18n_spec.rb +36 -36
  31. data/spec/isodoc/inline_spec.rb +472 -2
  32. data/spec/isodoc/iso_spec.rb +86 -138
  33. data/spec/isodoc/postproc_spec.rb +19 -10
  34. data/spec/isodoc/ref_spec.rb +6 -6
  35. data/spec/isodoc/section_spec.rb +394 -276
  36. data/spec/isodoc/table_spec.rb +166 -231
  37. data/spec/isodoc/terms_spec.rb +11 -8
  38. data/spec/isodoc/xref_spec.rb +147 -118
  39. metadata +8 -8
data/spec/isodoc/terms_spec.rb CHANGED
@@ -59,7 +59,7 @@ RSpec.describe IsoDoc do
59
59
  presxml = <<~OUTPUT
60
60
  <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
61
61
  <sections>
62
- <terms id='_terms_and_definitions' obligation='normative'>
62
+ <terms id='_terms_and_definitions' obligation='normative' displayorder='1'>
63
63
  <title depth='1'>1<tab/>Terms and Definitions</title>
64
64
 
65
65
  <term id='paddy1'><name>1.1</name>
@@ -185,7 +185,7 @@ RSpec.describe IsoDoc do
185
185
  <div id="_terms_and_definitions"><h1>1<span style="mso-tab-count:1">&#160; </span>Terms and Definitions</h1>
186
186
  <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
187
187
 
188
- <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
188
+ <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f" class="Definition">&lt;rice&gt; rice retaining its husk after threshing</p>
189
189
  <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"><p><span class="example_label">EXAMPLE 1</span><span style="mso-tab-count:1">&#160; </span>Foreign seeds, husks, bran, sand, dust.</p><ul>
190
190
  <li>A</li>
191
191
  </ul></div>
@@ -193,7 +193,7 @@ RSpec.describe IsoDoc do
193
193
  <li>A</li>
194
194
  </ul></div>
195
195
 
196
- <p>[TERMREF]
196
+ <p class="Source">[TERMREF]
197
197
  <a href="#ISO7301">ISO 7301:2011, 3.1</a>
198
198
  [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
199
199
  [/TERMREF]</p>
@@ -202,7 +202,7 @@ RSpec.describe IsoDoc do
202
202
  <p class="AltTerms" style="text-align:left;">paddy rice</p>
203
203
  <p class="AltTerms" style="text-align:left;">rough rice</p>
204
204
  <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
205
- <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
205
+ <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f" class="Definition">rice retaining its husk after threshing</p>
206
206
  <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><p><span class="example_label">EXAMPLE</span><span style="mso-tab-count:1">&#160; </span></p>
207
207
  <ul>
208
208
  <li>A</li>
@@ -210,15 +210,18 @@ RSpec.describe IsoDoc do
210
210
  </div>
211
211
  <div id='_671a1994-4783-40d0-bc81-987d06ffb74e' class="Note"><p class="Note">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>
212
212
  <div id='_671a1994-4783-40d0-bc81-987d06ffb74f' class="Note"><p class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
213
- <p>[TERMREF]<a href="#ISO7301">ISO 7301:2011, 3.1</a>
213
+ <p class="Source">[TERMREF]<a href="#ISO7301">ISO 7301:2011, 3.1</a>
214
214
  [/TERMREF]</p>
215
215
  </div>
216
216
  OUTPUT
217
- expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)))
217
+ expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
218
+ .convert("test", input, true)))
218
219
  .to be_equivalent_to xmlpp(presxml)
219
- expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true)))
220
+ expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
221
+ .convert("test", presxml, true)))
220
222
  .to be_equivalent_to xmlpp(html)
221
- expect(xmlpp(IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, true)
223
+ expect(xmlpp(IsoDoc::Iso::WordConvert.new({})
224
+ .convert("test", presxml, true)
222
225
  .sub(%r{^.*<p class="zzSTDTitle1"/>}m, "")
223
226
  .sub(%r{</div>\s*<br.*$}m, "")))
224
227
  .to be_equivalent_to xmlpp(word)
data/spec/isodoc/xref_spec.rb CHANGED
@@ -64,7 +64,7 @@ RSpec.describe IsoDoc do
64
64
  <?xml version='1.0'?>
65
65
  <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
66
66
  <preface>
67
- <foreword>
67
+ <foreword displayorder='1'>
68
68
  <p>
69
69
  <xref target="N">Clause 1, Note</xref>
70
70
  <xref target="note1">3.1, Note 1</xref>
@@ -76,7 +76,7 @@ RSpec.describe IsoDoc do
76
76
  </foreword>
77
77
  </preface>
78
78
  <sections>
79
- <clause id="scope" type="scope">
79
+ <clause id="scope" type="scope" displayorder='2'>
80
80
  <title depth="1">1
81
81
  <tab/>
82
82
  Scope</title>
@@ -90,10 +90,10 @@ RSpec.describe IsoDoc do
90
90
  <xref target="N">Note</xref>
91
91
  </p>
92
92
  </clause>
93
- <terms id="terms">
93
+ <terms id="terms" displayorder='3'>
94
94
  <title>2</title>
95
95
  </terms>
96
- <clause id="widgets">
96
+ <clause id="widgets" displayorder='4'>
97
97
  <title depth="1">3
98
98
  <tab/>
99
99
  Widgets</title>
@@ -118,7 +118,7 @@ RSpec.describe IsoDoc do
118
118
  </clause>
119
119
  </clause>
120
120
  </sections>
121
- <annex id="annex1">
121
+ <annex id="annex1" displayorder='5'>
122
122
  <title>
123
123
  <strong>Annex A</strong>
124
124
  <br/>(informative)</title>
@@ -220,7 +220,7 @@ RSpec.describe IsoDoc do
220
220
  <?xml version='1.0'?>
221
221
  <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
222
222
  <preface>
223
- <foreword id="fwd">
223
+ <foreword id="fwd" displayorder='1'>
224
224
  <p>
225
225
  <xref target="N">Figure 1</xref>
226
226
  <xref target="note1">Figure 2</xref>
@@ -232,7 +232,7 @@ RSpec.describe IsoDoc do
232
232
  </foreword>
233
233
  </preface>
234
234
  <sections>
235
- <clause id="scope" type="scope">
235
+ <clause id="scope" type="scope" displayorder='2'>
236
236
  <title depth="1">1
237
237
  <tab/>
238
238
  Scope</title>
@@ -244,10 +244,10 @@ RSpec.describe IsoDoc do
244
244
  <xref target="N">Figure 1</xref>
245
245
  </p>
246
246
  </clause>
247
- <terms id="terms">
247
+ <terms id="terms" displayorder='3'>
248
248
  <title>2</title>
249
249
  </terms>
250
- <clause id="widgets">
250
+ <clause id="widgets" displayorder='4'>
251
251
  <title depth="1">3
252
252
  <tab/>
253
253
  Widgets</title>
@@ -268,7 +268,7 @@ RSpec.describe IsoDoc do
268
268
  </clause>
269
269
  </clause>
270
270
  </sections>
271
- <annex id="annex1">
271
+ <annex id="annex1" displayorder='5'>
272
272
  <title>
273
273
  <strong>Annex A</strong>
274
274
  <br/>(informative)</title>
@@ -356,7 +356,7 @@ RSpec.describe IsoDoc do
356
356
  <?xml version='1.0'?>
357
357
  <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
358
358
  <preface>
359
- <foreword id="fwd">
359
+ <foreword id="fwd" displayorder='1'>
360
360
  <p>
361
361
  <xref target="N">Figure 1</xref>
362
362
  <xref target="note1">Figure 1 a)</xref>
@@ -368,15 +368,15 @@ RSpec.describe IsoDoc do
368
368
  </foreword>
369
369
  </preface>
370
370
  <sections>
371
- <clause id="scope" type="scope">
371
+ <clause id="scope" type="scope" displayorder='2'>
372
372
  <title depth="1">1
373
373
  <tab/>
374
374
  Scope</title>
375
375
  </clause>
376
- <terms id="terms">
376
+ <terms id="terms" displayorder='3'>
377
377
  <title>2</title>
378
378
  </terms>
379
- <clause id="widgets">
379
+ <clause id="widgets" displayorder='4'>
380
380
  <title depth="1">3
381
381
  <tab/>
382
382
  Widgets</title>
@@ -400,7 +400,7 @@ RSpec.describe IsoDoc do
400
400
  </clause>
401
401
  </clause>
402
402
  </sections>
403
- <annex id="annex1">
403
+ <annex id="annex1" displayorder='5'>
404
404
  <title>
405
405
  <strong>Annex A</strong>
406
406
  <br/>(informative)</title>
@@ -489,7 +489,7 @@ RSpec.describe IsoDoc do
489
489
  <?xml version='1.0'?>
490
490
  <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
491
491
  <preface>
492
- <foreword>
492
+ <foreword displayorder='1'>
493
493
  <p>
494
494
  <xref target="N">Clause 1, Example</xref>
495
495
  <xref target="note1">3.1, Example 1</xref>
@@ -501,7 +501,7 @@ RSpec.describe IsoDoc do
501
501
  </foreword>
502
502
  </preface>
503
503
  <sections>
504
- <clause id="scope" type="scope">
504
+ <clause id="scope" type="scope" displayorder='2'>
505
505
  <title depth="1">1
506
506
  <tab/>
507
507
  Scope</title>
@@ -513,10 +513,10 @@ RSpec.describe IsoDoc do
513
513
  <xref target="N">Example</xref>
514
514
  </p>
515
515
  </clause>
516
- <terms id="terms">
516
+ <terms id="terms" displayorder='3'>
517
517
  <title>2</title>
518
518
  </terms>
519
- <clause id="widgets">
519
+ <clause id="widgets" displayorder='4'>
520
520
  <title depth="1">3
521
521
  <tab/>
522
522
  Widgets</title>
@@ -537,7 +537,7 @@ RSpec.describe IsoDoc do
537
537
  </clause>
538
538
  </clause>
539
539
  </sections>
540
- <annex id="annex1">
540
+ <annex id="annex1" displayorder='5'>
541
541
  <title>
542
542
  <strong>Annex A</strong>
543
543
  <br/>(informative)</title>
@@ -641,7 +641,7 @@ RSpec.describe IsoDoc do
641
641
  <?xml version='1.0'?>
642
642
  <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
643
643
  <preface>
644
- <foreword>
644
+ <foreword displayorder='1'>
645
645
  <p>
646
646
  <xref target="N">Clause 1, Formula (1)</xref>
647
647
  <xref target="note1">3.1, Formula (2)</xref>
@@ -653,7 +653,7 @@ RSpec.describe IsoDoc do
653
653
  </foreword>
654
654
  </preface>
655
655
  <sections>
656
- <clause id="scope" type="scope">
656
+ <clause id="scope" type="scope" displayorder='2'>
657
657
  <title depth="1">1
658
658
  <tab/>
659
659
  Scope</title>
@@ -665,10 +665,10 @@ RSpec.describe IsoDoc do
665
665
  <xref target="N">Formula (1)</xref>
666
666
  </p>
667
667
  </clause>
668
- <terms id="terms">
668
+ <terms id="terms" displayorder='3'>
669
669
  <title>2</title>
670
670
  </terms>
671
- <clause id="widgets">
671
+ <clause id="widgets" displayorder='4'>
672
672
  <title depth="1">3
673
673
  <tab/>
674
674
  Widgets</title>
@@ -689,7 +689,7 @@ RSpec.describe IsoDoc do
689
689
  </clause>
690
690
  </clause>
691
691
  </sections>
692
- <annex id="annex1">
692
+ <annex id="annex1" displayorder='5'>
693
693
  <title>
694
694
  <strong>Annex A</strong>
695
695
  <br/>(informative)</title>
@@ -821,7 +821,7 @@ RSpec.describe IsoDoc do
821
821
  <?xml version='1.0'?>
822
822
  <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
823
823
  <preface>
824
- <foreword>
824
+ <foreword displayorder='1'>
825
825
  <p>
826
826
  <xref target="N">Table 1</xref>
827
827
  <xref target="note1">Table 2</xref>
@@ -833,7 +833,7 @@ RSpec.describe IsoDoc do
833
833
  </foreword>
834
834
  </preface>
835
835
  <sections>
836
- <clause id="scope" type="scope">
836
+ <clause id="scope" type="scope" displayorder='2'>
837
837
  <title depth="1">1
838
838
  <tab/>
839
839
  Scope</title>
@@ -851,10 +851,10 @@ RSpec.describe IsoDoc do
851
851
  <xref target="N">Table 1</xref>
852
852
  </p>
853
853
  </clause>
854
- <terms id="terms">
854
+ <terms id="terms" displayorder='3'>
855
855
  <title>2</title>
856
856
  </terms>
857
- <clause id="widgets">
857
+ <clause id="widgets" displayorder='4'>
858
858
  <title depth="1">3
859
859
  <tab/>
860
860
  Widgets</title>
@@ -887,7 +887,7 @@ RSpec.describe IsoDoc do
887
887
  </clause>
888
888
  </clause>
889
889
  </sections>
890
- <annex id="annex1">
890
+ <annex id="annex1" displayorder='5'>
891
891
  <title>
892
892
  <strong>Annex A</strong>
893
893
  <br/>(informative)</title>
@@ -972,7 +972,7 @@ RSpec.describe IsoDoc do
972
972
  <?xml version='1.0'?>
973
973
  <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
974
974
  <preface>
975
- <foreword>
975
+ <foreword displayorder='1'>
976
976
  <p>
977
977
  <xref target="note1">2.1, Note 1</xref>
978
978
  <xref target="note2">2.2, Note 1</xref>
@@ -981,12 +981,12 @@ RSpec.describe IsoDoc do
981
981
  </foreword>
982
982
  </preface>
983
983
  <sections>
984
- <clause id="scope" type="scope">
984
+ <clause id="scope" type="scope" displayorder='2'>
985
985
  <title depth="1">1
986
986
  <tab/>
987
987
  Scope</title>
988
988
  </clause>
989
- <terms id="terms">
989
+ <terms id="terms" displayorder='3'>
990
990
  <title>2</title>
991
991
  <term id="_waxy_rice">
992
992
  <name>2.1</name>
@@ -1118,66 +1118,77 @@ RSpec.describe IsoDoc do
1118
1118
  </bibliography>
1119
1119
  </iso-standard>
1120
1120
  INPUT
1121
- <?xml version='1.0'?>
1122
- <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
1121
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
1123
1122
  <preface>
1124
- <foreword obligation="informative">
1123
+ <foreword obligation='informative' displayorder='1'>
1125
1124
  <title>Foreword</title>
1126
- <p id="A">This is a preamble
1127
- <xref target="C">0.1</xref>
1128
- <xref target="C1">0.2</xref>
1129
- <xref target="D">Clause 1</xref>
1130
- <xref target="H">Clause 3</xref>
1131
- <xref target="I">3.1</xref>
1132
- <xref target="J">3.1.1</xref>
1133
- <xref target="K">3.2</xref>
1134
- <xref target="L">Clause 4</xref>
1135
- <xref target="M">Clause 5</xref>
1136
- <xref target="N">5.1</xref>
1137
- <xref target="O">5.2</xref>
1138
- <xref target="P">Annex A</xref>
1139
- <xref target="Q">A.1</xref>
1140
- <xref target="Q1">A.1.1</xref>
1141
- <xref target="Q2">Annex A, Appendix 1</xref>
1142
- <xref target="Q3">Annex A, Appendix 1.1</xref>
1143
- <xref target="R">Clause 2</xref></p>
1125
+ <p id='A'>
1126
+ This is a preamble
1127
+ <xref target='C'>0.1</xref>
1128
+ <xref target='C1'>0.2</xref>
1129
+ <xref target='D'>Clause 1</xref>
1130
+ <xref target='H'>Clause 3</xref>
1131
+ <xref target='I'>3.1</xref>
1132
+ <xref target='J'>3.1.1</xref>
1133
+ <xref target='K'>3.2</xref>
1134
+ <xref target='L'>Clause 4</xref>
1135
+ <xref target='M'>Clause 5</xref>
1136
+ <xref target='N'>5.1</xref>
1137
+ <xref target='O'>5.2</xref>
1138
+ <xref target='P'>Annex A</xref>
1139
+ <xref target='Q'>A.1</xref>
1140
+ <xref target='Q1'>A.1.1</xref>
1141
+ <xref target='Q2'>Annex A, Appendix 1</xref>
1142
+ <xref target='Q3'>Annex A, Appendix 1.1</xref>
1143
+ <xref target='R'>Clause 2</xref>
1144
+ </p>
1144
1145
  </foreword>
1145
- <introduction id="B" obligation="informative">
1146
- <title depth="1">
1146
+ <introduction id='B' obligation='informative' displayorder='2'>
1147
+ <title depth='1'>
1147
1148
  0
1148
1149
  <tab/>
1149
- Introduction</title>
1150
- <clause id="C" inline-header="false" obligation="informative">
1151
- <title depth="2">
1150
+ Introduction
1151
+ </title>
1152
+ <clause id='C' inline-header='false' obligation='informative'>
1153
+ <title depth='2'>
1152
1154
  0.1
1153
1155
  <tab/>
1154
- Introduction Subsection</title>
1156
+ Introduction Subsection
1157
+ </title>
1158
+ </clause>
1159
+ <clause id='C1' inline-header='true' obligation='informative'>
1160
+ <title>0.2</title>
1161
+ Text
1155
1162
  </clause>
1156
- <clause id="C1" inline-header="true" obligation="informative">
1157
- <title>0.2</title>Text</clause>
1158
1163
  </introduction>
1159
1164
  </preface>
1160
1165
  <sections>
1161
- <clause id="D" obligation="normative" type="scope">
1162
- <title depth="1">1
1166
+ <clause id='D' obligation='normative' type='scope' displayorder='3'>
1167
+ <title depth='1'>
1168
+ 1
1163
1169
  <tab/>
1164
- Scope</title>
1165
- <p id="E">Text</p>
1170
+ Scope
1171
+ </title>
1172
+ <p id='E'>Text</p>
1166
1173
  </clause>
1167
- <terms id="H" obligation="normative">
1168
- <title depth="1">3
1174
+ <terms id='H' obligation='normative' displayorder='5'>
1175
+ <title depth='1'>
1176
+ 3
1169
1177
  <tab/>
1170
- Terms, definitions, symbols and abbreviated terms</title>
1171
- <terms id="I" obligation="normative">
1172
- <title depth="2">3.1
1178
+ Terms, definitions, symbols and abbreviated terms
1179
+ </title>
1180
+ <terms id='I' obligation='normative'>
1181
+ <title depth='2'>
1182
+ 3.1
1173
1183
  <tab/>
1174
- Normal Terms</title>
1175
- <term id="J">
1184
+ Normal Terms
1185
+ </title>
1186
+ <term id='J'>
1176
1187
  <name>3.1.1</name>
1177
1188
  <preferred>Term2</preferred>
1178
1189
  </term>
1179
1190
  </terms>
1180
- <definitions id="K" inline-header="true">
1191
+ <definitions id='K' inline-header='true'>
1181
1192
  <title>3.2</title>
1182
1193
  <dl>
1183
1194
  <dt>Symbol</dt>
@@ -1185,67 +1196,85 @@ RSpec.describe IsoDoc do
1185
1196
  </dl>
1186
1197
  </definitions>
1187
1198
  </terms>
1188
- <definitions id="L">
1199
+ <definitions id='L' displayorder='6'>
1189
1200
  <title>4</title>
1190
1201
  <dl>
1191
1202
  <dt>Symbol</dt>
1192
1203
  <dd>Definition</dd>
1193
1204
  </dl>
1194
1205
  </definitions>
1195
- <clause id="M" inline-header="false" obligation="normative">
1196
- <title depth="1">5
1206
+ <clause id='M' inline-header='false' obligation='normative' displayorder='7'>
1207
+ <title depth='1'>
1208
+ 5
1197
1209
  <tab/>
1198
- Clause 4</title>
1199
- <clause id="N" inline-header="false" obligation="normative">
1200
- <title depth="2">5.1
1210
+ Clause 4
1211
+ </title>
1212
+ <clause id='N' inline-header='false' obligation='normative'>
1213
+ <title depth='2'>
1214
+ 5.1
1201
1215
  <tab/>
1202
- Introduction</title>
1216
+ Introduction
1217
+ </title>
1203
1218
  </clause>
1204
- <clause id="O" inline-header="false" obligation="normative">
1205
- <title depth="2">5.2
1219
+ <clause id='O' inline-header='false' obligation='normative'>
1220
+ <title depth='2'>
1221
+ 5.2
1206
1222
  <tab/>
1207
- Clause 4.2</title>
1223
+ Clause 4.2
1224
+ </title>
1208
1225
  </clause>
1209
1226
  </clause>
1210
1227
  </sections>
1211
- <annex id="P" inline-header="false" obligation="normative">
1228
+ <annex id='P' inline-header='false' obligation='normative' displayorder='8'>
1212
1229
  <title>
1213
1230
  <strong>Annex A</strong>
1214
- <br/>(normative)
1215
1231
  <br/>
1232
+ (normative)
1216
1233
  <br/>
1217
- <strong>Annex</strong></title>
1218
- <clause id="Q" inline-header="false" obligation="normative">
1219
- <title depth="2">A.1
1234
+ <br/>
1235
+ <strong>Annex</strong>
1236
+ </title>
1237
+ <clause id='Q' inline-header='false' obligation='normative'>
1238
+ <title depth='2'>
1239
+ A.1
1220
1240
  <tab/>
1221
- Annex A.1</title>
1222
- <clause id="Q1" inline-header="false" obligation="normative">
1223
- <title depth="3">A.1.1
1241
+ Annex A.1
1242
+ </title>
1243
+ <clause id='Q1' inline-header='false' obligation='normative'>
1244
+ <title depth='3'>
1245
+ A.1.1
1224
1246
  <tab/>
1225
- Annex A.1a</title>
1247
+ Annex A.1a
1248
+ </title>
1226
1249
  </clause>
1227
1250
  </clause>
1228
- <appendix id="Q2" inline-header="false" obligation="normative">
1229
- <title depth="2">Appendix 1
1251
+ <appendix id='Q2' inline-header='false' obligation='normative'>
1252
+ <title depth='2'>
1253
+ Appendix 1
1230
1254
  <tab/>
1231
- An Appendix</title>
1232
- <clause id="Q3" inline-header="false" obligation="normative">
1233
- <title depth="3">Appendix 1.1
1255
+ An Appendix
1256
+ </title>
1257
+ <clause id='Q3' inline-header='false' obligation='normative'>
1258
+ <title depth='3'>
1259
+ Appendix 1.1
1234
1260
  <tab/>
1235
- Appendix subclause</title>
1261
+ Appendix subclause
1262
+ </title>
1236
1263
  </clause>
1237
1264
  </appendix>
1238
1265
  </annex>
1239
1266
  <bibliography>
1240
- <references id="R" normative="true" obligation="informative">
1241
- <title depth="1">2
1267
+ <references id='R' normative='true' obligation='informative' displayorder='4'>
1268
+ <title depth='1'>
1269
+ 2
1242
1270
  <tab/>
1243
- Normative References</title>
1271
+ Normative References
1272
+ </title>
1244
1273
  </references>
1245
- <clause id="S" obligation="informative">
1246
- <title depth="1">Bibliography</title>
1247
- <references id="T" normative="false" obligation="informative">
1248
- <title depth="2">Bibliography Subsection</title>
1274
+ <clause id='S' obligation='informative' displayorder='9'>
1275
+ <title depth='1'>Bibliography</title>
1276
+ <references id='T' normative='false' obligation='informative'>
1277
+ <title depth='2'>Bibliography Subsection</title>
1249
1278
  </references>
1250
1279
  </clause>
1251
1280
  </bibliography>
@@ -1311,7 +1340,7 @@ RSpec.describe IsoDoc do
1311
1340
  <?xml version='1.0'?>
1312
1341
  <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
1313
1342
  <preface>
1314
- <foreword>
1343
+ <foreword displayorder='1'>
1315
1344
  <p>
1316
1345
  <xref target="N">Clause 1, List</xref>
1317
1346
  <xref target="note1">3.1, List 1</xref>
@@ -1323,7 +1352,7 @@ RSpec.describe IsoDoc do
1323
1352
  </foreword>
1324
1353
  </preface>
1325
1354
  <sections>
1326
- <clause id="scope" type="scope">
1355
+ <clause id="scope" type="scope" displayorder='2'>
1327
1356
  <title depth="1">1
1328
1357
  <tab/>
1329
1358
  Scope</title>
@@ -1333,10 +1362,10 @@ RSpec.describe IsoDoc do
1333
1362
  </li>
1334
1363
  </ol>
1335
1364
  </clause>
1336
- <terms id="terms">
1365
+ <terms id="terms" displayorder='3'>
1337
1366
  <title>2</title>
1338
1367
  </terms>
1339
- <clause id="widgets">
1368
+ <clause id="widgets" displayorder='4'>
1340
1369
  <title depth="1">3
1341
1370
  <tab/>
1342
1371
  Widgets</title>
@@ -1355,7 +1384,7 @@ RSpec.describe IsoDoc do
1355
1384
  </clause>
1356
1385
  </clause>
1357
1386
  </sections>
1358
- <annex id="annex1">
1387
+ <annex id="annex1" displayorder='5'>
1359
1388
  <title>
1360
1389
  <strong>Annex A</strong>
1361
1390
  <br/>(informative)</title>
@@ -1453,7 +1482,7 @@ RSpec.describe IsoDoc do
1453
1482
  <?xml version='1.0'?>
1454
1483
  <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
1455
1484
  <preface>
1456
- <foreword>
1485
+ <foreword displayorder='1'>
1457
1486
  <p>
1458
1487
  <xref target='N'>Clause 1 a)</xref>
1459
1488
  <xref target='note1'>3.1 List 1 a)</xref>
@@ -1465,7 +1494,7 @@ RSpec.describe IsoDoc do
1465
1494
  </foreword>
1466
1495
  </preface>
1467
1496
  <sections>
1468
- <clause id='scope' type='scope'>
1497
+ <clause id='scope' type='scope' displayorder='2'>
1469
1498
  <title depth='1'>1<tab/>Scope</title>
1470
1499
  <ol id='N1'>
1471
1500
  <li id='N'>
@@ -1473,8 +1502,8 @@ RSpec.describe IsoDoc do
1473
1502
  </li>
1474
1503
  </ol>
1475
1504
  </clause>
1476
- <terms id='terms'><title>2</title></terms>
1477
- <clause id='widgets'>
1505
+ <terms id='terms' displayorder='3'><title>2</title></terms>
1506
+ <clause id='widgets' displayorder='4'>
1478
1507
  <title depth='1'>3<tab/>Widgets</title>
1479
1508
  <clause inline-header="true" id='widgets1'><title>3.1</title>
1480
1509
  <ol id='note1l'>
@@ -1490,7 +1519,7 @@ RSpec.describe IsoDoc do
1490
1519
  </clause>
1491
1520
  </clause>
1492
1521
  </sections>
1493
- <annex id='annex1'><title><strong>Annex A</strong><br/>(informative)</title>
1522
+ <annex id='annex1' displayorder='5'><title><strong>Annex A</strong><br/>(informative)</title>
1494
1523
  <clause inline-header="true" id='annex1a'><title>A.1</title>
1495
1524
  <ol id='ANl'>
1496
1525
  <li id='AN'>
@@ -1571,7 +1600,7 @@ RSpec.describe IsoDoc do
1571
1600
  <?xml version='1.0'?>
1572
1601
  <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
1573
1602
  <preface>
1574
- <foreword>
1603
+ <foreword displayorder='1'>
1575
1604
  <p>
1576
1605
  <xref target='N'>Clause 1 a)</xref>
1577
1606
  <xref target='note1'>Clause 1 a.1)</xref>
@@ -1583,7 +1612,7 @@ RSpec.describe IsoDoc do
1583
1612
  </foreword>
1584
1613
  </preface>
1585
1614
  <sections>
1586
- <clause id='scope' type='scope'>
1615
+ <clause id='scope' type='scope' displayorder='2'>
1587
1616
  <title depth='1'>1<tab/>Scope</title>
1588
1617
  <ol id='N1'>
1589
1618
  <li id='N'>