metanorma-m3d 1.0.1 → 1.0.2

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.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/m3d/biblio.rng +7 -3
  3. data/lib/asciidoctor/m3d/isodoc.rng +8 -1
  4. data/lib/asciidoctor/m3d/isostandard.rng +63 -15
  5. data/lib/asciidoctor/m3d/m3d.rng +3 -0
  6. data/lib/asciidoctor/m3d/version.rb +1 -1
  7. data/lib/isodoc/m3d/html/header.html +1 -1
  8. data/lib/isodoc/m3d/m3dhtmlconvert.rb +1 -0
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6ce1cab8a9b21e8e30a3e3912b3e666971c100db21a961bfa8301fe80de2e7e6
4
- data.tar.gz: 7c0db761524e67ae5844ba590539c34b7d745413079214ad99c65f566c11b237
3
+ metadata.gz: 33357663540823bfd36ac345d42da5814b1d69f3b7b8652434db43a927b8dd3f
4
+ data.tar.gz: 15cd653c3ec6952ca03bb33fb989c7eef1670aac3798f322fb8eddbe0b2aca4c
5
5
  SHA512:
6
- metadata.gz: 8d298725888cd05582b6e6afd3cac80351e076ea95f2f75d7f33e77c2bfe70394d7e954119d85076950488d07d32eda480967499b27505478fda57b1fdcaca04
7
- data.tar.gz: 13a5883114cebc29a19377837a26fd9235fcf90a78ac8389ef5c2da8159984550bf2e3050fff260922b11669d79f510b5afcfa91a065fd42f2ac02be7b891f0f
6
+ metadata.gz: 2d21bed6f5986e92fface06808c8096d89bb2d7e363103a282020b65226c2a8ad0680fbcce966b7a39393eb7eb821db3792a1c77406ce2507bb49c0beb534e62
7
+ data.tar.gz: 293bf2115c741bfca50a427b1138b3cc1516851114e231d7069aba386c9c9268579574ef2d3448e7676bc10fba25d2f6a3f442bdf0197c2951bec65557f1a15b
data/lib/asciidoctor/m3d/biblio.rng CHANGED
@@ -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>
data/lib/asciidoctor/m3d/isodoc.rng CHANGED
@@ -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">
data/lib/asciidoctor/m3d/isostandard.rng CHANGED
@@ -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">
data/lib/asciidoctor/m3d/m3d.rng CHANGED
@@ -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>
data/lib/asciidoctor/m3d/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Asciidoctor
2
2
  module M3d
3
- VERSION = "1.0.1"
3
+ VERSION = "1.0.2"
4
4
  end
5
5
  end
data/lib/isodoc/m3d/html/header.html CHANGED
@@ -211,7 +211,7 @@ style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>
211
211
  <div style='mso-element:footer' id=f2>
212
212
 
213
213
  <p class=MsoFooter>As with all M3AAWG documents that we publish, please check the M3AAWG website (<a href="http://www.m3aawg.org">www.m3aawg.org</a>) for updates to this paper.</p>
214
- <p class=MsoFooter>&copy; 2017 copyright by the Messaging, Malware and Mobile Anti-Abuse Working Group (M3AAWG)</p>
214
+ <p class=MsoFooter>&copy; {{docyear}} copyright by the Messaging, Malware and Mobile Anti-Abuse Working Group (M3AAWG)</p>
215
215
  </div>
216
216
 
217
217
  </body>
data/lib/isodoc/m3d/m3dhtmlconvert.rb CHANGED
@@ -55,6 +55,7 @@ module IsoDoc
55
55
 
56
56
  def html_head()
57
57
  <<~HEAD.freeze
58
+ <title>{{ doctitle }}</title>
58
59
  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
59
60
 
60
61
  <!--TOC script import-->
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-m3d
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-08-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor