metanorma-rsd 1.0.1 → 1.0.2

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: 4a42e2535dfdf1306bf809cd1c7abd1f926f1727c7b172866ea6fb29c47aa320
4
- data.tar.gz: 454cc9057997575de5a96d750a97465a6fb013126e927c0200c9dcecdcf30e09
3
+ metadata.gz: 1036a938ae664662682ee079f804f9b669215822aff63569e3809c3f3f0d73e0
4
+ data.tar.gz: 59a894e40c025eb337d0fd181623c820438df7459bea77f02457167818485c82
5
5
  SHA512:
6
- metadata.gz: ee2c5080f161da12ecbf67907c1c0ec2abd1f593b7eaba9fdc87adbec60b8325582038cfd595d7e31e93356a4f875f4f43c05b5e2350d39d298ef574595a8257
7
- data.tar.gz: b30bf9fc93d697aa39243b79b857ba1539877e0ae9739a973fccd60afa5b814a19992824c3fba703fb3b1d577d0b1855c42dbe9c0a1ac8da2b28781ea987b436
6
+ metadata.gz: e912ad04fa89b10a6b393a44306eff16fbf95846a8ed60fc16b771f5c54689705c43045e70e3c892a12f512a7c74a43353aa5f5cf7f81a2e89869b8901c991e3
7
+ data.tar.gz: 0a7a1db65b0aa1d1d81dabe3c67b558bee260b4bcf296d5869ba392673b57412d9166ea50fcfe80f63a433a804fa13800a4266079d626b30e7c1e3ae492e615e
@@ -384,7 +384,7 @@
384
384
  </define>
385
385
  <define name="LocalityType">
386
386
  <data type="string">
387
- <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
387
+ <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
388
388
  </data>
389
389
  </define>
390
390
  <define name="referenceFrom">
@@ -700,8 +700,12 @@
700
700
  <ref name="btitle"/>
701
701
  <ref name="formattedref"/>
702
702
  </choice>
703
- <ref name="bplace"/>
704
- <ref name="seriesorganization"/>
703
+ <optional>
704
+ <ref name="bplace"/>
705
+ </optional>
706
+ <optional>
707
+ <ref name="seriesorganization"/>
708
+ </optional>
705
709
  <optional>
706
710
  <ref name="abbreviation"/>
707
711
  </optional>
@@ -956,6 +956,11 @@
956
956
  </define>
957
957
  <define name="li">
958
958
  <element name="li">
959
+ <optional>
960
+ <attribute name="id">
961
+ <data type="ID"/>
962
+ </attribute>
963
+ </optional>
959
964
  <oneOrMore>
960
965
  <ref name="paragraph-with-footnote"/>
961
966
  </oneOrMore>
@@ -999,7 +1004,9 @@
999
1004
  </define>
1000
1005
  <define name="dt">
1001
1006
  <element name="dt">
1002
- <ref name="TextElement"/>
1007
+ <zeroOrMore>
1008
+ <ref name="TextElement"/>
1009
+ </zeroOrMore>
1003
1010
  </element>
1004
1011
  </define>
1005
1012
  <define name="dd">
@@ -20,6 +20,9 @@
20
20
  <!-- add type to docidentifier in isodoc? -->
21
21
  <define name="docidentifier">
22
22
  <element name="docidentifier">
23
+ <optional>
24
+ <attribute name="type"/>
25
+ </optional>
23
26
  <choice>
24
27
  <text/>
25
28
  <group>
@@ -108,6 +111,27 @@
108
111
  <zeroOrMore>
109
112
  <ref name="docrelation"/>
110
113
  </zeroOrMore>
114
+ <zeroOrMore>
115
+ <ref name="series"/>
116
+ </zeroOrMore>
117
+ <optional>
118
+ <ref name="medium"/>
119
+ </optional>
120
+ <zeroOrMore>
121
+ <ref name="bplace"/>
122
+ </zeroOrMore>
123
+ <zeroOrMore>
124
+ <ref name="extent"/>
125
+ </zeroOrMore>
126
+ <zeroOrMore>
127
+ <ref name="accesslocation"/>
128
+ </zeroOrMore>
129
+ <optional>
130
+ <ref name="bclassification"/>
131
+ </optional>
132
+ <optional>
133
+ <ref name="validity"/>
134
+ </optional>
111
135
  <optional>
112
136
  <ref name="editorialgroup"/>
113
137
  </optional>
@@ -164,6 +188,27 @@
164
188
  <zeroOrMore>
165
189
  <ref name="docrelation"/>
166
190
  </zeroOrMore>
191
+ <zeroOrMore>
192
+ <ref name="series"/>
193
+ </zeroOrMore>
194
+ <optional>
195
+ <ref name="medium"/>
196
+ </optional>
197
+ <zeroOrMore>
198
+ <ref name="bplace"/>
199
+ </zeroOrMore>
200
+ <zeroOrMore>
201
+ <ref name="extent"/>
202
+ </zeroOrMore>
203
+ <zeroOrMore>
204
+ <ref name="accesslocation"/>
205
+ </zeroOrMore>
206
+ <optional>
207
+ <ref name="bclassification"/>
208
+ </optional>
209
+ <optional>
210
+ <ref name="validity"/>
211
+ </optional>
167
212
  <ref name="editorialgroup"/>
168
213
  <zeroOrMore>
169
214
  <ref name="ics"/>
@@ -548,10 +593,17 @@
548
593
  </define>
549
594
  <define name="li">
550
595
  <element name="li">
551
- <oneOrMore>
552
- <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
553
- <ref name="BasicBlock"/>
554
- </oneOrMore>
596
+ <group>
597
+ <optional>
598
+ <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
599
+ <attribute name="id">
600
+ <data type="ID"/>
601
+ </attribute>
602
+ </optional>
603
+ <oneOrMore>
604
+ <ref name="BasicBlock"/>
605
+ </oneOrMore>
606
+ </group>
555
607
  <!-- exclude figures? -->
556
608
  </element>
557
609
  </define>
@@ -859,7 +911,7 @@
859
911
  </element>
860
912
  </define>
861
913
  <define name="allParts">
862
- <element name="allParts">
914
+ <element name="allparts">
863
915
  <data type="boolean"/>
864
916
  </element>
865
917
  </define>
@@ -947,17 +999,13 @@
947
999
  <optional>
948
1000
  <ref name="section-title"/>
949
1001
  </optional>
950
- <choice>
951
- <oneOrMore>
1002
+ <zeroOrMore>
1003
+ <choice>
952
1004
  <ref name="term-clause"/>
953
- </oneOrMore>
954
- <zeroOrMore>
955
- <choice>
956
- <ref name="terms"/>
957
- <ref name="definitions"/>
958
- </choice>
959
- </zeroOrMore>
960
- </choice>
1005
+ <ref name="terms"/>
1006
+ <ref name="definitions"/>
1007
+ </choice>
1008
+ </zeroOrMore>
961
1009
  </element>
962
1010
  </define>
963
1011
  <define name="reference-clause">
@@ -16,6 +16,9 @@
16
16
  </define>
17
17
  <define name="docidentifier">
18
18
  <element name="docidentifier">
19
+ <optional>
20
+ <attribute name="type"/>
21
+ </optional>
19
22
  <text/>
20
23
  </element>
21
24
  </define>
@@ -29,30 +32,38 @@
29
32
  <attribute name="id">
30
33
  <data type="ID"/>
31
34
  </attribute>
32
- <optional>
33
- <ref name="source"/>
34
- </optional>
35
35
  <optional>
36
36
  <ref name="tname"/>
37
37
  </optional>
38
38
  <choice>
39
+ <ref name="image"/>
40
+ <ref name="pre"/>
39
41
  <oneOrMore>
40
- <ref name="figure"/>
42
+ <ref name="subfigure"/>
41
43
  </oneOrMore>
42
- <group>
43
- <choice>
44
- <zeroOrMore>
45
- <ref name="TextElement"/>
46
- </zeroOrMore>
47
- <ref name="pre"/>
48
- </choice>
49
- <zeroOrMore>
50
- <ref name="note"/>
51
- </zeroOrMore>
52
- <optional>
53
- <ref name="dl"/>
54
- </optional>
55
- </group>
44
+ </choice>
45
+ <zeroOrMore>
46
+ <ref name="fn"/>
47
+ </zeroOrMore>
48
+ <optional>
49
+ <ref name="dl"/>
50
+ </optional>
51
+ <zeroOrMore>
52
+ <ref name="note"/>
53
+ </zeroOrMore>
54
+ </element>
55
+ </define>
56
+ <define name="subfigure">
57
+ <element name="figure">
58
+ <attribute name="id">
59
+ <data type="ID"/>
60
+ </attribute>
61
+ <optional>
62
+ <ref name="tname"/>
63
+ </optional>
64
+ <choice>
65
+ <ref name="image"/>
66
+ <ref name="pre"/>
56
67
  </choice>
57
68
  </element>
58
69
  </define>
@@ -1,5 +1,5 @@
1
1
  module Asciidoctor
2
2
  module Rsd
3
- VERSION = "1.0.1"
3
+ VERSION = "1.0.2"
4
4
  end
5
5
  end
@@ -8,62 +8,7 @@ margin-bottom:12.0pt;margin-left:0cm;text-align:left;page-break-before:always;
8
8
  mso-layout-grid-align:none;text-autospace:none;border:none;mso-border-top-alt:
9
9
  solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;mso-border-right-alt:
10
10
  solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 0cm 4.0pt'><span
11
- lang="EN-GB" style='color:windowtext'>© {{ agency }} {{ docyear }}, Published in Switzerland.<o:p></o:p></span></p>
12
-
13
- <p class="zzCopyright" style='margin-top:0cm;margin-right:0cm;margin-bottom:12.0pt;
14
- margin-left:0cm;mso-layout-grid-align:none;text-autospace:none;border:none;
15
- mso-border-left-alt:solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;
16
- padding:0cm;mso-padding-alt:0cm 4.0pt 0cm 4.0pt'><span lang="EN-GB"
17
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt;color:windowtext'>All rights
18
- reserved. Unless otherwise specified, no part of this publication may be
19
- reproduced or utilized otherwise in any form or by any means, electronic or
20
- mechanical, including photocopying, or posting on the internet or an intranet,
21
- without prior written permission. Permission can be requested from either ISO
22
- at the address below or ISO’s member body in the country of the requester.<o:p></o:p></span></p>
23
-
24
- <p class="zzCopyright" style='margin:0cm;margin-bottom:.0001pt;text-indent:20.15pt;
25
- mso-layout-grid-align:none;text-autospace:none;border:none;mso-border-left-alt:
26
- solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:0cm;
27
- mso-padding-alt:0cm 4.0pt 0cm 4.0pt'><span lang="EN-GB" style='font-size:10.0pt;
28
- mso-bidi-font-size:11.0pt;color:windowtext'>ISO copyright office<o:p></o:p></span></p>
29
-
30
- <p class="zzCopyright" style='margin:0cm;margin-bottom:.0001pt;text-indent:20.15pt;
31
- mso-layout-grid-align:none;text-autospace:none;border:none;mso-border-left-alt:
32
- solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:0cm;
33
- mso-padding-alt:0cm 4.0pt 0cm 4.0pt'><span lang="EN-GB" style='font-size:10.0pt;
34
- mso-bidi-font-size:11.0pt;color:windowtext'>Ch. de Blandonnet 8 &#x2022; CP 401<o:p></o:p></span></p>
35
-
36
- <p class="zzCopyright" style='margin:0cm;margin-bottom:.0001pt;text-indent:20.15pt;
37
- mso-layout-grid-align:none;text-autospace:none;border:none;mso-border-left-alt:
38
- solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:0cm;
39
- mso-padding-alt:0cm 4.0pt 0cm 4.0pt'><span lang="EN-GB" style='font-size:10.0pt;
40
- mso-bidi-font-size:11.0pt;color:windowtext'>CH-1214 Vernier, Geneva,
41
- Switzerland<o:p></o:p></span></p>
42
-
43
- <p class="zzCopyright" style='margin:0cm;margin-bottom:.0001pt;text-indent:20.15pt;
44
- mso-layout-grid-align:none;text-autospace:none;border:none;mso-border-left-alt:
45
- solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:0cm;
46
- mso-padding-alt:0cm 4.0pt 0cm 4.0pt'><span lang="EN-GB" style='font-size:10.0pt;
47
- mso-bidi-font-size:11.0pt;color:windowtext'>Tel.&nbsp;&nbsp;+ 41 22 749 01 11<o:p></o:p></span></p>
48
-
49
- <p class="zzCopyright" style='margin:0cm;margin-bottom:.0001pt;text-indent:20.15pt;
50
- mso-layout-grid-align:none;text-autospace:none;border:none;mso-border-left-alt:
51
- solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:0cm;
52
- mso-padding-alt:0cm 4.0pt 0cm 4.0pt'><span lang="EN-GB" style='font-size:10.0pt;
53
- mso-bidi-font-size:11.0pt;color:windowtext'>Fax&nbsp;&nbsp;+ 41 22 749 09 47<o:p></o:p></span></p>
54
-
55
- <p class="zzCopyright" style='margin:0cm;margin-bottom:.0001pt;text-indent:20.15pt;
56
- mso-layout-grid-align:none;text-autospace:none;border:none;mso-border-left-alt:
57
- solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:0cm;
58
- mso-padding-alt:0cm 4.0pt 0cm 4.0pt'><span lang="EN-GB" style='font-size:10.0pt;
59
- mso-bidi-font-size:11.0pt;color:windowtext'>copyright@iso.org<o:p></o:p></span></p>
60
-
61
- <p class="zzCopyright" style='margin-top:0cm;margin-right:0cm;margin-bottom:12.0pt;
62
- margin-left:0cm;text-indent:20.15pt;mso-layout-grid-align:none;text-autospace:
63
- none;border:none;mso-border-left-alt:solid windowtext .5pt;mso-border-bottom-alt:
64
- solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:0cm;
65
- mso-padding-alt:0cm 4.0pt 1.0pt 4.0pt'><span lang="EN-GB" style='font-size:10.0pt;
66
- mso-bidi-font-size:11.0pt;color:windowtext'>www.iso.org<o:p></o:p></span></p>
11
+ lang="EN-GB" style='color:windowtext'>© {{ agency }} {{ docyear }}, Published in Hong Kong.<o:p></o:p></span></p>
67
12
 
68
13
  </div>
69
14
 
@@ -40,6 +40,7 @@ module IsoDoc
40
40
 
41
41
  def html_head
42
42
  <<~HEAD.freeze
43
+ <title>{{ doctitle }}</title>
43
44
  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
44
45
 
45
46
  <!--TOC script import-->
@@ -38,6 +38,7 @@ module IsoDoc
38
38
 
39
39
  def html_head()
40
40
  <<~HEAD.freeze
41
+ <title>{{ doctitle }}</title>
41
42
  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
42
43
 
43
44
  <!--TOC script import-->
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-rsd
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-08-15 00:00:00.000000000 Z
11
+ date: 2018-09-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor