metanorma-iso 1.9.2 → 1.9.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iso/basicdoc.rng +21 -4
  3. data/lib/asciidoctor/iso/cleanup.rb +3 -4
  4. data/lib/asciidoctor/iso/front.rb +9 -1
  5. data/lib/asciidoctor/iso/front_id.rb +7 -2
  6. data/lib/asciidoctor/iso/isodoc.rng +241 -61
  7. data/lib/asciidoctor/iso/isostandard.rng +10 -23
  8. data/lib/asciidoctor/iso/reqt.rng +23 -2
  9. data/lib/asciidoctor/iso/section.rb +7 -1
  10. data/lib/asciidoctor/iso/validate_section.rb +18 -20
  11. data/lib/asciidoctor/iso/validate_style.rb +17 -9
  12. data/lib/isodoc/iso/html/isodoc.css +1 -2
  13. data/lib/isodoc/iso/html/isodoc.scss +1 -1
  14. data/lib/isodoc/iso/html/wordstyle.css +16 -4
  15. data/lib/isodoc/iso/html/wordstyle.scss +16 -4
  16. data/lib/isodoc/iso/index.rb +48 -24
  17. data/lib/isodoc/iso/iso.amendment.xsl +407 -123
  18. data/lib/isodoc/iso/iso.international-standard.xsl +407 -123
  19. data/lib/isodoc/iso/metadata.rb +28 -16
  20. data/lib/isodoc/iso/presentation_xml_convert.rb +30 -22
  21. data/lib/metanorma/iso/version.rb +1 -1
  22. data/metanorma-iso.gemspec +3 -1
  23. data/spec/asciidoctor/base_spec.rb +351 -177
  24. data/spec/asciidoctor/blank_spec.rb +38 -0
  25. data/spec/asciidoctor/blocks_spec.rb +39 -0
  26. data/spec/asciidoctor/refs_spec.rb +1 -1
  27. data/spec/isodoc/inline_spec.rb +306 -245
  28. data/spec/isodoc/terms_spec.rb +30 -0
  29. data/spec/spec_helper.rb +12 -0
  30. data/spec/vcr_cassettes/docrels.yml +393 -0
  31. metadata +32 -2
data/spec/isodoc/inline_spec.rb CHANGED
@@ -131,26 +131,27 @@ RSpec.describe IsoDoc do
131
131
  <sections>
132
132
  </iso-standard>
133
133
  INPUT
134
- expect(xmlpp(output.sub(/<html/, "<html xmlns:m='m'"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
135
- #{HTML_HDR.sub(/<html/, "<html xmlns:m='m'")}
136
- <br/>
137
- <div>
138
- <h1 class="ForewordTitle">Foreword</h1>
139
- <p>
140
- <span class="stem">(#(A)#)</span>
141
- <span class="stem">
142
- <m:math>
143
- <m:row>X</m:row>
144
- </m:math>
145
- </span>
146
- <span class="stem">Latex?</span>
147
- </p>
148
- </div>
149
- <p class="zzSTDTitle1"/>
150
- </div>
151
- </body>
152
- </html>
153
- OUTPUT
134
+ expect(xmlpp(output.sub(/<html/,
135
+ "<html xmlns:m='m'"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
136
+ #{HTML_HDR.sub(/<html/, "<html xmlns:m='m'")}
137
+ <br/>
138
+ <div>
139
+ <h1 class="ForewordTitle">Foreword</h1>
140
+ <p>
141
+ <span class="stem">(#(A)#)</span>
142
+ <span class="stem">
143
+ <m:math>
144
+ <m:row>X</m:row>
145
+ </m:math>
146
+ </span>
147
+ <span class="stem">Latex?</span>
148
+ </p>
149
+ </div>
150
+ <p class="zzSTDTitle1"/>
151
+ </div>
152
+ </body>
153
+ </html>
154
+ OUTPUT
154
155
  end
155
156
 
156
157
  it "overrides AsciiMath delimiters" do
@@ -232,163 +233,165 @@ RSpec.describe IsoDoc do
232
233
  end
233
234
 
234
235
  it "processes eref content" do
235
- output = IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true)
236
- <iso-standard xmlns="http://riboseinc.com/isoxml">
237
- <preface>
238
- <foreword>
239
- <p>
240
- <eref bibitemid="IEV" citeas="IEV" type="inline">
241
- <locality type="clause">
242
- <referenceFrom>1-2-3</referenceFrom>
243
- </locality>
244
- </eref>
245
- <eref bibitemid="ISO712" citeas="ISO 712" type="inline"/>
246
- <eref bibitemid="ISO712" type="inline"/>
247
- <eref bibitemid="ISO712" type="inline">
248
- <locality type="table">
249
- <referenceFrom>1</referenceFrom>
250
- </locality>
251
- </eref>
252
- <eref bibitemid="ISO712" type="inline">
253
- <locality type="table">
254
- <referenceFrom>1</referenceFrom>
255
- <referenceTo>1</referenceTo>
256
- </locality>
257
- </eref>
258
- <eref bibitemid="ISO712" type="inline">
259
- <locality type="clause">
260
- <referenceFrom>1</referenceFrom>
261
- </locality>
262
- <locality type="table">
263
- <referenceFrom>1</referenceFrom>
264
- </locality>
265
- </eref>
266
- <eref bibitemid="ISO712" type="inline">
267
- <locality type="clause">
268
- <referenceFrom>1</referenceFrom>
269
- </locality>
270
- <locality type="list">
271
- <referenceFrom>a</referenceFrom>
272
- </locality>
273
- </eref>
274
- <eref bibitemid="ISO712" type="inline">
275
- <locality type="clause">
276
- <referenceFrom>1</referenceFrom>
277
- </locality>
278
- </eref>
279
- <eref bibitemid="ISO712" type="inline">
280
- <locality type="clause">
281
- <referenceFrom>1.5</referenceFrom>
282
- </locality>
283
- </eref>
284
- <eref bibitemid="ISO712" type="inline">
285
- <locality type="table">
286
- <referenceFrom>1</referenceFrom>
287
- </locality>A</eref>
288
- <eref bibitemid="ISO712" type="inline">
289
- <locality type="whole"/>
290
- </eref>
291
- <eref bibitemid="ISO712" type="inline">
292
- <locality type="locality:prelude">
293
- <referenceFrom>7</referenceFrom>
294
- </locality>
295
- </eref>
296
- <eref bibitemid="ISO712" citeas="ISO 712" type="inline">A</eref>
297
- </p>
298
- </foreword>
299
- </preface>
300
- <bibliography>
301
- <references id="_normative_references" normative="true" obligation="informative">
302
- <title>Normative References</title>
303
- <bibitem id="ISO712" type="standard">
304
- <title format="text/plain">Cereals and cereal products</title>
305
- <docidentifier>ISO 712</docidentifier>
306
- <contributor>
307
- <role type="publisher"/>
308
- <organization>
309
- <abbreviation>ISO</abbreviation>
310
- </organization>
311
- </contributor>
312
- </bibitem>
313
- </references>
314
- </bibliography>
315
- </iso-standard>
316
- INPUT
317
- expect(xmlpp(output).sub(%r{<i18nyaml>.*</i18nyaml>}m, "")).to be_equivalent_to xmlpp(<<~"OUTPUT")
318
- <?xml version='1.0'?>
319
- <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
320
- <preface>
321
- <foreword displayorder="1">
322
- <p>
323
- <eref bibitemid="IEV" citeas="IEV" type="inline">
324
- <locality type="clause">
325
- <referenceFrom>1-2-3</referenceFrom>
326
- </locality>IEV, 1-2-3</eref>
327
- <eref bibitemid="ISO712" citeas="ISO 712" type="inline">ISO 712</eref>
328
- <eref bibitemid="ISO712" type="inline">ISO 712</eref>
329
- <eref bibitemid="ISO712" type="inline">
330
- <locality type="table">
331
- <referenceFrom>1</referenceFrom>
332
- </locality>ISO 712, Table 1</eref>
333
- <eref bibitemid="ISO712" type="inline">
334
- <locality type="table">
335
- <referenceFrom>1</referenceFrom>
336
- <referenceTo>1</referenceTo>
337
- </locality>ISO 712, Table 1–1</eref>
338
- <eref bibitemid="ISO712" type="inline">
339
- <locality type="clause">
340
- <referenceFrom>1</referenceFrom>
341
- </locality>
342
- <locality type="table">
343
- <referenceFrom>1</referenceFrom>
344
- </locality>ISO 712, Clause 1, Table 1</eref>
345
- <eref bibitemid="ISO712" type="inline">
346
- <locality type="clause">
347
- <referenceFrom>1</referenceFrom>
348
- </locality>
349
- <locality type="list">
350
- <referenceFrom>a</referenceFrom>
351
- </locality>ISO 712, Clause 1 a)</eref>
352
- <eref bibitemid="ISO712" type="inline">
353
- <locality type="clause">
354
- <referenceFrom>1</referenceFrom>
355
- </locality>ISO 712, Clause 1</eref>
356
- <eref bibitemid="ISO712" type="inline">
357
- <locality type="clause">
358
- <referenceFrom>1.5</referenceFrom>
359
- </locality>ISO 712, 1.5</eref>
360
- <eref bibitemid="ISO712" type="inline">
361
- <locality type="table">
362
- <referenceFrom>1</referenceFrom>
363
- </locality>A</eref>
364
- <eref bibitemid="ISO712" type="inline">
365
- <locality type="whole"/>ISO 712, Whole of text</eref>
366
- <eref bibitemid="ISO712" type="inline">
367
- <locality type="locality:prelude">
368
- <referenceFrom>7</referenceFrom>
369
- </locality>ISO 712, Prelude 7</eref>
370
- <eref bibitemid="ISO712" citeas="ISO 712" type="inline">A</eref>
371
- </p>
372
- </foreword>
373
- </preface>
374
- <bibliography>
375
- <references id="_normative_references" normative="true" obligation="informative" displayorder="2">
376
- <title depth="1">1<tab/>
377
- Normative References</title>
378
- <bibitem id="ISO712" type="standard">
379
- <title format="text/plain">Cereals and cereal products</title>
380
- <docidentifier>ISO 712</docidentifier>
381
- <contributor>
382
- <role type="publisher"/>
383
- <organization>
384
- <abbreviation>ISO</abbreviation>
385
- </organization>
386
- </contributor>
387
- </bibitem>
388
- </references>
389
- </bibliography>
390
- </iso-standard>
391
- OUTPUT
236
+ output = IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test",
237
+ <<~"INPUT", true)
238
+ <iso-standard xmlns="http://riboseinc.com/isoxml">
239
+ <preface>
240
+ <foreword>
241
+ <p>
242
+ <eref bibitemid="IEV" citeas="IEV" type="inline">
243
+ <locality type="clause">
244
+ <referenceFrom>1-2-3</referenceFrom>
245
+ </locality>
246
+ </eref>
247
+ <eref bibitemid="ISO712" citeas="ISO 712" type="inline"/>
248
+ <eref bibitemid="ISO712" type="inline"/>
249
+ <eref bibitemid="ISO712" type="inline">
250
+ <locality type="table">
251
+ <referenceFrom>1</referenceFrom>
252
+ </locality>
253
+ </eref>
254
+ <eref bibitemid="ISO712" type="inline">
255
+ <locality type="table">
256
+ <referenceFrom>1</referenceFrom>
257
+ <referenceTo>1</referenceTo>
258
+ </locality>
259
+ </eref>
260
+ <eref bibitemid="ISO712" type="inline">
261
+ <locality type="clause">
262
+ <referenceFrom>1</referenceFrom>
263
+ </locality>
264
+ <locality type="table">
265
+ <referenceFrom>1</referenceFrom>
266
+ </locality>
267
+ </eref>
268
+ <eref bibitemid="ISO712" type="inline">
269
+ <locality type="clause">
270
+ <referenceFrom>1</referenceFrom>
271
+ </locality>
272
+ <locality type="list">
273
+ <referenceFrom>a</referenceFrom>
274
+ </locality>
275
+ </eref>
276
+ <eref bibitemid="ISO712" type="inline">
277
+ <locality type="clause">
278
+ <referenceFrom>1</referenceFrom>
279
+ </locality>
280
+ </eref>
281
+ <eref bibitemid="ISO712" type="inline">
282
+ <locality type="clause">
283
+ <referenceFrom>1.5</referenceFrom>
284
+ </locality>
285
+ </eref>
286
+ <eref bibitemid="ISO712" type="inline">
287
+ <locality type="table">
288
+ <referenceFrom>1</referenceFrom>
289
+ </locality>A</eref>
290
+ <eref bibitemid="ISO712" type="inline">
291
+ <locality type="whole"/>
292
+ </eref>
293
+ <eref bibitemid="ISO712" type="inline">
294
+ <locality type="locality:prelude">
295
+ <referenceFrom>7</referenceFrom>
296
+ </locality>
297
+ </eref>
298
+ <eref bibitemid="ISO712" citeas="ISO 712" type="inline">A</eref>
299
+ </p>
300
+ </foreword>
301
+ </preface>
302
+ <bibliography>
303
+ <references id="_normative_references" normative="true" obligation="informative">
304
+ <title>Normative References</title>
305
+ <bibitem id="ISO712" type="standard">
306
+ <title format="text/plain">Cereals and cereal products</title>
307
+ <docidentifier>ISO 712</docidentifier>
308
+ <contributor>
309
+ <role type="publisher"/>
310
+ <organization>
311
+ <abbreviation>ISO</abbreviation>
312
+ </organization>
313
+ </contributor>
314
+ </bibitem>
315
+ </references>
316
+ </bibliography>
317
+ </iso-standard>
318
+ INPUT
319
+ expect(xmlpp(output).sub(%r{<i18nyaml>.*</i18nyaml>}m,
320
+ "")).to be_equivalent_to xmlpp(<<~"OUTPUT")
321
+ <?xml version='1.0'?>
322
+ <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
323
+ <preface>
324
+ <foreword displayorder="1">
325
+ <p>
326
+ <eref bibitemid="IEV" citeas="IEV" type="inline">
327
+ <locality type="clause">
328
+ <referenceFrom>1-2-3</referenceFrom>
329
+ </locality>IEV, 1-2-3</eref>
330
+ <eref bibitemid="ISO712" citeas="ISO 712" type="inline">ISO 712</eref>
331
+ <eref bibitemid="ISO712" type="inline">ISO 712</eref>
332
+ <eref bibitemid="ISO712" type="inline">
333
+ <locality type="table">
334
+ <referenceFrom>1</referenceFrom>
335
+ </locality>ISO 712, Table 1</eref>
336
+ <eref bibitemid="ISO712" type="inline">
337
+ <locality type="table">
338
+ <referenceFrom>1</referenceFrom>
339
+ <referenceTo>1</referenceTo>
340
+ </locality>ISO 712, Table 1–1</eref>
341
+ <eref bibitemid="ISO712" type="inline">
342
+ <locality type="clause">
343
+ <referenceFrom>1</referenceFrom>
344
+ </locality>
345
+ <locality type="table">
346
+ <referenceFrom>1</referenceFrom>
347
+ </locality>ISO 712, Clause 1, Table 1</eref>
348
+ <eref bibitemid="ISO712" type="inline">
349
+ <locality type="clause">
350
+ <referenceFrom>1</referenceFrom>
351
+ </locality>
352
+ <locality type="list">
353
+ <referenceFrom>a</referenceFrom>
354
+ </locality>ISO 712, Clause 1 a)</eref>
355
+ <eref bibitemid="ISO712" type="inline">
356
+ <locality type="clause">
357
+ <referenceFrom>1</referenceFrom>
358
+ </locality>ISO 712, Clause 1</eref>
359
+ <eref bibitemid="ISO712" type="inline">
360
+ <locality type="clause">
361
+ <referenceFrom>1.5</referenceFrom>
362
+ </locality>ISO 712, 1.5</eref>
363
+ <eref bibitemid="ISO712" type="inline">
364
+ <locality type="table">
365
+ <referenceFrom>1</referenceFrom>
366
+ </locality>A</eref>
367
+ <eref bibitemid="ISO712" type="inline">
368
+ <locality type="whole"/>ISO 712, Whole of text</eref>
369
+ <eref bibitemid="ISO712" type="inline">
370
+ <locality type="locality:prelude">
371
+ <referenceFrom>7</referenceFrom>
372
+ </locality>ISO 712, Prelude 7</eref>
373
+ <eref bibitemid="ISO712" citeas="ISO 712" type="inline">A</eref>
374
+ </p>
375
+ </foreword>
376
+ </preface>
377
+ <bibliography>
378
+ <references id="_normative_references" normative="true" obligation="informative" displayorder="2">
379
+ <title depth="1">1<tab/>
380
+ Normative References</title>
381
+ <bibitem id="ISO712" type="standard">
382
+ <title format="text/plain">Cereals and cereal products</title>
383
+ <docidentifier>ISO 712</docidentifier>
384
+ <contributor>
385
+ <role type="publisher"/>
386
+ <organization>
387
+ <abbreviation>ISO</abbreviation>
388
+ </organization>
389
+ </contributor>
390
+ </bibitem>
391
+ </references>
392
+ </bibliography>
393
+ </iso-standard>
394
+ OUTPUT
392
395
  end
393
396
 
394
397
  it "processes concept markup" do
@@ -396,9 +399,10 @@ RSpec.describe IsoDoc do
396
399
  <iso-standard xmlns="http://riboseinc.com/isoxml">
397
400
  <sections>
398
401
  <terms id="Terms">
402
+ <term id="B"><preferred>B</preferred>
399
403
  <p>
400
404
  <ul>
401
- <li><concept><refterm>term0</refterm>
405
+ <li><concept><refterm>term0</refterm>
402
406
  <xref target='clause1'/>
403
407
  </concept></li>
404
408
  <li><concept><refterm>term1</refterm>
@@ -473,6 +477,7 @@ RSpec.describe IsoDoc do
473
477
  </concept></li>
474
478
  </ul>
475
479
  </p>
480
+ </term>
476
481
  </terms>
477
482
  <clause id="clause1"><title>Clause 1</title></clause>
478
483
  </sections>
@@ -496,6 +501,9 @@ RSpec.describe IsoDoc do
496
501
  <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
497
502
  <sections>
498
503
  <terms id="Terms" displayorder="2"><title>2</title>
504
+ <term id='B'>
505
+ <name>2.1</name>
506
+ <preferred>B</preferred>
499
507
  <p>
500
508
  <ul>
501
509
  <li>
@@ -567,6 +575,7 @@ RSpec.describe IsoDoc do
567
575
  </li>
568
576
  </ul>
569
577
  </p>
578
+ </term>
570
579
  </terms>
571
580
  <clause id="clause1" displayorder="3"><title depth="1">3<tab/>Clause 1</title></clause>
572
581
  </sections>
@@ -605,6 +614,8 @@ RSpec.describe IsoDoc do
605
614
  </div>
606
615
  <div id='Terms'>
607
616
  <h1>2</h1>
617
+ <p class='TermNum' id='B'>2.1</p>
618
+ <p class='Terms' style='text-align:left;'>B</p>
608
619
  <p>
609
620
  <ul>
610
621
  <li>
@@ -695,6 +706,14 @@ RSpec.describe IsoDoc do
695
706
  </foreword></preface>
696
707
  <sections>
697
708
  <terms id="Terms">
709
+ <clause id="A">
710
+ <ul>
711
+ <li><concept><refterm>term1</refterm>
712
+ <renderterm>term</renderterm>
713
+ <xref target='clause1'/>
714
+ </concept></li>
715
+ </ul>
716
+ </clause>
698
717
  <term id="clause1">
699
718
  <ul>
700
719
  <li><concept><refterm>term1</refterm>
@@ -712,43 +731,50 @@ RSpec.describe IsoDoc do
712
731
  </iso-standard>
713
732
  INPUT
714
733
  presxml = <<~OUTPUT
715
- <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
716
- <preface>
717
- <foreword id='A' displayorder='1'>
718
- <ul>
719
- <li>term</li>
720
- </ul>
721
- </foreword>
722
- </preface>
723
- <sections>
724
- <terms id='Terms' displayorder='2'>
725
- <title>1</title>
726
- <term id='clause1'>
727
- <name>1.1</name>
728
- <ul>
729
- <li>
730
- <em>term</em>
731
- (
732
- <xref target='clause1'>1.1</xref>
733
- )
734
- </li>
735
- <li>term</li>
736
- </ul>
737
- </term>
738
- </terms>
739
- </sections>
740
- </iso-standard>
734
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
735
+ <preface>
736
+ <foreword id='A' displayorder='1'>
737
+ <ul>
738
+ <li>term</li>
739
+ </ul>
740
+ </foreword>
741
+ </preface>
742
+ <sections>
743
+ <terms id='Terms' displayorder='2'>
744
+ <title>1</title>
745
+ <clause id='A' inline-header='true'>
746
+ <title>1.1</title>
747
+ <ul>
748
+ <li> term </li>
749
+ </ul>
750
+ </clause>
751
+ <term id='clause1'>
752
+ <name>1.2</name>
753
+ <ul>
754
+ <li>
755
+ <em>term</em>
756
+ (
757
+ <xref target='clause1'>1.2</xref>
758
+ )
759
+ </li>
760
+ <li>term</li>
761
+ </ul>
762
+ </term>
763
+ </terms>
764
+ </sections>
765
+ </iso-standard>
741
766
  OUTPUT
742
767
  expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
743
768
  .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
744
769
  end
745
-
770
+
746
771
  it "processes concept attributes" do
747
772
  input = <<~INPUT
748
773
  <iso-standard xmlns="http://riboseinc.com/isoxml">
749
774
  <sections>
750
775
  <clause id="clause1"><title>Clause 1</title></clause>
751
776
  <terms id="A">
777
+ <term id="B"><preferred>B</preferred<
752
778
  <p>
753
779
  <ul>
754
780
  <li>
@@ -776,20 +802,27 @@ RSpec.describe IsoDoc do
776
802
  <renderterm>term</renderterm>
777
803
  <xref target='clause1'/>
778
804
  </concept></li>
805
+ <li><concept ital="true" ref="true" linkmention="true" linkref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept></li>
806
+ <li><concept ital="true" ref="true" linkmention="true" linkref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept></li>
807
+ <li><concept ital="true" ref="true" linkmention="false" linkref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept></li>
808
+ <li><concept ital="true" ref="true" linkmention="false" linkref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept></li>
779
809
  </ul></p>
810
+ </term>
780
811
  </terms>
781
812
  </sections>
782
813
  </iso-standard>
783
814
  INPUT
784
815
  presxml = <<~OUTPUT
785
- <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
816
+ <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
786
817
  <sections>
787
818
  <clause id="clause1" displayorder="1"><title depth="1">1<tab/>Clause 1</title></clause>
788
819
  <terms id="A" displayorder="2"><title>2</title>
820
+ <term id='B'>
821
+ <name>2.1</name>
822
+ <preferred>B</preferred>
789
823
  <p>
790
824
  <ul>
791
825
  <li>
792
-
793
826
  <em>term</em>
794
827
  (<xref target="clause1">Clause 1</xref>)
795
828
  </li>
@@ -803,57 +836,85 @@ RSpec.describe IsoDoc do
803
836
  </li>
804
837
  <li>
805
838
  term
806
-
807
839
  </li>
808
840
  <li>
809
841
  term
810
-
811
842
  </li>
812
843
  <li>
813
844
  term
814
-
815
845
  </li>
846
+ <li><xref target="clause1"><em>term</em></xref> (<xref target="clause1">Clause 1</xref>)</li>
847
+ <li><xref target="clause1"><em>term</em></xref> (Clause 1)</li>
848
+ <li><em>term</em> (<xref target="clause1">Clause 1</xref>)</li>
849
+ <li><em>term</em> (Clause 1)</li>
816
850
  </ul></p>
851
+ </term>
817
852
  </terms>
818
853
  </sections>
819
854
  </iso-standard>
820
855
  OUTPUT
821
856
  output = <<~OUTPUT
822
- #{HTML_HDR}
823
- <p class='zzSTDTitle1'/>
824
- <div id='clause1'>
825
- <h1>1&#160; Clause 1</h1>
826
- </div>
827
- <div id='A'>
828
- <h1>2</h1>
829
- <p>
830
- <ul>
831
- <li>
832
- <i>term</i>
833
- (
834
- <a href='#clause1'>Clause 1</a>
835
- )
836
- </li>
837
- <li>
838
- term (
839
- <a href='#clause1'>Clause 1</a>
840
- )
841
- </li>
842
- <li>
843
- <i>term</i>
844
- (
845
- <a href='#clause1'>Clause 1</a>
846
- )
847
- </li>
848
- <li> term </li>
849
- <li> term </li>
850
- <li> term </li>
851
- </ul>
852
- </p>
853
- </div>
854
- </div>
855
- </body>
856
- </html>
857
+ #{HTML_HDR}
858
+ <p class='zzSTDTitle1'/>
859
+ <div id='clause1'>
860
+ <h1>1&#160; Clause 1</h1>
861
+ </div>
862
+ <div id='A'>
863
+ <h1>2</h1>
864
+ <p class='TermNum' id='B'>2.1</p>
865
+ <p class='Terms' style='text-align:left;'>B</p>
866
+ <p>
867
+ <ul>
868
+ <li>
869
+ <i>term</i>
870
+ (
871
+ <a href='#clause1'>Clause 1</a>
872
+ )
873
+ </li>
874
+ <li>
875
+ term (
876
+ <a href='#clause1'>Clause 1</a>
877
+ )
878
+ </li>
879
+ <li>
880
+ <i>term</i>
881
+ (
882
+ <a href='#clause1'>Clause 1</a>
883
+ )
884
+ </li>
885
+ <li> term </li>
886
+ <li> term </li>
887
+ <li> term </li>
888
+ <li>
889
+ <a href='#clause1'>
890
+ <i>term</i>
891
+ </a>
892
+ (
893
+ <a href='#clause1'>Clause 1</a>
894
+ )
895
+ </li>
896
+ <li>
897
+ <a href='#clause1'>
898
+ <i>term</i>
899
+ </a>
900
+ (Clause 1)
901
+ </li>
902
+ <li>
903
+ <i>term</i>
904
+ (
905
+ <a href='#clause1'>Clause 1</a>
906
+ )
907
+ </li>
908
+ <li>
909
+ <i>term</i>
910
+ (Clause 1)
911
+ </li>
912
+ </ul>
913
+ </p>
914
+ </div>
915
+ </div>
916
+ </body>
917
+ </html>
857
918
  OUTPUT
858
919
  expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
859
920
  .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)