metanorma-iso 2.1.3 → 2.1.4

Sign up to get free protection for your applications and to get access to all the features.
@@ -2469,7 +2469,17 @@
2469
2469
 
2470
2470
  </xsl:attribute-set><xsl:attribute-set name="requirement-style">
2471
2471
 
2472
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
2473
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2474
+
2475
+
2472
2476
  </xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
2477
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
2478
+
2479
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2480
+ <xsl:attribute name="text-align">center</xsl:attribute>
2481
+ <xsl:attribute name="margin-bottom">4pt</xsl:attribute>
2482
+
2473
2483
 
2474
2484
  </xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
2475
2485
 
@@ -2582,6 +2592,7 @@
2582
2592
 
2583
2593
  <xsl:attribute name="padding-right">5mm</xsl:attribute>
2584
2594
 
2595
+
2585
2596
 
2586
2597
 
2587
2598
  </xsl:attribute-set><xsl:variable name="table-border_">
@@ -2941,7 +2952,8 @@
2941
2952
 
2942
2953
 
2943
2954
 
2944
-
2955
+
2956
+
2945
2957
 
2946
2958
 
2947
2959
  <xsl:attribute name="margin-top">8pt</xsl:attribute>
@@ -2957,6 +2969,7 @@
2957
2969
  </xsl:attribute-set><xsl:attribute-set name="termnote-style">
2958
2970
 
2959
2971
 
2972
+
2960
2973
 
2961
2974
 
2962
2975
  <xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -3394,7 +3407,10 @@
3394
3407
 
3395
3408
 
3396
3409
 
3397
-
3410
+ <!-- <xsl:if test="$namespace = 'ieee'">
3411
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3412
+ <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
3413
+ </xsl:if> -->
3398
3414
 
3399
3415
 
3400
3416
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -4611,80 +4627,88 @@
4611
4627
  </xsl:choose>
4612
4628
  </xsl:variable>
4613
4629
 
4614
- <fo:table keep-with-previous="always">
4615
- <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
4616
- <xsl:variable name="name" select="local-name()"/>
4630
+
4631
+ <xsl:variable name="tableWithNotesAndFootnotes">
4632
+
4633
+ <fo:table keep-with-previous="always">
4634
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
4635
+ <xsl:variable name="name" select="local-name()"/>
4636
+ <xsl:choose>
4637
+ <xsl:when test="$name = 'border-top'">
4638
+ <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
4639
+ </xsl:when>
4640
+ <xsl:when test="$name = 'border'">
4641
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
4642
+ <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
4643
+ </xsl:when>
4644
+ <xsl:otherwise>
4645
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
4646
+ </xsl:otherwise>
4647
+ </xsl:choose>
4648
+ </xsl:for-each>
4649
+
4650
+
4651
+
4617
4652
  <xsl:choose>
4618
- <xsl:when test="$name = 'border-top'">
4619
- <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
4620
- </xsl:when>
4621
- <xsl:when test="$name = 'border'">
4622
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
4623
- <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
4653
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
4654
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
4655
+ <fo:table-column column-width="{@width}"/>
4656
+ </xsl:for-each>
4624
4657
  </xsl:when>
4625
4658
  <xsl:otherwise>
4626
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
4659
+ <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
4660
+ <xsl:call-template name="insertTableColumnWidth">
4661
+ <xsl:with-param name="colwidths" select="$colwidths"/>
4662
+ </xsl:call-template>
4627
4663
  </xsl:otherwise>
4628
4664
  </xsl:choose>
4629
- </xsl:for-each>
4630
-
4631
-
4632
-
4633
- <xsl:choose>
4634
- <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
4635
- <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
4636
- <fo:table-column column-width="{@width}"/>
4637
- </xsl:for-each>
4638
- </xsl:when>
4639
- <xsl:otherwise>
4640
- <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
4641
- <xsl:call-template name="insertTableColumnWidth">
4642
- <xsl:with-param name="colwidths" select="$colwidths"/>
4643
- </xsl:call-template>
4644
- </xsl:otherwise>
4645
- </xsl:choose>
4646
-
4647
- <fo:table-body>
4648
- <fo:table-row>
4649
- <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
4650
-
4651
-
4665
+
4666
+ <fo:table-body>
4667
+ <fo:table-row>
4668
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
4669
+
4670
+
4652
4671
 
4653
-
4654
-
4655
- <!-- fn will be processed inside 'note' processing -->
4656
-
4657
-
4658
-
4659
-
4660
-
4661
-
4662
- <!-- for BSI (not PAS) display Notes before footnotes -->
4663
-
4664
-
4665
- <!-- except gb and bsi -->
4666
-
4667
- <xsl:apply-templates select="../*[local-name()='note']"/>
4668
4672
 
4669
-
4670
-
4671
- <!-- horizontal row separator -->
4672
-
4673
-
4674
- <!-- fn processing -->
4675
-
4676
- <xsl:call-template name="table_fn_display"/>
4677
4673
 
4678
-
4679
-
4680
- <!-- for PAS display Notes after footnotes -->
4681
-
4682
-
4683
- </fo:table-cell>
4684
- </fo:table-row>
4685
- </fo:table-body>
4686
-
4687
- </fo:table>
4674
+ <!-- fn will be processed inside 'note' processing -->
4675
+
4676
+
4677
+
4678
+
4679
+
4680
+
4681
+ <!-- for BSI (not PAS) display Notes before footnotes -->
4682
+
4683
+
4684
+ <!-- except gb and bsi -->
4685
+
4686
+ <xsl:apply-templates select="../*[local-name()='note']"/>
4687
+
4688
+
4689
+
4690
+ <!-- horizontal row separator -->
4691
+
4692
+
4693
+ <!-- fn processing -->
4694
+
4695
+ <xsl:call-template name="table_fn_display"/>
4696
+
4697
+
4698
+
4699
+ <!-- for PAS display Notes after footnotes -->
4700
+
4701
+
4702
+ </fo:table-cell>
4703
+ </fo:table-row>
4704
+ </fo:table-body>
4705
+
4706
+ </fo:table>
4707
+ </xsl:variable>
4708
+
4709
+ <xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
4710
+ <xsl:copy-of select="$tableWithNotesAndFootnotes"/>
4711
+ </xsl:if>
4688
4712
 
4689
4713
 
4690
4714
 
@@ -5040,6 +5064,7 @@
5040
5064
  <xsl:variable name="footnote_inline">
5041
5065
  <fo:inline xsl:use-attribute-sets="fn-num-style">
5042
5066
 
5067
+
5043
5068
  <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
5044
5069
  <xsl:value-of select="$current_fn_number_text"/>
5045
5070
  </fo:basic-link>
@@ -5061,8 +5086,12 @@
5061
5086
  <fo:block xsl:use-attribute-sets="fn-body-style">
5062
5087
 
5063
5088
 
5089
+
5064
5090
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
5065
5091
 
5092
+
5093
+
5094
+
5066
5095
  <xsl:value-of select="$current_fn_number_text"/>
5067
5096
  </fo:inline>
5068
5097
  <xsl:apply-templates/>
@@ -6777,6 +6806,8 @@
6777
6806
 
6778
6807
 
6779
6808
 
6809
+
6810
+
6780
6811
  <xsl:choose>
6781
6812
  <xsl:when test="$target_text = ''">
6782
6813
  <xsl:apply-templates/>
@@ -6984,6 +7015,7 @@
6984
7015
 
6985
7016
 
6986
7017
 
7018
+
6987
7019
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
6988
7020
  <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
6989
7021
  <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -7006,6 +7038,7 @@
7006
7038
  <xsl:otherwise>
7007
7039
 
7008
7040
 
7041
+
7009
7042
  </xsl:otherwise>
7010
7043
  </xsl:choose>
7011
7044
  </xsl:variable>
@@ -7022,6 +7055,7 @@
7022
7055
  </xsl:when>
7023
7056
  <xsl:otherwise>
7024
7057
 
7058
+
7025
7059
  <xsl:text>:</xsl:text>
7026
7060
 
7027
7061
 
@@ -7802,6 +7836,9 @@
7802
7836
  <fo:block xsl:use-attribute-sets="figure-name-style">
7803
7837
 
7804
7838
 
7839
+
7840
+
7841
+
7805
7842
  <xsl:apply-templates/>
7806
7843
  </fo:block>
7807
7844
  </xsl:if>
@@ -7862,7 +7899,7 @@
7862
7899
  <xsl:apply-templates/>
7863
7900
  </xsl:otherwise>
7864
7901
  </xsl:choose>
7865
- </xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
7902
+ </xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
7866
7903
  <xsl:value-of select="."/>
7867
7904
  </xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
7868
7905
  <xsl:text> </xsl:text>
@@ -7938,6 +7975,9 @@
7938
7975
  inherit<!-- 9 -->
7939
7976
 
7940
7977
 
7978
+ <!-- <xsl:if test="$namespace = 'ieee'">
7979
+ <xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
7980
+ </xsl:if> -->
7941
7981
 
7942
7982
 
7943
7983
 
@@ -8216,6 +8256,8 @@
8216
8256
 
8217
8257
  <xsl:apply-templates/>
8218
8258
 
8259
+ <xsl:text>:</xsl:text>
8260
+
8219
8261
  </fo:block>
8220
8262
  </xsl:if>
8221
8263
  </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']">
@@ -8382,10 +8424,14 @@
8382
8424
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
8383
8425
  <xsl:variable name="element">inline
8384
8426
 
8427
+
8385
8428
  </xsl:variable>
8386
8429
  <xsl:choose>
8387
8430
  <xsl:when test="contains($element, 'block')">
8388
8431
  <fo:block xsl:use-attribute-sets="example-p-style">
8432
+
8433
+
8434
+
8389
8435
  <xsl:apply-templates/>
8390
8436
  </fo:block>
8391
8437
  </xsl:when>
@@ -8498,6 +8544,7 @@
8498
8544
  </xsl:if>
8499
8545
  <fo:block xsl:use-attribute-sets="example-p-style">
8500
8546
 
8547
+
8501
8548
  <xsl:apply-templates/>
8502
8549
  </fo:block>
8503
8550
  </fo:block-container>
@@ -8654,6 +8701,8 @@
8654
8701
 
8655
8702
 
8656
8703
 
8704
+
8705
+
8657
8706
  <fo:basic-link fox:alt-text="{@citeas}">
8658
8707
  <xsl:if test="normalize-space(@citeas) = ''">
8659
8708
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -9070,6 +9119,8 @@
9070
9119
 
9071
9120
 
9072
9121
 
9122
+
9123
+
9073
9124
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
9074
9125
  <xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
9075
9126
  <xsl:call-template name="append_add-style"/>
@@ -9327,7 +9378,7 @@
9327
9378
  </fo:block>
9328
9379
 
9329
9380
 
9330
- </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
9381
+ </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
9331
9382
 
9332
9383
  <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
9333
9384
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
@@ -9340,9 +9391,7 @@
9340
9391
 
9341
9392
  <xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/>
9342
9393
  <xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])">
9343
-
9344
- <xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
9345
-
9394
+ <xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
9346
9395
  </xsl:if>
9347
9396
 
9348
9397
  </fo:inline>
@@ -10213,7 +10262,7 @@
10213
10262
  <dc:description>
10214
10263
  <xsl:variable name="abstract">
10215
10264
 
10216
- <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
10265
+ <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
10217
10266
 
10218
10267
  </xsl:variable>
10219
10268
  <xsl:value-of select="normalize-space($abstract)"/>
@@ -230,7 +230,7 @@ module IsoDoc
230
230
  ret = [ag]
231
231
  ret << sc_base(xml, "approvalgroup")
232
232
  ret << wg_base(xml, "approvalgroup")
233
- set(:approvalgroup, ret)
233
+ set(:approvalgroup, ret.compact)
234
234
  end
235
235
 
236
236
  def secretariat(xml)
@@ -230,6 +230,14 @@ module IsoDoc
230
230
  end
231
231
  end
232
232
  end
233
+
234
+ def make_FigureWordToC(docxml)
235
+ super.sub(/FigureTitle,figuretitle/, "Figure title,Annex Figure Title")
236
+ end
237
+
238
+ def make_TableWordToC(docxml)
239
+ super.sub(/TableTitle,tabletitle/, "Table title,Annex Table Title")
240
+ end
233
241
  end
234
242
  end
235
243
  end
@@ -5,16 +5,10 @@ require "pathname"
5
5
  require "open-uri"
6
6
  require "isodoc"
7
7
  require "fileutils"
8
- require_relative "macros"
9
8
 
10
9
  module Metanorma
11
10
  module ISO
12
11
  class Converter < Standoc::Converter
13
- Asciidoctor::Extensions.register do
14
- block Metanorma::ISO::EditorAdmonitionBlock
15
- treeprocessor Metanorma::ISO::EditorInlineAdmonitionBlock
16
- end
17
-
18
12
  XML_ROOT_TAG = "iso-standard".freeze
19
13
  XML_NAMESPACE = "https://www.metanorma.org/ns/iso".freeze
20
14
 
@@ -76,7 +76,8 @@ module Metanorma
76
76
  return 2 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
77
77
  return 2 if bib.at("#{PUBLISHER}[name = 'International "\
78
78
  "Electrotechnical Commission']")
79
- return 3 if bib.at("./docidentifier[@type][not(#{OTHERIDS})]")
79
+ return 3 if bib.at("./docidentifier[@type][not(#{OTHERIDS})]") ||
80
+ bib.at("./docidentifier[not(@type)]")
80
81
 
81
82
  4
82
83
  end
@@ -98,7 +99,8 @@ module Metanorma
98
99
  def sort_biblio_key(bib)
99
100
  pubclass = pub_class(bib)
100
101
  num = bib&.at("./docnumber")&.text
101
- id = bib&.at("./docidentifier[not(#{OTHERIDS})]")
102
+ id = bib&.at("./docidentifier[@primary]") ||
103
+ bib&.at("./docidentifier[not(#{OTHERIDS})]")
102
104
  metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
103
105
  abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
104
106
  /\d-(?<partid>\d+)/ =~ id&.text
@@ -69,6 +69,17 @@
69
69
  </zeroOrMore>
70
70
  </element>
71
71
  </define>
72
+ <define name="AdmonitionType">
73
+ <choice>
74
+ <value>warning</value>
75
+ <value>note</value>
76
+ <value>tip</value>
77
+ <value>important</value>
78
+ <value>caution</value>
79
+ <value>statement</value>
80
+ <value>editorial</value>
81
+ </choice>
82
+ </define>
72
83
  <define name="index">
73
84
  <element name="index">
74
85
  <optional>
@@ -116,6 +127,11 @@
116
127
  <data type="boolean"/>
117
128
  </attribute>
118
129
  </optional>
130
+ <optional>
131
+ <attribute name="suppress_identifier">
132
+ <data type="boolean"/>
133
+ </attribute>
134
+ </optional>
119
135
  <ref name="BibliographicItem"/>
120
136
  </element>
121
137
  </define>
@@ -45,7 +45,9 @@
45
45
  <ref name="horizontal"/>
46
46
  </optional>
47
47
  <ref name="editorialgroup"/>
48
- <ref name="approvalgroup"/>
48
+ <optional>
49
+ <ref name="approvalgroup"/>
50
+ </optional>
49
51
  <zeroOrMore>
50
52
  <ref name="ics"/>
51
53
  </zeroOrMore>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ISO
3
- VERSION = "2.1.3".freeze
3
+ VERSION = "2.1.4".freeze
4
4
  end
5
5
  end
@@ -297,7 +297,7 @@ RSpec.describe IsoDoc do
297
297
  <iso-standard xmlns="http://riboseinc.com/isoxml" type='presentation'>
298
298
  <preface><foreword displayorder="1">
299
299
  <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="editorial">
300
- <p id='_e94663cc-2473-4ccc-9a72-983a74d989f2'>
300
+ <p id='_e94663cc-2473-4ccc-9a72-983a74d989f2'>EDITORIAL NOTE —
301
301
  Only use paddy or parboiled rice for the
302
302
  determination of husked rice yield.
303
303
  </p>
@@ -312,7 +312,7 @@ RSpec.describe IsoDoc do
312
312
  <div>
313
313
  <h1 class='ForewordTitle'>Foreword</h1>
314
314
  <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='zzHelp'>
315
- <p>
315
+ <p>EDITORIAL NOTE —
316
316
  Only use paddy or parboiled rice for the
317
317
  determination of husked rice yield.
318
318
  </p>
@@ -332,7 +332,7 @@ RSpec.describe IsoDoc do
332
332
  <div>
333
333
  <h1 class='ForewordTitle'>Foreword</h1>
334
334
  <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='zzHelp'>
335
- <p> Only use paddy or parboiled rice for the determination of husked rice yield. </p>
335
+ <p>EDITORIAL NOTE — Only use paddy or parboiled rice for the determination of husked rice yield. </p>
336
336
  <p class='ForewordText' id='_e94663cc-2473-4ccc-9a72-983a74d989f3'>Para 2.</p>
337
337
  </div>
338
338
  </div>
@@ -209,7 +209,6 @@ RSpec.describe IsoDoc::Iso::Metadata do
209
209
  </editorialgroup>
210
210
  <approvalgroup>
211
211
  <technical-committee number="34" type="ABC">Food products</technical-committee>
212
- <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
213
212
  <workgroup number="3" type="GHI">Rice Group</workgroup>
214
213
  </approvalgroup>
215
214
  <ics><code>1.2.3</code></ics>
@@ -224,7 +223,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
224
223
  INPUT
225
224
  output = <<~OUTPUT
226
225
  {:agency=>"ISO/IEC",
227
- :approvalgroup=>["ABC 34", "DEF 4", "GHI 3"],
226
+ :approvalgroup=>["ABC 34", "GHI 3"],
228
227
  :docnumber=>"ISO/IEC/CD 17301-1-3",
229
228
  :docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)",
230
229
  :docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)",
@@ -621,37 +621,4 @@ RSpec.describe Metanorma::ISO do
621
621
  expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
622
622
  .to be_equivalent_to xmlpp(output)
623
623
  end
624
-
625
- it "processes the macro for editorial notes" do
626
- input = <<~INPUT
627
- #{ASCIIDOC_BLANK_HDR}
628
- EDITOR: Note1
629
-
630
- [EDITOR]
631
- ====
632
- Note2
633
- ====
634
-
635
- [EDITOR]
636
- Note3
637
- INPUT
638
- output = <<~OUTPUT
639
- #{BLANK_HDR}
640
- <sections>
641
- <admonition id='_' type='editorial'>
642
- <p id='_'>Note1</p>
643
- </admonition>
644
- <admonition id='_' type='editorial'>
645
- <p id='_'>Note2</p>
646
- </admonition>
647
- <admonition id='_' type='editorial'>
648
- <p id='_'>Note3</p>
649
- </admonition>
650
- </sections>
651
- </iso-standard>
652
- OUTPUT
653
- expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
654
- .to be_equivalent_to xmlpp(output)
655
- end
656
-
657
624
  end