metanorma-iso 1.3.22 → 1.3.27
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.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +8 -7
- data/.github/workflows/ubuntu.yml +8 -7
- data/.github/workflows/windows.yml +8 -8
- data/Gemfile +2 -0
- data/lib/asciidoctor/iso/base.rb +22 -0
- data/lib/asciidoctor/iso/biblio.rng +89 -32
- data/lib/asciidoctor/iso/cleanup.rb +20 -3
- data/lib/asciidoctor/iso/front.rb +16 -107
- data/lib/asciidoctor/iso/front_id.rb +196 -0
- data/lib/asciidoctor/iso/isodoc.rng +475 -2
- data/lib/asciidoctor/iso/isostandard-amd.rng +98 -0
- data/lib/asciidoctor/iso/isostandard.rng +12 -1
- data/lib/asciidoctor/iso/macros.rb +21 -0
- data/lib/asciidoctor/iso/reqt.rng +23 -0
- data/lib/asciidoctor/iso/section.rb +18 -32
- data/lib/asciidoctor/iso/term_lookup_cleanup.rb +87 -0
- data/lib/asciidoctor/iso/validate.rb +41 -25
- data/lib/asciidoctor/iso/validate_requirements.rb +1 -1
- data/lib/asciidoctor/iso/validate_section.rb +2 -2
- data/lib/asciidoctor/iso/validate_style.rb +6 -5
- data/lib/asciidoctor/iso/validate_title.rb +1 -1
- data/lib/isodoc/iso/base_convert.rb +77 -107
- data/lib/isodoc/iso/html/header.html +10 -6
- data/lib/isodoc/iso/html/html_iso_titlepage.html +27 -18
- data/lib/isodoc/iso/html/isodoc.scss +53 -28
- data/lib/isodoc/iso/html/scripts.html +23 -21
- data/lib/isodoc/iso/html/style-human.scss +23 -0
- data/lib/isodoc/iso/html/style-iso.scss +18 -0
- data/lib/isodoc/iso/html/word_iso_intro.html +4 -0
- data/lib/isodoc/iso/html/word_iso_titlepage.html +23 -2
- data/lib/isodoc/iso/html/wordstyle.scss +80 -39
- data/lib/isodoc/iso/html_convert.rb +7 -9
- data/lib/isodoc/iso/iso.amendment.xsl +4597 -0
- data/lib/isodoc/iso/iso.international-standard.xsl +4597 -0
- data/lib/isodoc/iso/metadata.rb +71 -23
- data/lib/isodoc/iso/pdf_convert.rb +39 -0
- data/lib/isodoc/iso/sections.rb +66 -0
- data/lib/isodoc/iso/sts_convert.rb +29 -0
- data/lib/isodoc/iso/xref.rb +105 -0
- data/lib/metanorma-iso.rb +2 -0
- data/lib/metanorma/iso/processor.rb +16 -1
- data/lib/metanorma/iso/version.rb +1 -1
- data/metanorma-iso.gemspec +4 -1
- data/spec/asciidoctor-iso/amd_spec.rb +726 -0
- data/spec/asciidoctor-iso/base_spec.rb +38 -21
- data/spec/asciidoctor-iso/blocks_spec.rb +6 -6
- data/spec/asciidoctor-iso/cleanup_spec.rb +195 -174
- data/spec/asciidoctor-iso/inline_spec.rb +2 -1
- data/spec/asciidoctor-iso/macros_spec.rb +289 -0
- data/spec/asciidoctor-iso/refs_spec.rb +8 -5
- data/spec/asciidoctor-iso/section_spec.rb +8 -8
- data/spec/assets/iso.xml +64 -1
- data/spec/isodoc/amd_spec.rb +652 -0
- data/spec/isodoc/blocks_spec.rb +112 -27
- data/spec/isodoc/i18n_spec.rb +12 -20
- data/spec/isodoc/inline_spec.rb +4 -4
- data/spec/isodoc/iso_spec.rb +1 -1
- data/spec/isodoc/metadata_spec.rb +92 -4
- data/spec/isodoc/postproc_spec.rb +21 -120
- data/spec/isodoc/ref_spec.rb +9 -9
- data/spec/isodoc/section_spec.rb +36 -13
- data/spec/isodoc/table_spec.rb +30 -30
- data/spec/isodoc/terms_spec.rb +6 -6
- data/spec/isodoc/xref_spec.rb +43 -37
- data/spec/metanorma/processor_spec.rb +2 -2
- data/spec/spec_helper.rb +11 -0
- metadata +58 -5
- data/asciidoctor-iso.gemspec.old +0 -50
data/spec/isodoc/terms_spec.rb
CHANGED
@@ -54,7 +54,7 @@ RSpec.describe IsoDoc do
|
|
54
54
|
INPUT
|
55
55
|
#{HTML_HDR}
|
56
56
|
<p class="zzSTDTitle1"/>
|
57
|
-
<div id="_terms_and_definitions"><h1>1  Terms and
|
57
|
+
<div id="_terms_and_definitions"><h1>1  Terms and Definitions</h1>
|
58
58
|
<p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
|
59
59
|
|
60
60
|
<p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"><rice> rice retaining its husk after threshing</p>
|
@@ -79,8 +79,8 @@ RSpec.describe IsoDoc do
|
|
79
79
|
<li>A</li>
|
80
80
|
</ul>
|
81
81
|
</div>
|
82
|
-
<div class="Note"><p>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>
|
83
|
-
<div class="Note"><p>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>
|
82
|
+
<div id='_671a1994-4783-40d0-bc81-987d06ffb74e' class="Note"><p>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>
|
83
|
+
<div id='_671a1994-4783-40d0-bc81-987d06ffb74f' class="Note"><p>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>
|
84
84
|
<p>[TERMREF]
|
85
85
|
<a href="#ISO7301">ISO 7301:2011, 3.1</a>
|
86
86
|
[/TERMREF]</p></div>
|
@@ -141,7 +141,7 @@ OUTPUT
|
|
141
141
|
</sections>
|
142
142
|
</iso-standard>
|
143
143
|
INPUT
|
144
|
-
<div id="_terms_and_definitions"><h1>1<span style="mso-tab-count:1">  </span>Terms and
|
144
|
+
<div id="_terms_and_definitions"><h1>1<span style="mso-tab-count:1">  </span>Terms and Definitions</h1>
|
145
145
|
<p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
|
146
146
|
|
147
147
|
<p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"><rice> rice retaining its husk after threshing</p>
|
@@ -166,8 +166,8 @@ OUTPUT
|
|
166
166
|
<li>A</li>
|
167
167
|
</ul>
|
168
168
|
</div>
|
169
|
-
<div 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>
|
170
|
-
<div 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>
|
169
|
+
<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>
|
170
|
+
<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>
|
171
171
|
<p>[TERMREF]
|
172
172
|
<a href="#ISO7301">ISO 7301:2011, 3.1</a>
|
173
173
|
[/TERMREF]</p></div>
|
data/spec/isodoc/xref_spec.rb
CHANGED
@@ -78,7 +78,7 @@ RSpec.describe IsoDoc do
|
|
78
78
|
<a href="#N">Note</a>
|
79
79
|
</p>
|
80
80
|
</div>
|
81
|
-
<div id="terms"><h1>2 
|
81
|
+
<div id="terms"><h1>2  </h1>
|
82
82
|
</div>
|
83
83
|
<div id="widgets">
|
84
84
|
<h1>3  Widgets</h1>
|
@@ -195,7 +195,7 @@ RSpec.describe IsoDoc do
|
|
195
195
|
<a href="#N">Figure 1</a>
|
196
196
|
</p>
|
197
197
|
</div>
|
198
|
-
<div id="terms"><h1>2 
|
198
|
+
<div id="terms"><h1>2  </h1>
|
199
199
|
</div>
|
200
200
|
<div id="widgets">
|
201
201
|
<h1>3  Widgets</h1>
|
@@ -303,18 +303,18 @@ RSpec.describe IsoDoc do
|
|
303
303
|
<h1 class="ForewordTitle">Foreword</h1>
|
304
304
|
<p>
|
305
305
|
<a href="#N">Figure 1</a>
|
306
|
-
<a href="#note1">Figure 1
|
307
|
-
<a href="#note2">Figure 1
|
306
|
+
<a href="#note1">Figure 1 a)</a>
|
307
|
+
<a href="#note2">Figure 1 b)</a>
|
308
308
|
<a href="#AN">Figure A.1</a>
|
309
|
-
<a href="#Anote1">Figure A.1
|
310
|
-
<a href="#Anote2">Figure A.1
|
309
|
+
<a href="#Anote1">Figure A.1 a)</a>
|
310
|
+
<a href="#Anote2">Figure A.1 b)</a>
|
311
311
|
</p>
|
312
312
|
</div>
|
313
313
|
<p class="zzSTDTitle1"/>
|
314
314
|
<div id="scope">
|
315
315
|
<h1>1  Scope</h1>
|
316
316
|
</div>
|
317
|
-
<div id="terms"><h1>2 
|
317
|
+
<div id="terms"><h1>2  </h1>
|
318
318
|
</div>
|
319
319
|
<div id="widgets">
|
320
320
|
<h1>3  Widgets</h1>
|
@@ -323,14 +323,17 @@ RSpec.describe IsoDoc do
|
|
323
323
|
<div id="note1" class="figure">
|
324
324
|
|
325
325
|
<img src="rice_images/rice_image1.png" height="auto" width="auto"/>
|
326
|
-
<p class=
|
326
|
+
<p class='FigureTitle' style='text-align:center;'>a) — Split-it-right sample divider</p>
|
327
|
+
</div>
|
327
328
|
<div id="note2" class="figure">
|
328
329
|
|
329
330
|
<img src="rice_images/rice_image1.png" height="auto" width="auto"/>
|
330
|
-
<p class=
|
331
|
+
<p class='FigureTitle' style='text-align:center;'>b) — Split-it-right sample divider</p>
|
331
332
|
</div>
|
332
|
-
<p
|
333
|
+
<p class='FigureTitle' style='text-align:center;'>Figure 1</p>
|
333
334
|
</div>
|
335
|
+
<p> <a href="#note1">Figure 1 a)</a> <a href="#note2">Figure 1 b)</a> </p>
|
336
|
+
</div>
|
334
337
|
</div>
|
335
338
|
<br/>
|
336
339
|
<div id="annex1" class="Section3">
|
@@ -349,12 +352,15 @@ RSpec.describe IsoDoc do
|
|
349
352
|
<div id="Anote1" class="figure">
|
350
353
|
|
351
354
|
<img src="rice_images/rice_image1.png" height="auto" width="auto"/>
|
352
|
-
<p class=
|
355
|
+
<p class='FigureTitle' style='text-align:center;'>a) — Split-it-right sample divider</p>
|
356
|
+
</div>
|
353
357
|
<div id="Anote2" class="figure">
|
354
358
|
|
355
359
|
<img src="rice_images/rice_image1.png" height="auto" width="auto"/>
|
356
|
-
<p class=
|
360
|
+
<p class='FigureTitle' style='text-align:center;'>b) — Split-it-right sample divider</p>
|
357
361
|
</div>
|
362
|
+
<p class='FigureTitle' style='text-align:center;'>Figure A.1</p>
|
363
|
+
</div>
|
358
364
|
</div>
|
359
365
|
</div>
|
360
366
|
</div>
|
@@ -438,7 +444,7 @@ RSpec.describe IsoDoc do
|
|
438
444
|
<a href="#N">Example</a>
|
439
445
|
</p>
|
440
446
|
</div>
|
441
|
-
<div id="terms"><h1>2 
|
447
|
+
<div id="terms"><h1>2  </h1>
|
442
448
|
</div>
|
443
449
|
<div id="widgets">
|
444
450
|
<h1>3  Widgets</h1>
|
@@ -555,18 +561,18 @@ RSpec.describe IsoDoc do
|
|
555
561
|
<p class="zzSTDTitle1"/>
|
556
562
|
<div id="scope">
|
557
563
|
<h1>1  Scope</h1>
|
558
|
-
<div id="N" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (1)</p></div>
|
564
|
+
<div id="N"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (1)</p></div></div>
|
559
565
|
<p>
|
560
566
|
<a href="#N">Formula (1)</a>
|
561
567
|
</p>
|
562
568
|
</div>
|
563
|
-
<div id="terms"><h1>2 
|
569
|
+
<div id="terms"><h1>2  </h1>
|
564
570
|
</div>
|
565
571
|
<div id="widgets">
|
566
572
|
<h1>3  Widgets</h1>
|
567
573
|
<div id="widgets1"><span class='zzMoveToFollowing'><b>3.1  </b></span>
|
568
|
-
<div id="note1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (2)</p></div>
|
569
|
-
<div id="note2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (3)</p></div>
|
574
|
+
<div id="note1"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (2)</p></div></div>
|
575
|
+
<div id="note2"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (3)</p></div></div>
|
570
576
|
<p> <a href="#note1">Formula (2)</a> <a href="#note2">Formula (3)</a> </p>
|
571
577
|
</div>
|
572
578
|
</div>
|
@@ -581,11 +587,11 @@ RSpec.describe IsoDoc do
|
|
581
587
|
<b/>
|
582
588
|
</h1>
|
583
589
|
<div id="annex1a"><span class='zzMoveToFollowing'><b>A.1  </b></span>
|
584
|
-
<div id="AN" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (A.1)</p></div>
|
590
|
+
<div id="AN"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (A.1)</p></div></div>
|
585
591
|
</div>
|
586
592
|
<div id="annex1b"><span class='zzMoveToFollowing'><b>A.2  </b></span>
|
587
|
-
<div id="Anote1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (A.2)</p></div>
|
588
|
-
<div id="Anote2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (A.3)</p></div>
|
593
|
+
<div id="Anote1"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (A.2)</p></div></div>
|
594
|
+
<div id="Anote2"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (A.3)</p></div></div>
|
589
595
|
</div>
|
590
596
|
</div>
|
591
597
|
</div>
|
@@ -710,9 +716,9 @@ RSpec.describe IsoDoc do
|
|
710
716
|
<table id="N" class="MsoISOTable" style="border-width:1px;border-spacing:0;">
|
711
717
|
<tbody>
|
712
718
|
<tr>
|
713
|
-
<td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;
|
714
|
-
<td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;
|
715
|
-
<td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;
|
719
|
+
<td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td>
|
720
|
+
<td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td>
|
721
|
+
<td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td>
|
716
722
|
</tr>
|
717
723
|
</tbody>
|
718
724
|
</table>
|
@@ -720,13 +726,13 @@ RSpec.describe IsoDoc do
|
|
720
726
|
<a href="#N">Table 1</a>
|
721
727
|
</p>
|
722
728
|
</div>
|
723
|
-
<div id="terms"><h1>2 
|
729
|
+
<div id="terms"><h1>2  </h1>
|
724
730
|
</div>
|
725
731
|
<div id="widgets">
|
726
732
|
<h1>3  Widgets</h1>
|
727
733
|
<div id="widgets1"><span class='zzMoveToFollowing'><b>3.1  </b></span>
|
728
|
-
<p class="TableTitle" style="text-align:center;">Table 2 — Repeatability and reproducibility of husked rice yield</p><table id="note1" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;
|
729
|
-
<p class="TableTitle" style="text-align:center;">Table 3 — Repeatability and reproducibility of husked rice yield</p><table id="note2" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;
|
734
|
+
<p class="TableTitle" style="text-align:center;">Table 2 — Repeatability and reproducibility of husked rice yield</p><table id="note1" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
|
735
|
+
<p class="TableTitle" style="text-align:center;">Table 3 — Repeatability and reproducibility of husked rice yield</p><table id="note2" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
|
730
736
|
<p> <a href="#note1">Table 2</a> <a href="#note2">Table 3</a> </p>
|
731
737
|
</div>
|
732
738
|
</div>
|
@@ -741,11 +747,11 @@ RSpec.describe IsoDoc do
|
|
741
747
|
<b/>
|
742
748
|
</h1>
|
743
749
|
<div id="annex1a"><span class='zzMoveToFollowing'><b>A.1  </b></span>
|
744
|
-
<p class="TableTitle" style="text-align:center;">Table A.1 — Repeatability and reproducibility of husked rice yield</p><table id="AN" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;
|
750
|
+
<p class="TableTitle" style="text-align:center;">Table A.1 — Repeatability and reproducibility of husked rice yield</p><table id="AN" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
|
745
751
|
</div>
|
746
752
|
<div id="annex1b"><span class='zzMoveToFollowing'><b>A.2  </b></span>
|
747
|
-
<p class="TableTitle" style="text-align:center;">Table A.2 — Repeatability and reproducibility of husked rice yield</p><table id="Anote1" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;
|
748
|
-
<p class="TableTitle" style="text-align:center;">Table A.3 — Repeatability and reproducibility of husked rice yield</p><table id="Anote2" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;
|
753
|
+
<p class="TableTitle" style="text-align:center;">Table A.2 — Repeatability and reproducibility of husked rice yield</p><table id="Anote1" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
|
754
|
+
<p class="TableTitle" style="text-align:center;">Table A.3 — Repeatability and reproducibility of husked rice yield</p><table id="Anote2" class="MsoISOTable" style="border-width:1px;border-spacing:0;"><tbody><tr><td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Number of laboratories retained after eliminating outliers</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">13</td><td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">11</td></tr></tbody></table>
|
749
755
|
</div>
|
750
756
|
</div>
|
751
757
|
</div>
|
@@ -799,11 +805,11 @@ RSpec.describe IsoDoc do
|
|
799
805
|
<div id="scope">
|
800
806
|
<h1>1  Scope</h1>
|
801
807
|
</div>
|
802
|
-
<div id="terms"><h1>2 
|
808
|
+
<div id="terms"><h1>2  </h1>
|
803
809
|
<p class="TermNum" id="_waxy_rice">2.1</p><p class="Terms" style="text-align:left;">waxy rice</p>
|
804
|
-
<div class="Note"><p>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><p class="TermNum" id="_nonwaxy_rice">2.2</p><p class="Terms" style="text-align:left;">nonwaxy rice</p>
|
805
|
-
<div class="Note"><p>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>
|
806
|
-
<div class="Note"><p>Note 2 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div></div>
|
810
|
+
<div id="note1" class="Note"><p>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><p class="TermNum" id="_nonwaxy_rice">2.2</p><p class="Terms" style="text-align:left;">nonwaxy rice</p>
|
811
|
+
<div id="note2" class="Note"><p>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>
|
812
|
+
<div id="note3" class="Note"><p>Note 2 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div></div>
|
807
813
|
</div>
|
808
814
|
</body>
|
809
815
|
</html>
|
@@ -882,11 +888,11 @@ RSpec.describe IsoDoc do
|
|
882
888
|
<appendix id="Q2" inline-header="false" obligation="normative">
|
883
889
|
<title>An Appendix</title>
|
884
890
|
</appendix>
|
885
|
-
</annex><bibliography><references id="R" obligation="informative">
|
891
|
+
</annex><bibliography><references id="R" obligation="informative" normative="true">
|
886
892
|
<title>Normative References</title>
|
887
893
|
</references><clause id="S" obligation="informative">
|
888
894
|
<title>Bibliography</title>
|
889
|
-
<references id="T" obligation="informative">
|
895
|
+
<references id="T" obligation="informative" normative="false">
|
890
896
|
<title>Bibliography Subsection</title>
|
891
897
|
</references>
|
892
898
|
</clause>
|
@@ -1058,7 +1064,7 @@ Text
|
|
1058
1064
|
<li><p>A</p></li>
|
1059
1065
|
</ol>
|
1060
1066
|
</div>
|
1061
|
-
<div id="terms"><h1>2 
|
1067
|
+
<div id="terms"><h1>2  </h1>
|
1062
1068
|
</div>
|
1063
1069
|
<div id="widgets">
|
1064
1070
|
<h1>3  Widgets</h1>
|
@@ -1172,7 +1178,7 @@ Text
|
|
1172
1178
|
<li id="N"><p>A</p></li>
|
1173
1179
|
</ol>
|
1174
1180
|
</div>
|
1175
|
-
<div id="terms"><h1>2 
|
1181
|
+
<div id="terms"><h1>2  </h1>
|
1176
1182
|
</div>
|
1177
1183
|
<div id="widgets">
|
1178
1184
|
<h1>3  Widgets</h1>
|
@@ -15,7 +15,7 @@ RSpec.describe Metanorma::Iso::Processor do
|
|
15
15
|
|
16
16
|
it "registers output formats against metanorma" do
|
17
17
|
expect(processor.output_formats.sort.to_s).to be_equivalent_to <<~"OUTPUT"
|
18
|
-
[[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:rxl, "rxl"], [:xml, "xml"]]
|
18
|
+
[[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:pdf, "pdf"], [:rxl, "rxl"], [:sts, "sts.xml"], [:xml, "xml"]]
|
19
19
|
OUTPUT
|
20
20
|
end
|
21
21
|
|
@@ -49,7 +49,7 @@ RSpec.describe Metanorma::Iso::Processor do
|
|
49
49
|
expect(xmlpp(File.read("test.html", encoding: "utf-8").gsub(%r{^.*<main}m, "<main").gsub(%r{</main>.*}m, "</main>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
50
50
|
<main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
|
51
51
|
<p class="zzSTDTitle1"></p>
|
52
|
-
<div id="H"><h1>1  Terms and
|
52
|
+
<div id="H"><h1 id="toc0">1  Terms, Definitions, Symbols and Abbreviated Terms</h1>
|
53
53
|
<h2 class="TermNum" id="J">1.1</h2>
|
54
54
|
<p class="Terms" style="text-align:left;">Term2</p>
|
55
55
|
</div>
|
data/spec/spec_helper.rb
CHANGED
@@ -47,6 +47,17 @@ ASCIIDOC_BLANK_HDR = <<~"HDR"
|
|
47
47
|
|
48
48
|
HDR
|
49
49
|
|
50
|
+
AMD_BLANK_HDR = <<~"HDR"
|
51
|
+
= Document title
|
52
|
+
Author
|
53
|
+
:docfile: test.adoc
|
54
|
+
:nodoc:
|
55
|
+
:novalid:
|
56
|
+
:no-isobib:
|
57
|
+
:doctype: amendment
|
58
|
+
|
59
|
+
HDR
|
60
|
+
|
50
61
|
ISOBIB_BLANK_HDR = <<~"HDR"
|
51
62
|
= Document title
|
52
63
|
Author
|
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.3.
|
4
|
+
version: 1.3.27
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-06-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: ruby-jing
|
@@ -44,14 +44,56 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 1.
|
47
|
+
version: 1.4.0
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 1.
|
54
|
+
version: 1.4.0
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: tokenizer
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
58
|
+
requirements:
|
59
|
+
- - "~>"
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: 0.3.0
|
62
|
+
type: :runtime
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - "~>"
|
67
|
+
- !ruby/object:Gem::Version
|
68
|
+
version: 0.3.0
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: twitter_cldr
|
71
|
+
requirement: !ruby/object:Gem::Requirement
|
72
|
+
requirements:
|
73
|
+
- - ">="
|
74
|
+
- !ruby/object:Gem::Version
|
75
|
+
version: '0'
|
76
|
+
type: :runtime
|
77
|
+
prerelease: false
|
78
|
+
version_requirements: !ruby/object:Gem::Requirement
|
79
|
+
requirements:
|
80
|
+
- - ">="
|
81
|
+
- !ruby/object:Gem::Version
|
82
|
+
version: '0'
|
83
|
+
- !ruby/object:Gem::Dependency
|
84
|
+
name: mn2sts
|
85
|
+
requirement: !ruby/object:Gem::Requirement
|
86
|
+
requirements:
|
87
|
+
- - "~>"
|
88
|
+
- !ruby/object:Gem::Version
|
89
|
+
version: 1.2.0
|
90
|
+
type: :runtime
|
91
|
+
prerelease: false
|
92
|
+
version_requirements: !ruby/object:Gem::Requirement
|
93
|
+
requirements:
|
94
|
+
- - "~>"
|
95
|
+
- !ruby/object:Gem::Version
|
96
|
+
version: 1.2.0
|
55
97
|
- !ruby/object:Gem::Dependency
|
56
98
|
name: byebug
|
57
99
|
requirement: !ruby/object:Gem::Requirement
|
@@ -220,7 +262,6 @@ files:
|
|
220
262
|
- Makefile
|
221
263
|
- README.adoc
|
222
264
|
- Rakefile
|
223
|
-
- asciidoctor-iso.gemspec.old
|
224
265
|
- bin/rspec
|
225
266
|
- docs/asciiiso-syntax.adoc
|
226
267
|
- docs/guidance.adoc
|
@@ -233,14 +274,18 @@ files:
|
|
233
274
|
- lib/asciidoctor/iso/cleanup.rb
|
234
275
|
- lib/asciidoctor/iso/converter.rb
|
235
276
|
- lib/asciidoctor/iso/front.rb
|
277
|
+
- lib/asciidoctor/iso/front_id.rb
|
236
278
|
- lib/asciidoctor/iso/i18n-en.yaml
|
237
279
|
- lib/asciidoctor/iso/i18n-fr.yaml
|
238
280
|
- lib/asciidoctor/iso/i18n-zh-Hans.yaml
|
239
281
|
- lib/asciidoctor/iso/isodoc.rng
|
282
|
+
- lib/asciidoctor/iso/isostandard-amd.rng
|
240
283
|
- lib/asciidoctor/iso/isostandard.rnc
|
241
284
|
- lib/asciidoctor/iso/isostandard.rng
|
285
|
+
- lib/asciidoctor/iso/macros.rb
|
242
286
|
- lib/asciidoctor/iso/reqt.rng
|
243
287
|
- lib/asciidoctor/iso/section.rb
|
288
|
+
- lib/asciidoctor/iso/term_lookup_cleanup.rb
|
244
289
|
- lib/asciidoctor/iso/validate.rb
|
245
290
|
- lib/asciidoctor/iso/validate_requirements.rb
|
246
291
|
- lib/asciidoctor/iso/validate_section.rb
|
@@ -259,13 +304,20 @@ files:
|
|
259
304
|
- lib/isodoc/iso/html/word_iso_titlepage.html
|
260
305
|
- lib/isodoc/iso/html/wordstyle.scss
|
261
306
|
- lib/isodoc/iso/html_convert.rb
|
307
|
+
- lib/isodoc/iso/iso.amendment.xsl
|
308
|
+
- lib/isodoc/iso/iso.international-standard.xsl
|
262
309
|
- lib/isodoc/iso/metadata.rb
|
310
|
+
- lib/isodoc/iso/pdf_convert.rb
|
311
|
+
- lib/isodoc/iso/sections.rb
|
312
|
+
- lib/isodoc/iso/sts_convert.rb
|
263
313
|
- lib/isodoc/iso/word_convert.rb
|
314
|
+
- lib/isodoc/iso/xref.rb
|
264
315
|
- lib/metanorma-iso.rb
|
265
316
|
- lib/metanorma/iso.rb
|
266
317
|
- lib/metanorma/iso/processor.rb
|
267
318
|
- lib/metanorma/iso/version.rb
|
268
319
|
- metanorma-iso.gemspec
|
320
|
+
- spec/asciidoctor-iso/amd_spec.rb
|
269
321
|
- spec/asciidoctor-iso/base_spec.rb
|
270
322
|
- spec/asciidoctor-iso/blocks_spec.rb
|
271
323
|
- spec/asciidoctor-iso/cleanup_spec.rb
|
@@ -305,6 +357,7 @@ files:
|
|
305
357
|
- spec/examples/rice_img/rice_image3_1.png
|
306
358
|
- spec/examples/rice_img/rice_image3_2.png
|
307
359
|
- spec/examples/rice_img/rice_image3_3.png
|
360
|
+
- spec/isodoc/amd_spec.rb
|
308
361
|
- spec/isodoc/blocks_spec.rb
|
309
362
|
- spec/isodoc/i18n_spec.rb
|
310
363
|
- spec/isodoc/inline_spec.rb
|
data/asciidoctor-iso.gemspec.old
DELETED
@@ -1,50 +0,0 @@
|
|
1
|
-
# coding: utf-8
|
2
|
-
|
3
|
-
lib = File.expand_path("../lib", __FILE__)
|
4
|
-
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
5
|
-
require "asciidoctor/iso/version"
|
6
|
-
|
7
|
-
Gem::Specification.new do |spec|
|
8
|
-
spec.name = "asciidoctor-iso"
|
9
|
-
spec.version = Asciidoctor::ISO::VERSION
|
10
|
-
spec.authors = ["Ribose Inc."]
|
11
|
-
spec.email = ["open.source@ribose.com"]
|
12
|
-
|
13
|
-
spec.summary = "asciidoctor-iso lets you write ISO standards "\
|
14
|
-
"in AsciiDoc."
|
15
|
-
spec.description = <<~DESCRIPTION
|
16
|
-
asciidoctor-iso lets you write ISO standards in AsciiDoc syntax.
|
17
|
-
|
18
|
-
This gem is in active development.
|
19
|
-
DESCRIPTION
|
20
|
-
|
21
|
-
spec.homepage = "https://github.com/riboseinc/asciidoctor-iso"
|
22
|
-
spec.license = "BSD-2-Clause"
|
23
|
-
spec.post_install_message = "The asciidoctor-iso gem has been deprecated and has been replaced by metanorma-iso"
|
24
|
-
|
25
|
-
spec.bindir = "bin"
|
26
|
-
spec.require_paths = ["lib"]
|
27
|
-
spec.files = `git ls-files`.split("\n")
|
28
|
-
spec.test_files = `git ls-files -- {spec}/*`.split("\n")
|
29
|
-
spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
|
30
|
-
|
31
|
-
spec.add_dependency "asciidoctor", "~> 1.5.7"
|
32
|
-
spec.add_dependency "ruby-jing"
|
33
|
-
spec.add_dependency "isodoc", "~> 0.8.8"
|
34
|
-
spec.add_dependency "iev", "~> 0.2.0"
|
35
|
-
spec.add_dependency "relaton", "~> 0.1.3"
|
36
|
-
spec.add_dependency "metanorma-standoc", "~> 0.0.1"
|
37
|
-
|
38
|
-
spec.add_development_dependency "bundler", "~> 1.15"
|
39
|
-
spec.add_development_dependency "byebug"
|
40
|
-
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
41
|
-
spec.add_development_dependency "guard", "~> 2.14"
|
42
|
-
spec.add_development_dependency "guard-rspec", "~> 4.7"
|
43
|
-
spec.add_development_dependency "rake", "~> 12.0"
|
44
|
-
spec.add_development_dependency "rspec", "~> 3.6"
|
45
|
-
spec.add_development_dependency "rubocop", "~> 0.50"
|
46
|
-
spec.add_development_dependency "simplecov", "~> 0.15"
|
47
|
-
spec.add_development_dependency "timecop", "~> 0.9"
|
48
|
-
spec.add_development_dependency "metanorma", "~> 0.2.6"
|
49
|
-
spec.add_development_dependency "isobib", "~> 0.2.0"
|
50
|
-
end
|