metanorma-iso 1.1.1 → 1.1.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/iso/biblio.rng +33 -51
- data/lib/asciidoctor/iso/isodoc.rng +6 -1
- data/lib/asciidoctor/iso/isostandard.rng +3 -10
- data/lib/asciidoctor/iso/section.rb +1 -1
- data/lib/isodoc/iso/html/isodoc.scss +38 -0
- data/lib/isodoc/iso/html/style-human.scss +1 -1
- data/lib/isodoc/iso/html/style-iso.scss +1 -1
- data/lib/metanorma/iso/version.rb +1 -1
- data/spec/asciidoctor-iso/blocks_spec.rb +1 -1
- data/spec/assets/iso.doc +47 -7
- data/spec/assets/iso.html +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '0978baadfe860ebd2d5e131795b322c851c81bfbc9dceb6ae902efa87054d803'
|
4
|
+
data.tar.gz: b2a04b55f77927077b1b11552fee2fbff31860ee3a295c0affd26e8d61331f4a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3f97f2e2c410e954cb8a91fe2743b2b1f42880c6bfd8be9c081987f4faef43ecc5d92b76590b30bf85807db3d0952853b42465e64efa80b0be8b3c10a77fd5de
|
7
|
+
data.tar.gz: 6031ca6a5056c4829e6dae39c381cfb8a11ec2e24f03ecfc4a3729b5130e8a74c3d8328b30c3cbd20b7564f8bb940183c5a4d613b33d1f5f255d5efa11da572b
|
@@ -18,6 +18,21 @@
|
|
18
18
|
of this.
|
19
19
|
-->
|
20
20
|
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
21
|
+
<!--
|
22
|
+
https://www.myintervals.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
|
23
|
+
iso8601date = xsd:string { pattern = "([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?" }
|
24
|
+
Somewhat dumbed down for XSD regex:
|
25
|
+
-->
|
26
|
+
<define name="ISO8601DateTime">
|
27
|
+
<data type="string">
|
28
|
+
<param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24:?00)([\.,]\d+)?)?((:?)[0-5]\d([.,]\d+)?)?([zZ]|([\+\-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?</param>
|
29
|
+
</data>
|
30
|
+
</define>
|
31
|
+
<define name="ISO8601Date">
|
32
|
+
<data type="string">
|
33
|
+
<param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
|
34
|
+
</data>
|
35
|
+
</define>
|
21
36
|
<define name="status">
|
22
37
|
<element name="status">
|
23
38
|
<ref name="LocalizedString"/>
|
@@ -375,10 +390,7 @@
|
|
375
390
|
</define>
|
376
391
|
<define name="date">
|
377
392
|
<element name="date">
|
378
|
-
<
|
379
|
-
<data type="gYear"/>
|
380
|
-
<data type="date"/>
|
381
|
-
</choice>
|
393
|
+
<ref name="ISO8601Date"/>
|
382
394
|
</element>
|
383
395
|
</define>
|
384
396
|
<define name="locality">
|
@@ -561,10 +573,7 @@
|
|
561
573
|
</define>
|
562
574
|
<define name="fetched">
|
563
575
|
<element name="fetched">
|
564
|
-
<
|
565
|
-
<data type="dateTime"/>
|
566
|
-
<data type="date"/>
|
567
|
-
</choice>
|
576
|
+
<ref name="ISO8601DateTime"/>
|
568
577
|
</element>
|
569
578
|
</define>
|
570
579
|
<define name="validity">
|
@@ -582,26 +591,17 @@
|
|
582
591
|
</define>
|
583
592
|
<define name="validityBegins">
|
584
593
|
<element name="validityBegins">
|
585
|
-
<
|
586
|
-
<data type="dateTime"/>
|
587
|
-
<data type="date"/>
|
588
|
-
</choice>
|
594
|
+
<ref name="ISO8601DateTime"/>
|
589
595
|
</element>
|
590
596
|
</define>
|
591
597
|
<define name="validityEnds">
|
592
598
|
<element name="validityEnds">
|
593
|
-
<
|
594
|
-
<data type="dateTime"/>
|
595
|
-
<data type="date"/>
|
596
|
-
</choice>
|
599
|
+
<ref name="ISO8601DateTime"/>
|
597
600
|
</element>
|
598
601
|
</define>
|
599
602
|
<define name="validityRevision">
|
600
603
|
<element name="revision">
|
601
|
-
<
|
602
|
-
<data type="dateTime"/>
|
603
|
-
<data type="date"/>
|
604
|
-
</choice>
|
604
|
+
<ref name="ISO8601DateTime"/>
|
605
605
|
</element>
|
606
606
|
</define>
|
607
607
|
<define name="TypedTitleString">
|
@@ -632,10 +632,7 @@
|
|
632
632
|
<attribute name="text"/>
|
633
633
|
</optional>
|
634
634
|
<optional>
|
635
|
-
<
|
636
|
-
<data type="gYear"/>
|
637
|
-
<data type="date"/>
|
638
|
-
</choice>
|
635
|
+
<ref name="ISO8601Date"/>
|
639
636
|
</optional>
|
640
637
|
</define>
|
641
638
|
<define name="bdate">
|
@@ -660,25 +657,16 @@
|
|
660
657
|
<choice>
|
661
658
|
<group>
|
662
659
|
<element name="from">
|
663
|
-
<
|
664
|
-
<data type="gYear"/>
|
665
|
-
<data type="date"/>
|
666
|
-
</choice>
|
660
|
+
<ref name="ISO8601Date"/>
|
667
661
|
</element>
|
668
662
|
<optional>
|
669
663
|
<element name="to">
|
670
|
-
<
|
671
|
-
<data type="gYear"/>
|
672
|
-
<data type="date"/>
|
673
|
-
</choice>
|
664
|
+
<ref name="ISO8601Date"/>
|
674
665
|
</element>
|
675
666
|
</optional>
|
676
667
|
</group>
|
677
668
|
<element name="on">
|
678
|
-
<
|
679
|
-
<data type="gYear"/>
|
680
|
-
<data type="date"/>
|
681
|
-
</choice>
|
669
|
+
<ref name="ISO8601Date"/>
|
682
670
|
</element>
|
683
671
|
</choice>
|
684
672
|
</element>
|
@@ -791,20 +779,12 @@
|
|
791
779
|
</define>
|
792
780
|
<define name="seriesfrom">
|
793
781
|
<element name="from">
|
794
|
-
<
|
795
|
-
<data type="dateTime"/>
|
796
|
-
<data type="date"/>
|
797
|
-
<data type="gYear"/>
|
798
|
-
</choice>
|
782
|
+
<ref name="ISO8601Date"/>
|
799
783
|
</element>
|
800
784
|
</define>
|
801
785
|
<define name="seriesto">
|
802
786
|
<element name="to">
|
803
|
-
<
|
804
|
-
<data type="dateTime"/>
|
805
|
-
<data type="date"/>
|
806
|
-
<data type="gYear"/>
|
807
|
-
</choice>
|
787
|
+
<ref name="ISO8601Date"/>
|
808
788
|
</element>
|
809
789
|
</define>
|
810
790
|
<define name="seriesnumber">
|
@@ -899,7 +879,7 @@
|
|
899
879
|
</define>
|
900
880
|
<define name="revision-date">
|
901
881
|
<element name="revision-date">
|
902
|
-
<
|
882
|
+
<ref name="ISO8601Date"/>
|
903
883
|
</element>
|
904
884
|
</define>
|
905
885
|
<define name="draft">
|
@@ -922,10 +902,12 @@
|
|
922
902
|
<define name="AnyElement">
|
923
903
|
<element>
|
924
904
|
<anyName/>
|
925
|
-
<
|
926
|
-
<
|
927
|
-
|
928
|
-
|
905
|
+
<oneOrMore>
|
906
|
+
<choice>
|
907
|
+
<text/>
|
908
|
+
<ref name="AnyElement"/>
|
909
|
+
</choice>
|
910
|
+
</oneOrMore>
|
929
911
|
</element>
|
930
912
|
</define>
|
931
913
|
</grammar>
|
@@ -250,24 +250,17 @@
|
|
250
250
|
<choice>
|
251
251
|
<group>
|
252
252
|
<element name="from">
|
253
|
-
<
|
254
|
-
<data type="gYear"/>
|
255
|
-
<data type="date"/>
|
256
|
-
</choice>
|
253
|
+
<ref name="ISO8601Date"/>
|
257
254
|
</element>
|
258
255
|
<optional>
|
259
256
|
<element name="to">
|
260
|
-
<
|
261
|
-
<data type="gYear"/>
|
262
|
-
<data type="date"/>
|
263
|
-
</choice>
|
257
|
+
<ref name="ISO8601Date"/>
|
264
258
|
</element>
|
265
259
|
</optional>
|
266
260
|
</group>
|
267
261
|
<element name="on">
|
268
262
|
<choice>
|
269
|
-
<
|
270
|
-
<data type="date"/>
|
263
|
+
<ref name="ISO8601Date"/>
|
271
264
|
<value>--</value>
|
272
265
|
</choice>
|
273
266
|
</element>
|
@@ -28,7 +28,7 @@ module Asciidoctor
|
|
28
28
|
else
|
29
29
|
if @term_def then term_def_subclause_parse(a, xml, node)
|
30
30
|
elsif @biblio then bibliography_parse(a, xml, node)
|
31
|
-
elsif node.attr("style") == "bibliography"
|
31
|
+
elsif node.attr("style") == "bibliography"
|
32
32
|
bibliography_parse(a, xml, node)
|
33
33
|
elsif node.attr("style") == "appendix" && node.level == 1
|
34
34
|
annex_parse(a, xml, node)
|
@@ -68,6 +68,44 @@ p.FigureTitle
|
|
68
68
|
mso-fareast-font-family:$bodyfont;
|
69
69
|
mso-bidi-font-family:$bodyfont;
|
70
70
|
mso-ansi-language:EN-GB;}
|
71
|
+
p.AdmonitionTitle
|
72
|
+
{mso-style-unhide:no;
|
73
|
+
mso-style-qformat:yes;
|
74
|
+
mso-style-parent:"";
|
75
|
+
margin-top:0cm;
|
76
|
+
margin-right:0cm;
|
77
|
+
margin-bottom:6.0pt;
|
78
|
+
margin-left:0cm;
|
79
|
+
text-align:center;
|
80
|
+
line-height:12.0pt;
|
81
|
+
page-break-after:avoid;
|
82
|
+
mso-pagination:widow-orphan;
|
83
|
+
tab-stops:20.15pt;
|
84
|
+
font-size:11.0pt;
|
85
|
+
font-family:$bodyfont;
|
86
|
+
font-weight:bold;
|
87
|
+
mso-fareast-font-family:$bodyfont;
|
88
|
+
mso-bidi-font-family:$bodyfont;
|
89
|
+
mso-ansi-language:EN-GB;}
|
90
|
+
p.SourceTitle
|
91
|
+
{mso-style-unhide:no;
|
92
|
+
mso-style-qformat:yes;
|
93
|
+
mso-style-parent:"";
|
94
|
+
margin-top:0cm;
|
95
|
+
margin-right:0cm;
|
96
|
+
margin-bottom:6.0pt;
|
97
|
+
margin-left:0cm;
|
98
|
+
text-align:center;
|
99
|
+
line-height:12.0pt;
|
100
|
+
page-break-before:avoid;
|
101
|
+
mso-pagination:widow-orphan;
|
102
|
+
tab-stops:20.15pt;
|
103
|
+
font-size:11.0pt;
|
104
|
+
font-family:$bodyfont;
|
105
|
+
font-weight:bold;
|
106
|
+
mso-fareast-font-family:$bodyfont;
|
107
|
+
mso-bidi-font-family:$bodyfont;
|
108
|
+
mso-ansi-language:EN-GB;}
|
71
109
|
p.TableTitle
|
72
110
|
{mso-style-unhide:no;
|
73
111
|
mso-style-qformat:yes;
|
@@ -190,7 +190,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
190
190
|
INPUT
|
191
191
|
#{BLANK_HDR}
|
192
192
|
<sections>
|
193
|
-
<admonition id="_" type="safety precautions"><p id="_">While werewolves are hardy community members, keep in mind the following dietary concerns:</p>
|
193
|
+
<admonition id="_" type="safety precautions"><name>Safety Precautions</name><p id="_">While werewolves are hardy community members, keep in mind the following dietary concerns:</p>
|
194
194
|
<ol id="_" type="arabic">
|
195
195
|
<li>
|
196
196
|
<p id="_">They are allergic to cinnamon.</p>
|
data/spec/assets/iso.doc
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
MIME-Version: 1.0
|
2
|
-
Content-Type: multipart/related; boundary="----=
|
2
|
+
Content-Type: multipart/related; boundary="----=_NextPart_7e1dcbc5.8918.449e"
|
3
3
|
|
4
|
-
------=
|
4
|
+
------=_NextPart_7e1dcbc5.8918.449e
|
5
5
|
Content-Location: file:///C:/Doc/iso.htm
|
6
6
|
Content-Type: text/html; charset="utf-8"
|
7
7
|
|
@@ -101,6 +101,46 @@ p.FigureTitle {
|
|
101
101
|
mso-bidi-font-family: "Cambria", serif;
|
102
102
|
mso-ansi-language: EN-GB; }
|
103
103
|
|
104
|
+
p.AdmonitionTitle {
|
105
|
+
mso-style-unhide: no;
|
106
|
+
mso-style-qformat: yes;
|
107
|
+
mso-style-parent: "";
|
108
|
+
margin-top: 0cm;
|
109
|
+
margin-right: 0cm;
|
110
|
+
margin-bottom: 6.0pt;
|
111
|
+
margin-left: 0cm;
|
112
|
+
text-align: center;
|
113
|
+
line-height: 12.0pt;
|
114
|
+
page-break-after: avoid;
|
115
|
+
mso-pagination: widow-orphan;
|
116
|
+
tab-stops: 20.15pt;
|
117
|
+
font-size: 11.0pt;
|
118
|
+
font-family: "Cambria", serif;
|
119
|
+
font-weight: bold;
|
120
|
+
mso-fareast-font-family: "Cambria", serif;
|
121
|
+
mso-bidi-font-family: "Cambria", serif;
|
122
|
+
mso-ansi-language: EN-GB; }
|
123
|
+
|
124
|
+
p.SourceTitle {
|
125
|
+
mso-style-unhide: no;
|
126
|
+
mso-style-qformat: yes;
|
127
|
+
mso-style-parent: "";
|
128
|
+
margin-top: 0cm;
|
129
|
+
margin-right: 0cm;
|
130
|
+
margin-bottom: 6.0pt;
|
131
|
+
margin-left: 0cm;
|
132
|
+
text-align: center;
|
133
|
+
line-height: 12.0pt;
|
134
|
+
page-break-before: avoid;
|
135
|
+
mso-pagination: widow-orphan;
|
136
|
+
tab-stops: 20.15pt;
|
137
|
+
font-size: 11.0pt;
|
138
|
+
font-family: "Cambria", serif;
|
139
|
+
font-weight: bold;
|
140
|
+
mso-fareast-font-family: "Cambria", serif;
|
141
|
+
mso-bidi-font-family: "Cambria", serif;
|
142
|
+
mso-ansi-language: EN-GB; }
|
143
|
+
|
104
144
|
p.TableTitle {
|
105
145
|
mso-style-unhide: no;
|
106
146
|
mso-style-qformat: yes;
|
@@ -829,11 +869,11 @@ Switzerland<p class="MsoNormal"></p></span></p>
|
|
829
869
|
<p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes"> </span>TOC
|
830
870
|
\o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
|
831
871
|
<span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
|
832
|
-
<a href="#
|
872
|
+
<a href="#_Toc107930272">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
|
833
873
|
<span style="mso-tab-count:1 dotted">. </span>
|
834
874
|
</span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
|
835
875
|
<span style="mso-element:field-begin"></span></span>
|
836
|
-
<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF
|
876
|
+
<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc107930272 \h </span>
|
837
877
|
<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
878
|
<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
879
|
|
@@ -870,7 +910,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
|
|
870
910
|
</html>
|
871
911
|
|
872
912
|
|
873
|
-
------=
|
913
|
+
------=_NextPart_7e1dcbc5.8918.449e
|
874
914
|
Content-Location: file:///C:/Doc/iso_files/filelist.xml
|
875
915
|
Content-Transfer-Encoding: base64
|
876
916
|
Content-Type: application/xml
|
@@ -880,7 +920,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
|
|
880
920
|
bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
|
881
921
|
L3htbD4K
|
882
922
|
|
883
|
-
------=
|
923
|
+
------=_NextPart_7e1dcbc5.8918.449e
|
884
924
|
Content-Location: file:///C:/Doc/iso_files/header.html
|
885
925
|
Content-Transfer-Encoding: base64
|
886
926
|
Content-Type: text/html charset="utf-8"
|
@@ -1073,4 +1113,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
|
|
1073
1113
|
ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
|
1074
1114
|
bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
|
1075
1115
|
|
1076
|
-
------=
|
1116
|
+
------=_NextPart_7e1dcbc5.8918.449e--
|
data/spec/assets/iso.html
CHANGED
@@ -106,7 +106,7 @@ at the address below or ISO’s member body in the country of the requester
|
|
106
106
|
});
|
107
107
|
</script>
|
108
108
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=AM_HTMLorMML"></script>
|
109
|
-
<script>
|
109
|
+
<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script><script>
|
110
110
|
//TOC generation
|
111
111
|
$('#toc').toc({
|
112
112
|
'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
|
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.
|
4
|
+
version: 1.1.2
|
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-
|
11
|
+
date: 2019-02-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: asciidoctor
|