metanorma-iso 1.1.0 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '0119bb23502ecd1f0ebef275a09c518506ec0389533594bbf07f32dc3e42e981'
4
- data.tar.gz: 26f9dab92a77065322ede51ec72f51f3d672096b8e63741d470433dcde508823
3
+ metadata.gz: d4aead1d16c118e0178077994f40fcce1ea12a3e0d4433f5729c641b9f62946a
4
+ data.tar.gz: 4bee457e75a3895160d10aeb3c074f1b513445429685acf5d748e9c8eb3e70e2
5
5
  SHA512:
6
- metadata.gz: da7a1fb42d0b409d6d4781fd1ee5adff54df4cd6f5d5b649261153dd3195599d85d0dba40870b57dffa1c412278c8ca8520428a09a4b5277c5757b144464a684
7
- data.tar.gz: 153c46baa2c2bac4b216be5bb4000224195fed472fdc39ea6830ee6dbef2ce9567861db8ee30e0088496a1e86557ab15a5615a658bd9b82dc9ea9c4898075dff
6
+ metadata.gz: 9f1ac7d63a1b8d1dadc1e785de4eb46ed9e2de878fc507d8194060ed7e4a2198f20ac8343a58b2a7cd0c6392375ae1f1997b348d800569194064de433caee612
7
+ data.tar.gz: 479559c1c2ad91cb675f82aa1d6de6dcf30e782f16d555cfbedb85936a3e4bea5dd7d7a2850aff46602d09b1664970e23fdec7ab239c59b2b1cb7d6c72f29fe7
data/docs/guidance.adoc CHANGED
@@ -404,7 +404,9 @@ Ordered lists in both HTML and Word have their labels pre-configured, to align w
404
404
 
405
405
  TIP: The stylesheets for ISO render unordered lists with em-dashes instead of bullets, as preferred by ISO. Ordered lists in Word are rendered with their labels bracketed. (_a)_, _1)_, etc.)
406
406
 
407
- TIP: Asciidoctor and HTML support multiple paragraphs within a single list item (through https://asciidoctor.org/docs/user-manual/#list-continuation[list continuation]); in HTML output, all the paragraphs within a list item will be aligned. In Word, each list entry must be a single paragraph; if the Asciidoctor contains more than one paragraph for a list item, the subsequent paragraphs will not be preceded by a bullet in Word, but they will also not be indented under the first paragraph of the list item.
407
+ TIP: Asciidoctor and HTML support multiple paragraphs within a single list item (through https://asciidoctor.org/docs/user-manual/#list-continuation[list continuation]); in HTML output, all the paragraphs within a list item will be aligned. The software attempts to do so with Word output as well, by using custom list continuation styles (`ListContLevel1` etc.); but you should check the output, and may need to manually intervene.
408
+
409
+ In Word, each list entry must be a single paragraph; if the Asciidoctor contains more than one paragraph for a list item, the subsequent paragraphs will not be preceded by a bullet in Word, but they will also not be indented under the first paragraph of the list item.
408
410
 
409
411
  === Footnotes
410
412
 
@@ -42,7 +42,7 @@ module Asciidoctor
42
42
  result << noko { |ixml| front node, ixml }
43
43
  result << noko { |ixml| middle node, ixml }
44
44
  result << "</iso-standard>"
45
- textcleanup(result.flatten * "\n")
45
+ textcleanup(result)
46
46
  end
47
47
  end
48
48
  end
@@ -493,6 +493,9 @@
493
493
  <attribute name="id">
494
494
  <data type="ID"/>
495
495
  </attribute>
496
+ <optional>
497
+ <attribute name="lang"/>
498
+ </optional>
496
499
  <optional>
497
500
  <ref name="tname"/>
498
501
  </optional>
@@ -687,6 +687,11 @@ margin-top:0;
687
687
  margin-left:-1.5em;
688
688
  }
689
689
 
690
+
691
+ .example .Sourcecode {
692
+ background: none;
693
+ }
694
+
690
695
  /*
691
696
  3.9 Tables
692
697
  */
@@ -670,6 +670,11 @@ text-transform: uppercase;
670
670
  margin-top:0;
671
671
  }
672
672
 
673
+
674
+ .example .Sourcecode {
675
+ background: none;
676
+ }
677
+
673
678
  /*
674
679
  3.9 Tables
675
680
  */
@@ -1231,6 +1231,108 @@ div.colophon
1231
1231
  margin-left:162.0pt;
1232
1232
  text-indent:-18.0pt;}
1233
1233
 
1234
+ p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
1235
+ {mso-style-priority:34;
1236
+ margin-top:0cm;
1237
+ margin-left:18.0pt;
1238
+ margin-right:0cm;
1239
+ margin-bottom:12.0pt;
1240
+ mso-pagination:widow-orphan;
1241
+ font-size:11.0pt;
1242
+ font-family:$bodyfont;
1243
+ mso-ansi-language:EN-AU;
1244
+ mso-fareast-language:EN-US;}
1245
+ p.ListContLevel2, li.ListContLevel2, div.ListContLevel2
1246
+ {mso-style-priority:34;
1247
+ margin-top:0cm;
1248
+ margin-left:36.0pt;
1249
+ margin-right:0cm;
1250
+ margin-bottom:12.0pt;
1251
+ mso-pagination:widow-orphan;
1252
+ font-size:11.0pt;
1253
+ font-family:$bodyfont;
1254
+ mso-ansi-language:EN-AU;
1255
+ mso-fareast-language:EN-US;}
1256
+ p.ListContLevel3, li.ListContLevel3, div.ListContLevel3
1257
+ {mso-style-priority:34;
1258
+ margin-top:0cm;
1259
+ margin-left:54.0pt;
1260
+ margin-right:0cm;
1261
+ margin-bottom:12.0pt;
1262
+ mso-pagination:widow-orphan;
1263
+ font-size:11.0pt;
1264
+ font-family:$bodyfont;
1265
+ mso-ansi-language:EN-AU;
1266
+ mso-fareast-language:EN-US;}
1267
+ p.ListContLevel4, li.ListContLevel4, div.ListContLevel4
1268
+ {mso-style-priority:34;
1269
+ margin-top:0cm;
1270
+ margin-left:72.0pt;
1271
+ margin-right:0cm;
1272
+ margin-bottom:12.0pt;
1273
+ mso-pagination:widow-orphan;
1274
+ font-size:11.0pt;
1275
+ font-family:$bodyfont;
1276
+ mso-ansi-language:EN-AU;
1277
+ mso-fareast-language:EN-US;}
1278
+ p.ListContLevel5, li.ListContLevel5, div.ListContLevel5
1279
+ {mso-style-priority:34;
1280
+ margin-top:0cm;
1281
+ margin-left:90.0pt;
1282
+ margin-right:0cm;
1283
+ margin-bottom:12.0pt;
1284
+ mso-pagination:widow-orphan;
1285
+ font-size:11.0pt;
1286
+ font-family:$bodyfont;
1287
+ mso-ansi-language:EN-AU;
1288
+ mso-fareast-language:EN-US;}
1289
+ p.ListContLevel6, li.ListContLevel6, div.ListContLevel6
1290
+ {mso-style-priority:34;
1291
+ margin-top:0cm;
1292
+ margin-left:108.0pt;
1293
+ margin-right:0cm;
1294
+ margin-bottom:12.0pt;
1295
+ mso-pagination:widow-orphan;
1296
+ font-size:11.0pt;
1297
+ font-family:$bodyfont;
1298
+ mso-ansi-language:EN-AU;
1299
+ mso-fareast-language:EN-US;}
1300
+ p.ListContLevel7, li.ListContLevel7, div.ListContLevel7
1301
+ {mso-style-priority:34;
1302
+ margin-top:0cm;
1303
+ margin-left:126.0pt;
1304
+ margin-right:0cm;
1305
+ margin-bottom:12.0pt;
1306
+ mso-pagination:widow-orphan;
1307
+ font-size:11.0pt;
1308
+ font-family:$bodyfont;
1309
+ mso-ansi-language:EN-AU;
1310
+ mso-fareast-language:EN-US;}
1311
+ p.ListContLevel8, li.ListContLevel8, div.ListContLevel8
1312
+ {mso-style-priority:34;
1313
+ margin-top:0cm;
1314
+ margin-left:144.0pt;
1315
+ margin-right:0cm;
1316
+ margin-bottom:12.0pt;
1317
+ mso-pagination:widow-orphan;
1318
+ font-size:11.0pt;
1319
+ font-family:$bodyfont;
1320
+ mso-ansi-language:EN-AU;
1321
+ mso-fareast-language:EN-US;}
1322
+ p.ListContLevel9, li.ListContLevel9, div.ListContLevel9
1323
+ {mso-style-priority:34;
1324
+ margin-top:0cm;
1325
+ margin-left:162.0pt;
1326
+ margin-right:0cm;
1327
+ margin-bottom:12.0pt;
1328
+ mso-pagination:widow-orphan;
1329
+ font-size:11.0pt;
1330
+ font-family:$bodyfont;
1331
+ mso-ansi-language:EN-AU;
1332
+ mso-fareast-language:EN-US;}
1333
+
1334
+
1335
+
1234
1336
  table.MsoNormalTable
1235
1337
  {mso-style-name:"Table Normal";
1236
1338
  mso-tstyle-rowband-size:0;
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ISO
3
- VERSION = "1.1.0".freeze
3
+ VERSION = "1.1.1".freeze
4
4
  end
5
5
  end
@@ -6,16 +6,16 @@ RSpec.describe Asciidoctor::ISO do
6
6
  expect(Metanorma::ISO::VERSION).not_to be nil
7
7
  end
8
8
 
9
- it "generates output for the Rice document" do
10
- FileUtils.rm_f %w(spec/examples/rice.xml spec/examples/rice.doc spec/examples/rice.html spec/examples/rice_alt.html)
11
- FileUtils.cd "spec/examples"
12
- Asciidoctor.convert_file "rice.adoc", {:attributes=>{"backend"=>"iso"}, :safe=>0, :header_footer=>true, :requires=>["metanorma-iso"], :failure_level=>4, :mkdirs=>true, :to_file=>nil}
13
- FileUtils.cd "../.."
14
- expect(File.exist?("spec/examples/rice.xml")).to be true
15
- expect(File.exist?("spec/examples/rice.doc")).to be true
16
- expect(File.exist?("spec/examples/rice.html")).to be true
17
- expect(File.exist?("spec/examples/rice_alt.html")).to be true
18
- end
9
+ #it "generates output for the Rice document" do
10
+ #FileUtils.rm_f %w(spec/examples/rice.xml spec/examples/rice.doc spec/examples/rice.html spec/examples/rice_alt.html)
11
+ #FileUtils.cd "spec/examples"
12
+ #Asciidoctor.convert_file "rice.adoc", {:attributes=>{"backend"=>"iso"}, :safe=>0, :header_footer=>true, :requires=>["metanorma-iso"], :failure_level=>4, :mkdirs=>true, :to_file=>nil}
13
+ #FileUtils.cd "../.."
14
+ #expect(File.exist?("spec/examples/rice.xml")).to be true
15
+ #expect(File.exist?("spec/examples/rice.doc")).to be true
16
+ #expect(File.exist?("spec/examples/rice.html")).to be true
17
+ #expect(File.exist?("spec/examples/rice_alt.html")).to be true
18
+ #end
19
19
 
20
20
  it "processes a blank document" do
21
21
  expect(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)).to be_equivalent_to <<~"OUTPUT"
@@ -372,7 +372,7 @@ RSpec.describe Asciidoctor::ISO do
372
372
  INPUT
373
373
  #{BLANK_HDR}
374
374
  <sections>
375
- <sourcecode id="_">puts "Hello, world."
375
+ <sourcecode lang="ruby" id="_">puts "Hello, world."
376
376
  %w{a b c}.each do |x|
377
377
  puts x
378
378
  end</sourcecode>
@@ -395,7 +395,7 @@ RSpec.describe Asciidoctor::ISO do
395
395
  <2> This is another callout
396
396
  INPUT
397
397
  #{BLANK_HDR}
398
- <sections><sourcecode id="_">puts "Hello, world." <callout target="_">1</callout>
398
+ <sections><sourcecode lang="ruby" id="_">puts "Hello, world." <callout target="_">1</callout>
399
399
  %w{a b c}.each do |x|
400
400
  puts x <callout target="_">2</callout>
401
401
  end<annotation id="_">
@@ -31,7 +31,7 @@ RSpec.describe Asciidoctor::ISO do
31
31
  <sections>
32
32
  <terms id="_" obligation="normative">
33
33
  <title>Terms and definitions</title>
34
- <term id="_"><preferred><stem type="AsciiMath">t_90</stem></preferred><admitted><stem type="AsciiMath">t_91</stem></admitted>
34
+ <term id="_"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>91</mn></msub></math></stem></admitted>
35
35
  <definition><p id="_">Time</p></definition></term>
36
36
  </terms>
37
37
  </sections>
@@ -87,8 +87,8 @@ RSpec.describe Asciidoctor::ISO do
87
87
  <sections>
88
88
  <terms id="_" obligation="normative">
89
89
  <title>Terms and definitions</title>
90
- <term id="_"><preferred><stem type="AsciiMath">t_90</stem></preferred><definition><formula id="_">
91
- <stem type="AsciiMath">t_A</stem>
90
+ <term id="_"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><definition><formula id="_">
91
+ <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mi>A</mi></msub></math></stem>
92
92
  </formula><p id="_">This paragraph is extraneous</p></definition>
93
93
  </term>
94
94
  </terms>
@@ -160,7 +160,7 @@ r = 1 %</stem>
160
160
  NOTE: That loop does not do much
161
161
  INPUT
162
162
  #{BLANK_HDR}
163
- <sections><sourcecode id="_">[1...x].each do |y|
163
+ <sections><sourcecode lang="ruby" id="_">[1...x].each do |y|
164
164
  puts y
165
165
  end</sourcecode>
166
166
  <note id="_">
@@ -528,7 +528,7 @@ r = 1 %</stem>
528
528
  INPUT
529
529
  #{BLANK_HDR}
530
530
  <sections><formula id="_">
531
- <stem type="AsciiMath">Formula</stem>
531
+ <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>F</mi><mtext>or</mtext><mi>μ</mi><mi>l</mi><mi>a</mi></math></stem>
532
532
  <dl id="_">
533
533
  <dt>a</dt>
534
534
  <dd>
@@ -28,7 +28,7 @@ RSpec.describe Asciidoctor::ISO do
28
28
  ‘single quote’
29
29
  super<sup>script</sup>
30
30
  sub<sub>script</sub>
31
- <stem type="AsciiMath">a_90</stem>
31
+ <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>a</mi><mn>90</mn></msub></math></stem>
32
32
  <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub> <mrow> <mrow> <mi mathvariant="bold-italic">F</mi> </mrow> </mrow> <mrow> <mrow> <mi mathvariant="bold-italic">Α</mi> </mrow> </mrow> </msub> </math></stem>
33
33
  <admitted>alt</admitted>
34
34
  <deprecates>deprecated</deprecates>
@@ -88,7 +88,7 @@ RSpec.describe Asciidoctor::ISO do
88
88
  INPUT
89
89
  #{BLANK_HDR}
90
90
  <sections>
91
- <sourcecode id="_">@startuml
91
+ <sourcecode lang="plantuml" id="_">@startuml
92
92
  Alice -&gt; Bob: Authentication Request
93
93
  Bob --&gt; Alice: Authentication Response
94
94
 
@@ -77,8 +77,8 @@ RSpec.describe Asciidoctor::ISO do
77
77
  <preferred>Term2</preferred>
78
78
  </term>
79
79
  </terms>
80
- <definitions id="_"/></clause>
81
- <definitions id="_"/>
80
+ <definitions id="_"><title>Symbols and Abbreviated Terms</title></definitions></clause>
81
+ <definitions id="_"><title>Symbols and Abbreviated Terms</title></definitions>
82
82
  <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" inline-header="false" obligation="normative">
83
83
  <title>Introduction</title>
84
84
  </clause>
@@ -196,8 +196,13 @@ RSpec.describe Asciidoctor::ISO do
196
196
  <preferred>Term2</preferred>
197
197
  </term>
198
198
  </clause>
199
- <definitions id="_"/></terms>
200
- <definitions id="_"/>
199
+ <definitions id="_">
200
+ <title>Σύμβολα και Συντομογραφίες</title>
201
+ </definitions>
202
+ </terms>
203
+ <definitions id="_">
204
+ <title>Σύμβολα και Συντομογραφίες</title>
205
+ </definitions>
201
206
  <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" inline-header="false" obligation="normative">
202
207
  <title>Introduction</title>
203
208
  </clause>
@@ -150,7 +150,7 @@ RSpec.describe Asciidoctor::ISO do
150
150
  <tr>
151
151
  <th rowspan="2" align="left">Defect</th>
152
152
  <th colspan="4" align="center">Maximum permissible mass fraction of defects in husked rice<br/>
153
- <stem type="AsciiMath">w_max</stem></th>
153
+ <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>w</mi><mi>max</mi></msub></math></stem></th>
154
154
  </tr>
155
155
  <tr>
156
156
  <td align="left">in husked rice</td>
data/spec/assets/iso.doc CHANGED
@@ -1,7 +1,7 @@
1
1
  MIME-Version: 1.0
2
- Content-Type: multipart/related; boundary="----=_NextPart_ed032ac9.5869.4ef8"
2
+ Content-Type: multipart/related; boundary="----=_NextPart_6bb606bb.f022.46c5"
3
3
 
4
- ------=_NextPart_ed032ac9.5869.4ef8
4
+ ------=_NextPart_6bb606bb.f022.46c5
5
5
  Content-Location: file:///C:/Doc/iso.htm
6
6
  Content-Type: text/html; charset="utf-8"
7
7
 
@@ -829,11 +829,11 @@ Switzerland<p class="MsoNormal"></p></span></p>
829
829
  <p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes">&#xA0;</span>TOC
830
830
  \o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
831
831
  <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
832
- <a href="#_Toc932671010">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
832
+ <a href="#_Toc980760563">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
833
833
  <span style="mso-tab-count:1 dotted">. </span>
834
834
  </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
835
835
  <span style="mso-element:field-begin"></span></span>
836
- <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc932671010 \h </span>
836
+ <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc980760563 \h </span>
837
837
  <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
838
838
  <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span></span></p>
839
839
 
@@ -870,7 +870,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
870
870
  </html>
871
871
 
872
872
 
873
- ------=_NextPart_ed032ac9.5869.4ef8
873
+ ------=_NextPart_6bb606bb.f022.46c5
874
874
  Content-Location: file:///C:/Doc/iso_files/filelist.xml
875
875
  Content-Transfer-Encoding: base64
876
876
  Content-Type: application/xml
@@ -880,7 +880,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
880
880
  bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
881
881
  L3htbD4K
882
882
 
883
- ------=_NextPart_ed032ac9.5869.4ef8
883
+ ------=_NextPart_6bb606bb.f022.46c5
884
884
  Content-Location: file:///C:/Doc/iso_files/header.html
885
885
  Content-Transfer-Encoding: base64
886
886
  Content-Type: text/html charset="utf-8"
@@ -1073,4 +1073,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
1073
1073
  ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
1074
1074
  bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
1075
1075
 
1076
- ------=_NextPart_ed032ac9.5869.4ef8--
1076
+ ------=_NextPart_6bb606bb.f022.46c5--
@@ -249,7 +249,7 @@ end
249
249
  <h1 class="ForewordTitle">Foreword</h1>
250
250
  <table id="samplecode" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;">
251
251
  <tr>
252
- <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE</td>
252
+ <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE</td>
253
253
  <td valign="top" class="example">
254
254
  <p>Hello</p>
255
255
  </td>
@@ -300,7 +300,7 @@ end
300
300
  <h1 class="ForewordTitle">Foreword</h1>
301
301
  <table id="samplecode" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;">
302
302
  <tr>
303
- <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 1</td>
303
+ <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE 1</td>
304
304
  <td valign="top" class="example">
305
305
  <p>Hello</p>
306
306
  </td>
@@ -308,7 +308,7 @@ end
308
308
  </table>
309
309
  <table id="samplecode2" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;">
310
310
  <tr>
311
- <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 2</td>
311
+ <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE 2</td>
312
312
  <td valign="top" class="example">
313
313
  <p>Hello</p>
314
314
  </td>
@@ -30,6 +30,11 @@ RSpec.describe IsoDoc::Iso::Metadata do
30
30
  <date type="created"><from>2010</from><to>2011</to></date>
31
31
  <date type="activated"><on>2013</on></date>
32
32
  <date type="obsoleted"><on>2014</on></date>
33
+ <edition>2</edition>
34
+ <version>
35
+ <revision-date>2016-05-01</revision-date>
36
+ <draft>0.4</draft>
37
+ </version>
33
38
  <contributor>
34
39
  <role type="author"/>
35
40
  <organization>
@@ -63,14 +68,10 @@ RSpec.describe IsoDoc::Iso::Metadata do
63
68
  <workgroup number="3">Rice Group</workgroup>
64
69
  <secretariat>GB</secretariat>
65
70
  </editorialgroup>
66
- </bibdata><version>
67
- <edition>2</edition>
68
- <revision-date>2016-05-01</revision-date>
69
- <draft>0.4</draft>
70
- </version>
71
+ </bibdata>
71
72
  </iso-standard>
72
73
  INPUT
73
- {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"ISO/PreCD3 17301-1", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Partie&nbsp;1: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Part&nbsp;1: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stage_int=>30, :stageabbr=>"PreCD3", :tc=>"TC 34", :tc_docnumber=>"17301", :unpublished=>true, :updateddate=>"XXX", :wg=>"WG 3"}
74
+ {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"ISO/PreCD3 17301-1", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Partie&nbsp;1: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Part&nbsp;1: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stage_int=>30, :stageabbr=>"PreCD3", :tc=>"TC 34", :tc_docnumber=>"17301", :unpublished=>true, :updateddate=>"XXX", :wg=>"WG 3"}
74
75
  OUTPUT
75
76
  end
76
77
 
@@ -140,14 +141,10 @@ OUTPUT
140
141
  </editorialgroup>
141
142
  <ics><code>1.2.3</code></ics>
142
143
  <ics><code>1.2.3</code></ics>
143
- </bibdata><version>
144
- <edition>2</edition>
145
- <revision-date>2016-05-01</revision-date>
146
- <draft>12</draft>
147
- </version>
144
+ </bibdata>
148
145
  </iso-standard>
149
146
  INPUT
150
- {:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"ISO/IEC/CD 17301-1-3", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Partie&nbsp;1&ndash;3: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Part&nbsp;1&ndash;3: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"60", :stage_int=>60, :stageabbr=>"IS", :tc=>"ABC 34", :tc_docnumber=>"17301", :unpublished=>false, :updateddate=>"XXX", :wg=>"GHI 3"}
147
+ {:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"ISO/IEC/CD 17301-1-3", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Partie&nbsp;1&ndash;3: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Part&nbsp;1&ndash;3: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>nil, :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"60", :stage_int=>60, :stageabbr=>"IS", :tc=>"ABC 34", :tc_docnumber=>"17301", :unpublished=>false, :updateddate=>"XXX", :wg=>"GHI 3"}
151
148
  OUTPUT
152
149
  end
153
150
 
@@ -440,7 +440,7 @@ RSpec.describe IsoDoc do
440
440
  <div class="Section3"><a name="P" id="P"></a>
441
441
  <table class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851c" id="_63112cbc-cde0-435f-9553-e0b8c4f5851c"></a>
442
442
  <tr>
443
- <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 1</td>
443
+ <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE 1</td>
444
444
  <td valign="top" class="example">
445
445
  <p class="example"><a name="_158d4efa-b1c9-4aec-b325-756de8e4c968" id="_158d4efa-b1c9-4aec-b325-756de8e4c968"></a>'1M', '01M', and '0001M' all describe the calendar month January.</p>
446
446
  </td>
@@ -448,7 +448,7 @@ RSpec.describe IsoDoc do
448
448
  </table><p style="margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0.0pt;margin-bottom:.0001pt;line-height:1.0pt;mso-line-height-rule:exactly" class="MsoNormal"><span lang="EN-GB" style="display:none;mso-hide:all" xml:lang="EN-GB">&#xA0;</span></p>
449
449
  <table class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851d" id="_63112cbc-cde0-435f-9553-e0b8c4f5851d"></a>
450
450
  <tr>
451
- <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 2</td>
451
+ <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE 2</td>
452
452
  <td valign="top" class="example">
453
453
  <p class="example"><a name="_158d4efa-b1c9-4aec-b325-756de8e4c969" id="_158d4efa-b1c9-4aec-b325-756de8e4c969"></a>'2M', '02M', and '0002M' all describe the calendar month February.</p>
454
454
  </td>
@@ -169,13 +169,13 @@ OUTPUT
169
169
  <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
170
170
 
171
171
  <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
172
- <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 1</td><td valign="top" class="example">
172
+ <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE 1</td><td valign="top" class="example">
173
173
  <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
174
174
  <ul>
175
175
  <li>A</li>
176
176
  </ul>
177
177
  </td></tr></table>
178
- <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 2</td><td valign="top" class="example">
178
+ <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE 2</td><td valign="top" class="example">
179
179
  <ul>
180
180
  <li>A</li>
181
181
  </ul>
@@ -188,7 +188,7 @@ OUTPUT
188
188
  <p class="AltTerms" style="text-align:left;">rough rice</p>
189
189
  <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
190
190
  <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
191
- <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE</td><td valign="top" class="example">
191
+ <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE</td><td valign="top" class="example">
192
192
  <ul>
193
193
  <li>A</li>
194
194
  </ul>
@@ -568,7 +568,7 @@ RSpec.describe IsoDoc do
568
568
  <p class="zzSTDTitle1"/>
569
569
  <div id="scope">
570
570
  <h1>1.&#160; Scope</h1>
571
- <div id="N" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div>
571
+ <div id="N" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</p></div>
572
572
  <p>
573
573
  <a href="#N">Formula (1)</a>
574
574
  </p>
@@ -587,19 +587,19 @@ RSpec.describe IsoDoc do
587
587
  <div id="widgets">
588
588
  <h1>3.&#160; Widgets</h1>
589
589
  <div id="widgets1"><h2>3.1. </h2>
590
- <div id="note1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</div>
591
- <div id="note2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</div>
590
+ <div id="note1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</p></div>
591
+ <div id="note2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</p></div>
592
592
  <p> <a href="#note1">Formula (2)</a> <a href="#note2">Formula (3)</a> </p>
593
593
  </div>
594
594
  </div>
595
595
  <br/>
596
596
  <div id="annex1" class="Section3">
597
597
  <div id="annex1a"><h2>A.1. </h2>
598
- <div id="AN" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.1)</div>
598
+ <div id="AN" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.1)</p></div>
599
599
  </div>
600
600
  <div id="annex1b"><h2>A.2. </h2>
601
- <div id="Anote1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.2)</div>
602
- <div id="Anote2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.3)</div>
601
+ <div id="Anote1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.2)</p></div>
602
+ <div id="Anote2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.3)</p></div>
603
603
  </div>
604
604
  </div>
605
605
  </div>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iso
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-01-21 00:00:00.000000000 Z
11
+ date: 2019-01-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor