metanorma-generic 2.0.1 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/generic/html/generic.scss +0 -1
  3. data/lib/isodoc/generic/html/htmlstyle.scss +3 -2
  4. data/lib/isodoc/generic/html/wordstyle.scss +19 -0
  5. data/lib/metanorma/generic/basicdoc.rng +5 -3
  6. data/lib/metanorma/generic/biblio.rng +7 -5
  7. data/lib/metanorma/generic/isodoc.rng +142 -4
  8. data/lib/metanorma/generic/version.rb +1 -1
  9. data/metanorma.yml.example +1 -1
  10. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5fa88f0baa395e56b19c26fbeb278c4b4424368d23c20282d1d41e1c2b0adfff
4
- data.tar.gz: c0ca25b62c407cd76125ecba1a97e48557b4f90adf31eb34841ba1dee94a3657
3
+ metadata.gz: 45775140cca6282358f9b35080c4a1a2fca6e71e4312743f27660573263b813b
4
+ data.tar.gz: '02856167ec2d7572a1e69485c2c35dd9576a7f9566ab2577215b01f658421944'
5
5
  SHA512:
6
- metadata.gz: 2ab1796a867d326954a8e42668b77bf7b26febe4bc658d44a2f8ddab232c18834911cca7b4b7225bddffbe429d553aea5484fdb50db35f6f0adbcc9758d3e4ca
7
- data.tar.gz: 9658b9faf8d7c0d70b65c8d0458534809acf4744401ec9ff899512dd3db04a94706fa25c983befe7aa633aca525a5f2ab3589426ba0b9fd48c497ba5d3f71c64
6
+ metadata.gz: 878071bc35aea75cd59acffadef5784392ee465752c100a5ebb4a51fed450f86b82e1a307a27e4a7c2cd0fc5d3fc876b2b03aa6c4f532c9b42966ce18cb1f2a8
7
+ data.tar.gz: dff26dda9647322c2a548ea8f5b11881799ca866e045efe4f2aeaff6ea19567f2658f6183d1983126b60bff0def43b5d74a0c17e6815043ef998c66f95ec9569
data/lib/isodoc/generic/html/generic.scss CHANGED
@@ -749,7 +749,6 @@ div.example p.MsoListParagraph {
749
749
 
750
750
  div.Note p.MsoListParagraph {
751
751
  font-size: 10.0pt;
752
- margin-left: 1.0cm;
753
752
  }
754
753
 
755
754
  div.Note span.stem {
data/lib/isodoc/generic/html/htmlstyle.scss CHANGED
@@ -16,7 +16,7 @@ body {
16
16
 
17
17
  main {margin: 0 3em 0 6em;}
18
18
 
19
- #toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
19
+ #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
20
20
  @include toc(#485094, #1661AD, #485094);
21
21
  @include sidebarToc();
22
22
  .toc-active a {
@@ -33,9 +33,10 @@ main {margin: 0 3em 0 6em;}
33
33
  }
34
34
  }
35
35
 
36
- #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
36
+ #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
37
37
  margin-top: 0;
38
38
  margin-bottom: 0;
39
+ font-size: 100%;
39
40
  }
40
41
 
41
42
  nav {
data/lib/isodoc/generic/html/wordstyle.scss CHANGED
@@ -781,6 +781,25 @@ p.Tablebody, li.Tablebody, div.Tablebody
781
781
  mso-fareast-font-family:$bodyfont;
782
782
  mso-bidi-font-family:$bodyfont;
783
783
  mso-ansi-language:EN-GB;}
784
+ p.TOCTitle, li.TOCTitle, div.TOCTitle
785
+ {mso-style-name:"TOC Title";
786
+ mso-style-unhide:no;
787
+ margin-top:0in;
788
+ margin-right:0in;
789
+ margin-bottom:$normalfontsize;
790
+ margin-left:0in;
791
+ text-align:left;
792
+ page-break-after:avoid;
793
+ mso-pagination:none;
794
+ mso-hyphenate:none;
795
+ mso-layout-grid-align:none;
796
+ font-size:$normalfontsize;
797
+ mso-bidi-font-size:10.0pt;
798
+ font-weight:bold;
799
+ font-family:$headerfont;
800
+ mso-fareast-font-family:$headerfont;
801
+ mso-bidi-font-family:$headerfont;
802
+ mso-fareast-language:EN-US;}
784
803
 
785
804
 
786
805
  /* Page Definitions */
data/lib/metanorma/generic/basicdoc.rng CHANGED
@@ -173,9 +173,11 @@
173
173
  <data type="dateTime"/>
174
174
  </attribute>
175
175
  </optional>
176
- <attribute name="from">
177
- <data type="IDREF"/>
178
- </attribute>
176
+ <optional>
177
+ <attribute name="from">
178
+ <data type="IDREF"/>
179
+ </attribute>
180
+ </optional>
179
181
  <optional>
180
182
  <attribute name="to">
181
183
  <data type="IDREF"/>
data/lib/metanorma/generic/biblio.rng CHANGED
@@ -209,9 +209,6 @@
209
209
  <zeroOrMore>
210
210
  <ref name="contact"/>
211
211
  </zeroOrMore>
212
- <zeroOrMore>
213
- <ref name="uri"/>
214
- </zeroOrMore>
215
212
  </element>
216
213
  </define>
217
214
  <define name="fullname">
@@ -401,9 +398,9 @@
401
398
  <choice>
402
399
  <!-- iso191606 TODO -->
403
400
  <group>
404
- <oneOrMore>
401
+ <zeroOrMore>
405
402
  <ref name="street"/>
406
- </oneOrMore>
403
+ </zeroOrMore>
407
404
  <ref name="city"/>
408
405
  <optional>
409
406
  <ref name="state"/>
@@ -828,6 +825,11 @@
828
825
  <optional>
829
826
  <attribute name="scope"/>
830
827
  </optional>
828
+ <optional>
829
+ <attribute name="primary">
830
+ <data type="boolean"/>
831
+ </attribute>
832
+ </optional>
831
833
  <text/>
832
834
  </element>
833
835
  </define>
data/lib/metanorma/generic/isodoc.rng CHANGED
@@ -32,6 +32,43 @@
32
32
  <ref name="DocumentType"/>
33
33
  </element>
34
34
  </define>
35
+ <define name="index">
36
+ <element name="index">
37
+ <optional>
38
+ <attribute name="to">
39
+ <data type="IDREF"/>
40
+ </attribute>
41
+ </optional>
42
+ <element name="primary">
43
+ <oneOrMore>
44
+ <choice>
45
+ <ref name="PureTextElement"/>
46
+ <ref name="stem"/>
47
+ </choice>
48
+ </oneOrMore>
49
+ </element>
50
+ <optional>
51
+ <element name="secondary">
52
+ <oneOrMore>
53
+ <choice>
54
+ <ref name="PureTextElement"/>
55
+ <ref name="stem"/>
56
+ </choice>
57
+ </oneOrMore>
58
+ </element>
59
+ </optional>
60
+ <optional>
61
+ <element name="tertiary">
62
+ <oneOrMore>
63
+ <choice>
64
+ <ref name="PureTextElement"/>
65
+ <ref name="stem"/>
66
+ </choice>
67
+ </oneOrMore>
68
+ </element>
69
+ </optional>
70
+ </element>
71
+ </define>
35
72
  <define name="bibitem">
36
73
  <element name="bibitem">
37
74
  <attribute name="id">
@@ -115,9 +152,7 @@
115
152
  <data type="boolean"/>
116
153
  </attribute>
117
154
  </optional>
118
- <oneOrMore>
119
- <ref name="PureTextElement"/>
120
- </oneOrMore>
155
+ <ref name="XrefBody"/>
121
156
  </element>
122
157
  </define>
123
158
  <define name="erefType">
@@ -151,6 +186,42 @@
151
186
  <ref name="PureTextElement"/>
152
187
  </oneOrMore>
153
188
  </define>
189
+ <define name="localityStack">
190
+ <element name="localityStack">
191
+ <optional>
192
+ <attribute name="connective">
193
+ <choice>
194
+ <value>and</value>
195
+ <value>or</value>
196
+ <value>from</value>
197
+ <value>to</value>
198
+ <value/>
199
+ </choice>
200
+ </attribute>
201
+ </optional>
202
+ <zeroOrMore>
203
+ <ref name="locality"/>
204
+ </zeroOrMore>
205
+ </element>
206
+ </define>
207
+ <define name="sourceLocalityStack">
208
+ <element name="sourceLocalityStack">
209
+ <optional>
210
+ <attribute name="connective">
211
+ <choice>
212
+ <value>and</value>
213
+ <value>or</value>
214
+ <value>from</value>
215
+ <value>to</value>
216
+ <value/>
217
+ </choice>
218
+ </attribute>
219
+ </optional>
220
+ <zeroOrMore>
221
+ <ref name="sourceLocality"/>
222
+ </zeroOrMore>
223
+ </element>
224
+ </define>
154
225
  <define name="ul">
155
226
  <element name="ul">
156
227
  <attribute name="id">
@@ -1027,6 +1098,26 @@
1027
1098
  </zeroOrMore>
1028
1099
  </element>
1029
1100
  </define>
1101
+ <define name="sub">
1102
+ <element name="sub">
1103
+ <zeroOrMore>
1104
+ <choice>
1105
+ <ref name="PureTextElement"/>
1106
+ <ref name="stem"/>
1107
+ </choice>
1108
+ </zeroOrMore>
1109
+ </element>
1110
+ </define>
1111
+ <define name="sup">
1112
+ <element name="sup">
1113
+ <zeroOrMore>
1114
+ <choice>
1115
+ <ref name="PureTextElement"/>
1116
+ <ref name="stem"/>
1117
+ </choice>
1118
+ </zeroOrMore>
1119
+ </element>
1120
+ </define>
1030
1121
  <define name="pagebreak">
1031
1122
  <element name="pagebreak">
1032
1123
  <optional>
@@ -1041,6 +1132,16 @@
1041
1132
  </define>
1042
1133
  </include>
1043
1134
  <!-- end overrides -->
1135
+ <define name="image" combine="choice">
1136
+ <element name="svg">
1137
+ <oneOrMore>
1138
+ <choice>
1139
+ <text/>
1140
+ <ref name="AnyElement"/>
1141
+ </choice>
1142
+ </oneOrMore>
1143
+ </element>
1144
+ </define>
1044
1145
  <define name="MultilingualRenderingType">
1045
1146
  <choice>
1046
1147
  <value>common</value>
@@ -2216,7 +2317,18 @@
2216
2317
  <ref name="MultilingualRenderingType"/>
2217
2318
  </attribute>
2218
2319
  </optional>
2219
- <ref name="paragraph"/>
2320
+ <oneOrMore>
2321
+ <choice>
2322
+ <ref name="formula"/>
2323
+ <ref name="ul"/>
2324
+ <ref name="ol"/>
2325
+ <ref name="dl"/>
2326
+ <ref name="quote"/>
2327
+ <ref name="sourcecode"/>
2328
+ <ref name="paragraph"/>
2329
+ <ref name="figure"/>
2330
+ </choice>
2331
+ </oneOrMore>
2220
2332
  </element>
2221
2333
  </define>
2222
2334
  <define name="termsource">
@@ -2563,4 +2675,30 @@
2563
2675
  </zeroOrMore>
2564
2676
  </element>
2565
2677
  </define>
2678
+ <define name="XrefBody">
2679
+ <zeroOrMore>
2680
+ <ref name="XrefTarget"/>
2681
+ </zeroOrMore>
2682
+ <oneOrMore>
2683
+ <ref name="PureTextElement"/>
2684
+ </oneOrMore>
2685
+ </define>
2686
+ <define name="XrefTarget">
2687
+ <element name="location">
2688
+ <attribute name="target">
2689
+ <data type="string">
2690
+ <param name="pattern">\i\c*|\c+#\c+</param>
2691
+ </data>
2692
+ </attribute>
2693
+ <attribute name="connective">
2694
+ <choice>
2695
+ <value>and</value>
2696
+ <value>or</value>
2697
+ <value>from</value>
2698
+ <value>to</value>
2699
+ <value/>
2700
+ </choice>
2701
+ </attribute>
2702
+ </element>
2703
+ </define>
2566
2704
  </grammar>
data/lib/metanorma/generic/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Generic
3
- VERSION = "2.0.1".freeze
3
+ VERSION = "2.0.4".freeze
4
4
  end
5
5
  end
data/metanorma.yml.example CHANGED
@@ -70,5 +70,5 @@ symbols_titles:
70
70
  - Abbreviations
71
71
  normref_titles:
72
72
  - Normative references
73
- bibliography_titles
73
+ bibliography_titles:
74
74
  - Bibliography
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-generic
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 2.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-01-17 00:00:00.000000000 Z
11
+ date: 2022-03-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
270
270
  - !ruby/object:Gem::Version
271
271
  version: '0'
272
272
  requirements: []
273
- rubygems_version: 3.2.32
273
+ rubygems_version: 3.3.9
274
274
  signing_key:
275
275
  specification_version: 4
276
276
  summary: Metanorma template gem for customisation.