metanorma-m3d 1.3.11 → 1.3.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/m3d/converter.rb +3 -10
  3. data/lib/asciidoctor/m3d/m3d.rng +1 -1
  4. data/lib/isodoc/m3d/html/header.html +123 -14
  5. data/lib/isodoc/m3d/html/wordstyle.scss +32 -10
  6. data/lib/metanorma/m3d/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1c8b211190f01588bb8b445ecda3bd351a8b5ffb060c4a78c180f1651596392e
4
- data.tar.gz: 2082aa3716a3294f55ad30d09f2ec1b4123e89d9ced0cefb7f7d608b938f47a3
3
+ metadata.gz: e688454b176121c6a4313d1551080218953bcea841c3a23d055934b8eb41e2ea
4
+ data.tar.gz: 7f95424aafec0949dcea8cff37ed912bb80b2eb8d369a86db1ef24dd45022f1e
5
5
  SHA512:
6
- metadata.gz: 38d21f0cef1b02467cc7df808c3a4ef24579619f11e5fdeeffe962eeaf484ddef2c454696565731f719c140ea148cac7a35b1806d9a1f890e75ddc7eb6fc33b4
7
- data.tar.gz: 8deea900d52970c48c0e5298787baae0ef66950ce6c57cb52e7a9e389bd6305ed061c4bd75aa5d88e40acc37ab0b9542e07437dfed7df72ec10ffb6b58425e94
6
+ metadata.gz: ab649a96be0c1d9a999c6a3877c016fc043e315d9c285b020212f0758dc27338a5460a4f25cc28f72138d5a274f2b13c91cd8f5217cc122cd30edf1dc38ee2f9
7
+ data.tar.gz: 2b8a85124e86dcfac55e42a65e3cf5f40756d293fc1bc8e7592c9ad8e909f997934fdb1333e1e52399d36cc7b96b96253e7240d001c852fd7a6663e6fb38e7fd
data/lib/asciidoctor/m3d/converter.rb CHANGED
@@ -9,11 +9,12 @@ require_relative "./validate.rb"
9
9
 
10
10
  module Asciidoctor
11
11
  module M3d
12
- M3D_NAMESPACE = "https://open.ribose.com/standards/m3d"
13
12
 
14
13
  # A {Converter} implementation that generates M3D output, and a document
15
14
  # schema encapsulation of the document for validation
16
15
  class Converter < Standoc::Converter
16
+ XML_ROOT_TAG = "m3d-standard".freeze
17
+ XML_NAMESPACE = "https://www.metanorma.com/ns/m3d".freeze
17
18
 
18
19
  register_for "m3d"
19
20
 
@@ -82,16 +83,8 @@ module Asciidoctor
82
83
  end
83
84
 
84
85
  def makexml(node)
85
- result = ["<?xml version='1.0' encoding='UTF-8'?>\n<m3d-standard>"]
86
86
  @draft = node.attributes.has_key?("draft")
87
- result << noko { |ixml| front node, ixml }
88
- result << noko { |ixml| middle node, ixml }
89
- result << "</m3d-standard>"
90
- result = textcleanup(result)
91
- ret1 = cleanup(Nokogiri::XML(result))
92
- validate(ret1) unless @novalid
93
- ret1.root.add_namespace(nil, M3D_NAMESPACE)
94
- ret1
87
+ super
95
88
  end
96
89
 
97
90
  def doctype(node)
data/lib/asciidoctor/m3d/m3d.rng CHANGED
@@ -1,5 +1,5 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
2
+ <grammar ns="https://www.metanorma.com/ns/m3d" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
3
  <!--
4
4
  Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
5
5
  we cannot have a new default namespace: we will end up with a grammar with two different
data/lib/isodoc/m3d/html/header.html CHANGED
@@ -61,25 +61,26 @@ xmlns="http://www.w3.org/TR/REC-html40">
61
61
  </div>
62
62
 
63
63
  <div style='mso-element:header' id=eh1>
64
-
65
-
66
64
  </div>
67
65
 
68
66
  <p class=MsoHeader style='margin-right:18.0pt'><span lang=EN-US><o:p>&nbsp;</o:p></span></p>
69
67
 
70
68
  </div>
71
69
 
72
- <div style='mso-element:header' id=h1>
70
+ <div style='mso-element:header' id=eh1l>
71
+ </div>
73
72
 
74
73
 
74
+ <div style='mso-element:header' id=h1>
75
75
  </div>
76
76
 
77
- <div style='mso-element:footer' id=ef1>
77
+ <div style='mso-element:header' id=h1l>
78
+ </div>
78
79
 
80
+ <div style='mso-element:footer' id=ef1>
79
81
  <div style='mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:
80
82
  paragraph;mso-element-anchor-horizontal:margin;mso-element-left:right;
81
83
  mso-element-top:.05pt;mso-height-rule:exactly'>
82
-
83
84
  <table cellspacing=0 cellpadding=0 hspace=0 vspace=0 align=right>
84
85
  <tr>
85
86
  <td valign=top align=left style='padding-top:0cm;padding-right:0cm;
@@ -94,19 +95,36 @@ mso-element-top:.05pt;mso-height-rule:exactly'>
94
95
  </td>
95
96
  </tr>
96
97
  </table>
97
-
98
98
  </div>
99
-
100
99
  <p class=MsoFooter style='margin-right:18.0pt'><span lang=EN-US><o:p>&nbsp;</o:p></span></p>
100
+ </div>
101
101
 
102
+ <div style='mso-element:footer' id=ef1l>
103
+ <div style='mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:
104
+ paragraph;mso-element-anchor-horizontal:margin;mso-element-left:right;
105
+ mso-element-top:.05pt;mso-height-rule:exactly'>
106
+ <table cellspacing=0 cellpadding=0 hspace=0 vspace=0 align=right>
107
+ <tr>
108
+ <td valign=top align=left style='padding-top:0cm;padding-right:0cm;
109
+ padding-bottom:0cm;padding-left:0cm'>
110
+ <p class=MsoFooterLandscape style='mso-element:frame;mso-element-wrap:around;
111
+ mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal:margin;
112
+ mso-element-left:right;mso-element-top:.05pt;mso-height-rule:exactly'><!--[if supportFields]><span
113
+ class=MsoPageNumber><span lang=EN-US><span style='mso-element:field-begin'></span>PAGE<span
114
+ style='mso-spacerun:yes'>  </span></span></span><![endif]--><!--[if supportFields]><span
115
+ class=MsoPageNumber><span lang=EN-US><span style='mso-element:field-end'></span></span></span><![endif]--><span
116
+ class=MsoPageNumber><span lang=EN-US><o:p></o:p></span></span></p>
117
+ </td>
118
+ </tr>
119
+ </table>
120
+ </div>
121
+ <p class=MsoFooterLandscape style='margin-right:18.0pt'><span lang=EN-US><o:p>&nbsp;</o:p></span></p>
102
122
  </div>
103
123
 
104
124
  <div style='mso-element:footer' id=f1>
105
-
106
125
  <div style='mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:
107
126
  paragraph;mso-element-anchor-horizontal:margin;mso-element-left:right;
108
127
  mso-element-top:.05pt;mso-height-rule:exactly'>
109
-
110
128
  <table cellspacing=0 cellpadding=0 hspace=0 vspace=0 align=right>
111
129
  <tr>
112
130
  <td valign=top align=left style='padding-top:0cm;padding-right:0cm;
@@ -124,20 +142,44 @@ mso-element-top:.05pt;mso-height-rule:exactly'>
124
142
  </td>
125
143
  </tr>
126
144
  </table>
127
-
128
145
  </div>
129
-
130
146
  <p class=MsoFooter><b style='mso-bidi-font-weight:normal'><span lang=EN-US
131
147
  style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>{{doctitle}}<span style='mso-tab-count:2'>                                                                                                                                                                         </span><o:p></o:p></span></b></p>
132
-
133
148
  <p class=MsoFooter style='margin-right:18.0pt;tab-stops:center 181.5pt right 432.0pt'><span
134
149
  lang=EN-US style='mso-bidi-font-size:12.0pt;mso-bidi-font-family:Arial;
135
150
  background:#E0E0E0'><o:p>&nbsp;</o:p></span></p>
151
+ </div>
136
152
 
153
+ <div style='mso-element:footer' id=f1l>
154
+ <div style='mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:
155
+ paragraph;mso-element-anchor-horizontal:margin;mso-element-left:right;
156
+ mso-element-top:.05pt;mso-height-rule:exactly'>
157
+ <table cellspacing=0 cellpadding=0 hspace=0 vspace=0 align=right>
158
+ <tr>
159
+ <td valign=top align=left style='padding-top:0cm;padding-right:0cm;
160
+ padding-bottom:0cm;padding-left:0cm'>
161
+ <p class=MsoHeaderLandscape style='mso-element:frame;mso-element-wrap:around;
162
+ mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal:margin;
163
+ mso-element-left:right;mso-element-top:.05pt;mso-height-rule:exactly'><!--[if supportFields]><span
164
+ class=MsoPageNumber><span lang=EN-US style='font-family:"Garamond",serif'><span
165
+ style='mso-element:field-begin'></span>PAGE<span style='mso-spacerun:yes'> 
166
+ </span><span style='mso-element:field-separator'></span></span></span><![endif]--><span
167
+ class=MsoPageNumber><span lang=EN-US style='font-family:"Garamond",serif'>1</span></span><!--[if supportFields]><span
168
+ class=MsoPageNumber><span lang=EN-US style='font-family:"Garamond",serif'><span
169
+ style='mso-element:field-end'></span></span></span><![endif]--><span
170
+ class=MsoPageNumber><span lang=EN-US style='font-family:"Garamond",serif'><o:p></o:p></span></span></p>
171
+ </td>
172
+ </tr>
173
+ </table>
174
+ </div>
175
+ <p class=MsoFooterLandscape><b style='mso-bidi-font-weight:normal'><span lang=EN-US
176
+ style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>{{doctitle}}<span style='mso-tab-count:2'>                                                                                                                                                                         </span><o:p></o:p></span></b></p>
177
+ <p class=MsoFooterLandscape style='margin-right:18.0pt;tab-stops:center 181.5pt right 432.0pt'><span
178
+ lang=EN-US style='mso-bidi-font-size:12.0pt;mso-bidi-font-family:Arial;
179
+ background:#E0E0E0'><o:p>&nbsp;</o:p></span></p>
137
180
  </div>
138
181
 
139
182
  <div style='mso-element:header' id=fh1>
140
-
141
183
  <p class=MsoHeader><img width="323" height="39" src="{{ logo_word }}"></img>
142
184
  <!--[if gte vml 1]><v:line id="_x0000_s2049" alt=""
143
185
  style='position:absolute;flip:y;z-index:251659264;mso-wrap-style:none;
@@ -146,11 +188,20 @@ background:#E0E0E0'><o:p>&nbsp;</o:p></span></p>
146
188
  to="500.4pt,39.6pt" strokecolor="#ff0c00">
147
189
  <v:shadow color="#969696"/>
148
190
  </v:line><![endif]--></span></b></p>
191
+ </div>
149
192
 
193
+ <div style='mso-element:header' id=fh1l>
194
+ <p class=MsoHeaderLandscape><img width="323" height="39" src="{{ logo_word }}"></img>
195
+ <!--[if gte vml 1]><v:line id="_x0000_s2049" alt=""
196
+ style='position:absolute;flip:y;z-index:251659264;mso-wrap-style:none;
197
+ mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;
198
+ mso-width-percent:0;mso-height-percent:0;v-text-anchor:middle' from="0,39.6pt"
199
+ to="500.4pt,39.6pt" strokecolor="#ff0c00">
200
+ <v:shadow color="#969696"/>
201
+ </v:line><![endif]--></span></b></p>
150
202
  </div>
151
203
 
152
204
  <div style='mso-element:footer' id=ff1>
153
-
154
205
  <p class=MsoFooter><b style='mso-bidi-font-weight:normal'><span lang=EN-US
155
206
  style='font-size:8.0pt;mso-bidi-font-family:Arial'><span style='mso-tab-count:
156
207
  1'>                                                                                                </span></span></b><span
@@ -208,6 +259,64 @@ style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>
208
259
 
209
260
  </div>
210
261
 
262
+ <div style='mso-element:footer' id=ff1l>
263
+ <p class=MsoFooterLandscape><b style='mso-bidi-font-weight:normal'><span lang=EN-US
264
+ style='font-size:8.0pt;mso-bidi-font-family:Arial'><span style='mso-tab-count:
265
+ 1'>                                                                                                </span></span></b><span
266
+ lang=EN-US style='mso-no-proof:yes'><!--[if gte vml 1]><v:line id="_x0000_s2049"
267
+ style='position:absolute;flip:y;z-index:251660288;visibility:visible;
268
+ mso-wrap-style:square;mso-width-percent:0;mso-height-percent:0;
269
+ mso-wrap-distance-left:9pt;mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
270
+ mso-wrap-distance-bottom:0;mso-position-horizontal:absolute;
271
+ mso-position-horizontal-relative:text;mso-position-vertical:absolute;
272
+ mso-position-vertical-relative:text;mso-width-percent:0;mso-height-percent:0;
273
+ mso-width-relative:page;mso-height-relative:page' from="0,0" to="500.4pt,0"
274
+ strokecolor="#ff0c00">
275
+ <v:shadow color="#969696"/>
276
+ </v:line><![endif]--></span><b style='mso-bidi-font-weight:normal'><span
277
+ lang=EN-US style='font-family:"Arial",sans-serif;mso-hansi-font-family:Garamond;
278
+ mso-bidi-font-family:"Times New Roman";color:#33A9CC'>M<sup>3</sup>AAWG</span></b><b
279
+ style='mso-bidi-font-weight:normal'><span lang=EN-US style='font-size:8.0pt;
280
+ mso-bidi-font-family:Arial'><o:p></o:p></span></b></p>
281
+
282
+ <p class=MsoFooterLandscape><span lang=EN-US style='font-size:8.0pt;mso-bidi-font-family:
283
+ Arial'><span style='mso-tab-count:1'>                                                </span></span><span
284
+ lang=EN-US style='font-size:9.0pt;mso-bidi-font-size:11.0pt;font-family:"Arial",sans-serif;
285
+ mso-hansi-font-family:Garamond;mso-bidi-font-family:"Times New Roman"'>Messaging,
286
+ Malware and Mobile Anti-Abuse Working Group</span><span lang=EN-US
287
+ style='font-size:8.0pt;mso-bidi-font-family:Arial'><o:p></o:p></span></p>
288
+
289
+ <p class=MsoFooterLandscape><span lang=EN-US style='font-size:8.0pt;mso-bidi-font-family:
290
+ Arial'><span style='mso-tab-count:1'>                </span></span><span
291
+ lang=EN-US style='font-size:9.0pt;mso-bidi-font-size:11.0pt;font-family:"Arial",sans-serif;
292
+ mso-bidi-font-family:"Times New Roman"'>P.O. Box 29920 </span><span lang=EN-US
293
+ style='font-size:8.0pt;mso-bidi-font-size:11.0pt;font-family:Wingdings;
294
+ color:#33A9CC'>n</span><span lang=EN-US style='font-size:8.0pt;mso-bidi-font-size:
295
+ 11.0pt;font-family:"Times New Roman",serif;color:#33A9CC'> </span><span
296
+ lang=EN-US style='font-size:9.0pt;mso-bidi-font-size:11.0pt;font-family:"Arial",sans-serif;
297
+ mso-bidi-font-family:"Times New Roman"'>San Francisco, CA 94129-0920 </span><span
298
+ lang=EN-US style='font-size:8.0pt;mso-bidi-font-size:11.0pt;font-family:Wingdings;
299
+ color:#33A9CC'>n</span><span lang=EN-US style='font-size:8.0pt;mso-bidi-font-size:
300
+ 11.0pt;font-family:"Times New Roman",serif;color:blue'> </span><u
301
+ style='text-underline:blue'><span lang=EN-US style='font-size:9.0pt;mso-bidi-font-size:
302
+ 11.0pt;font-family:"Arial",sans-serif;mso-bidi-font-family:"Times New Roman";
303
+ color:blue'><a href="http://www.M3AAWG.org/">www.M3AAWG.org<u style='text-underline:
304
+ #000000'><span style='text-underline:#000000;text-decoration:none;text-underline:
305
+ none'> </span></u></a></span></u><span lang=EN-US style='font-size:8.0pt;
306
+ mso-bidi-font-size:11.0pt;font-family:Wingdings;color:#33A9CC'>n</span><span
307
+ lang=EN-US style='font-size:8.0pt;mso-bidi-font-size:11.0pt;font-family:"Times New Roman",serif;
308
+ color:blue'><a href="mailto:info@M3AAWG.org"><span style='text-decoration:none;
309
+ text-underline:none'> </span><span style='font-family:"Arial",sans-serif;
310
+ mso-bidi-font-family:"Times New Roman"'>info@M3AAWG.org</span></a></span><span
311
+ lang=EN-US style='font-size:8.0pt;mso-bidi-font-family:Arial'><o:p></o:p></span></p>
312
+
313
+ </div>
314
+
315
+ <p class=MsoFooterLandscape><b style='mso-bidi-font-weight:normal'><span lang=EN-US
316
+ style='font-size:8.0pt;font-family:"Garamond",serif;mso-bidi-font-family:Arial'>{{doctitle}}<span style='mso-tab-count:2'>                                                                                                                                                                         </span><o:p></o:p></span></b></p>
317
+
318
+ </div>
319
+
211
320
  <div style='mso-element:footer' id=f2>
212
321
 
213
322
  <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>
data/lib/isodoc/m3d/html/wordstyle.scss CHANGED
@@ -157,6 +157,17 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
157
157
  mso-fareast-font-family:"Times New Roman";
158
158
  mso-ansi-language:EN-US;
159
159
  mso-fareast-language:EN-US;}
160
+ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
161
+ {mso-style-unhide:no;
162
+ margin:0cm;
163
+ margin-bottom:.0001pt;
164
+ mso-pagination:widow-orphan;
165
+ tab-stops:center 342.1pt right 684.3pt;
166
+ font-size:11.0pt;
167
+ font-family:$bodyfont;
168
+ mso-fareast-font-family:"Times New Roman";
169
+ mso-ansi-language:EN-US;
170
+ mso-fareast-language:EN-US;}
160
171
  p.MsoFooter, li.MsoFooter, div.MsoFooter
161
172
  {mso-style-unhide:no;
162
173
  margin:0cm;
@@ -168,6 +179,17 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
168
179
  mso-fareast-font-family:"Times New Roman";
169
180
  mso-ansi-language:EN-US;
170
181
  mso-fareast-language:EN-US;}
182
+ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
183
+ {mso-style-unhide:no;
184
+ margin:0cm;
185
+ margin-bottom:.0001pt;
186
+ mso-pagination:widow-orphan;
187
+ tab-stops:center 342.1pt right 684.3pt;
188
+ font-size:11.0pt;
189
+ font-family:$bodyfont;
190
+ mso-fareast-font-family:"Times New Roman";
191
+ mso-ansi-language:EN-US;
192
+ mso-fareast-language:EN-US;}
171
193
  span.MsoCommentReference
172
194
  {mso-style-noshow:yes;
173
195
  mso-style-unhide:no;
@@ -714,12 +736,12 @@ div.WordSection1
714
736
  mso-header-margin:42.55pt;
715
737
  mso-footer-margin:43.1pt;
716
738
  mso-title-page:yes;
717
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh1;
718
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
719
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
720
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f1;
721
- mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
722
- mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff1;
739
+ mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh1l;
740
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1l;
741
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
742
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f1l;
743
+ mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1l;
744
+ mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff1l;
723
745
  mso-paper-source:0;}
724
746
  @page WordSection2P
725
747
  {size:612.0pt 792.0pt;
@@ -751,10 +773,10 @@ div.WordSection2
751
773
  margin:36.0pt 53.85pt 21.55pt 53.85pt;
752
774
  mso-header-margin:42.55pt;
753
775
  mso-footer-margin:43.1pt;
754
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh1;
755
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
756
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
757
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f1;
776
+ mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh1l;
777
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1l;
778
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
779
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f1l;
758
780
  mso-paper-source:0;}
759
781
  @page WordSection3P
760
782
  {size:612.0pt 792.0pt;
data/lib/metanorma/m3d/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module M3d
3
- VERSION = "1.3.11"
3
+ VERSION = "1.3.12"
4
4
  end
5
5
  end
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.3.11
4
+ version: 1.3.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-01-30 00:00:00.000000000 Z
11
+ date: 2020-02-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciimath