metanorma-csa 1.4.2 → 1.4.3

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/csa/converter.rb +4 -16
  3. data/lib/asciidoctor/csa/csa.rng +2 -2
  4. data/lib/isodoc/csa/html/csa.scss +8 -8
  5. data/lib/isodoc/csa/html/header.html +66 -6
  6. data/lib/isodoc/csa/html/wordstyle.scss +22 -0
  7. data/lib/metanorma/csa/version.rb +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f65dc98162f7d8dcf5f088e02f3f9ff45ac273a9bf0dc880cb317e185ade58e5
4
- data.tar.gz: 470fe82e1b7461fdc037e008afcd401175532b3c940f8d64bbf2766e811345ae
3
+ metadata.gz: 9ce33569ea88008ebeb2f7150a6b5de8aa2391b70494be286f61fc5cc38ccfc2
4
+ data.tar.gz: 9fab89a455bea858f76cff7a610eec9c6dcab6a0eb1dd90e334822aaa26bdfad
5
5
  SHA512:
6
- metadata.gz: f7024b94c5c919254b39b2aa9746a9fe8bf3d9dcef22457e9709c510c209d39fe6aeefa5e52a9038940c25fdc1fc7d408c4bb2bcd815206644545c8d987ae40e
7
- data.tar.gz: b97fec8b477d20beff084db7acba421409c0b0f0c40e5670f974cb4fe77d31f397e253abb5328a8d4deb7adbc93df452dec2a4b1310ad8107efdff0398704e94
6
+ metadata.gz: 203c01464ba8fd4335237296f3f08fb84899f3416e59fc8f0c7d90686fdcd90163d22211156695e624ff7c01e160b4b661f77944d0d1044ae34c2642e863d7a4
7
+ data.tar.gz: 4bb136bb2ce2537c71bf63a5aa030063e6bc32e96eedc3213229a5ebb3baa4cc9c90e26c95a82b61116f18bcc530373e94ea0cb3517fb7b844cbde958c51c862
data/lib/asciidoctor/csa/converter.rb CHANGED
@@ -11,12 +11,13 @@ require_relative 'validate'
11
11
 
12
12
  module Asciidoctor
13
13
  module Csa
14
- CSA_NAMESPACE = 'https://open.ribose.com/standards/csa'
15
14
  CSA_TYPE = 'csa'
16
15
 
17
16
  # A {Converter} implementation that generates CSD output, and a document
18
17
  # schema encapsulation of the document for validation
19
18
  class Converter < Standoc::Converter
19
+ XML_ROOT_TAG = "csa-standard".freeze
20
+ XML_NAMESPACE = "https://www.metanorma.com/ns/csa".freeze
20
21
 
21
22
  register_for CSA_TYPE
22
23
 
@@ -57,7 +58,7 @@ module Asciidoctor
57
58
  dn = node.attr('docnumber')
58
59
  if docstatus
59
60
  abbr = IsoDoc::Csa::Metadata.new('en', 'Latn', {})
60
- .status_abbr(docstatus)
61
+ .status_abbr(docstatus)
61
62
  dn = "#{dn}(#{abbr})" unless abbr.empty?
62
63
  end
63
64
  node.attr('copyright-year') && dn += ":#{node.attr('copyright-year')}"
@@ -81,19 +82,6 @@ module Asciidoctor
81
82
  nil
82
83
  end
83
84
 
84
- def makexml(node)
85
- result = ["<?xml version='1.0' encoding='UTF-8'?>\n<csa-standard>"]
86
- @draft = node.attributes.has_key?("draft")
87
- result << noko { |ixml| front node, ixml }
88
- result << noko { |ixml| middle node, ixml }
89
- result << '</csa-standard>'
90
- result = textcleanup(result)
91
- ret1 = cleanup(Nokogiri::XML(result))
92
- validate(ret1) unless @novalid
93
- ret1.root.add_namespace(nil, CSA_NAMESPACE)
94
- ret1
95
- end
96
-
97
85
  def doctype(node)
98
86
  d = node.attr('doctype')
99
87
  unless %w{guidance proposal standard report whitepaper charter policy glossary case-study}.include? d
@@ -109,7 +97,7 @@ module Asciidoctor
109
97
  ret = ret1.to_xml(indent: 2)
110
98
  unless node.attr('nodoc') || !node.attr('docfile')
111
99
  filename = node.attr('docfile').gsub(/\.adoc/, '.xml')
112
- .gsub(%r{^.*/}, '')
100
+ .gsub(%r{^.*/}, '')
113
101
  File.open(filename, 'w') { |f| f.write(ret) }
114
102
  html_converter(node).convert filename unless node.attr('nodoc')
115
103
  pdf_converter(node).convert filename unless node.attr('nodoc')
data/lib/asciidoctor/csa/csa.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/csa" 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
@@ -80,7 +80,7 @@
80
80
  </define>
81
81
  </include>
82
82
  <define name="csand-standard">
83
- <element name="csand-standard">
83
+ <element name="csa-standard">
84
84
  <ref name="bibdata"/>
85
85
  <zeroOrMore>
86
86
  <ref name="termdocsource"/>
data/lib/isodoc/csa/html/csa.scss CHANGED
@@ -583,10 +583,10 @@ div.WordSection1
583
583
  margin:39.7pt 53.85pt 1.0cm 53.85pt;
584
584
  mso-header-margin:35.45pt;
585
585
  mso-footer-margin:14.2pt;
586
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
587
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
588
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
589
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
586
+ mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
587
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
588
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
589
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2l;
590
590
  mso-paper-source:0;}
591
591
  @page WordSection2P
592
592
  {size:595.3pt 841.9pt;
@@ -616,10 +616,10 @@ div.WordSection2
616
616
  margin:39.7pt 53.85pt 1.0cm 53.85pt;
617
617
  mso-header-margin:35.45pt;
618
618
  mso-footer-margin:14.2pt;
619
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
620
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
621
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
622
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
619
+ mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
620
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
621
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
622
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3l;
623
623
  mso-paper-source:0;}
624
624
  @page WordSection3P
625
625
  {size:595.3pt 841.9pt;
data/lib/isodoc/csa/html/header.html CHANGED
@@ -98,21 +98,26 @@ Cloud Security Alliance, LLC.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:
98
98
  </div>
99
99
 
100
100
  <div style='mso-element:header' id=eh2>
101
-
102
101
  <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
103
102
  mso-line-height-rule:exactly'><span lang=EN-GB>Cloud Security Alliance, LLC.&nbsp;{{ docnumber }}</span></p>
103
+ </div>
104
104
 
105
+ <div style='mso-element:header' id=eh2l>
106
+ <p class=MsoHeaderLandscape align=left style='text-align:left;line-height:12.0pt;
107
+ mso-line-height-rule:exactly'><span lang=EN-GB>Cloud Security Alliance, LLC.&nbsp;{{ docnumber }}</span></p>
105
108
  </div>
106
109
 
107
110
  <div style='mso-element:header' id=h2>
108
-
109
111
  <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
110
112
  mso-line-height-rule:exactly'><span lang=EN-GB>Cloud Security Alliance, LLC.&nbsp;{{ docnumber }}</span></p>
113
+ </div>
111
114
 
115
+ <div style='mso-element:header' id=h2l>
116
+ <p class=MsoHeaderLandscape align=right style='text-align:right;line-height:12.0pt;
117
+ mso-line-height-rule:exactly'><span lang=EN-GB>Cloud Security Alliance, LLC.&nbsp;{{ docnumber }}</span></p>
112
118
  </div>
113
119
 
114
120
  <div style='mso-element:footer' id=ef2>
115
-
116
121
  <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
117
122
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
118
123
  style='mso-element:field-begin'></span><span
@@ -125,11 +130,24 @@ style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
125
130
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
126
131
  1'>                                                                                                                                                                           </span>©
127
132
  Cloud Security Alliance, LLC.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
133
+ </div>
128
134
 
135
+ <div style='mso-element:footer' id=ef2l>
136
+ <p class=MsoFooterLandscape style='line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
137
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
138
+ style='mso-element:field-begin'></span><span
139
+ style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
140
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
141
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
142
+ style='mso-no-proof:yes'>ii</span></span><!--[if supportFields]><span
143
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
144
+ style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
145
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
146
+ 1'>                                                                                                                                                                           </span>©
147
+ Cloud Security Alliance, LLC.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
129
148
  </div>
130
149
 
131
150
  <div style='mso-element:footer' id=f2>
132
-
133
151
  <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
134
152
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
135
153
  Cloud Security Alliance, LLC.&nbsp;{{ docyear }}&nbsp;– All
@@ -142,11 +160,24 @@ style='mso-no-proof:yes'>iii</span></span><!--[if supportFields]><span
142
160
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
143
161
  style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
144
162
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
163
+ </div>
145
164
 
165
+ <div style='mso-element:footer' id=f2l>
166
+ <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
167
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
168
+ Cloud Security Alliance, LLC.&nbsp;{{ docyear }}&nbsp;– All
169
+ rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
170
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
171
+ style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
172
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
173
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
174
+ style='mso-no-proof:yes'>iii</span></span><!--[if supportFields]><span
175
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
176
+ style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
177
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
146
178
  </div>
147
179
 
148
180
  <div style='mso-element:footer' id=ef3>
149
-
150
181
  <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
151
182
  exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
152
183
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
@@ -160,11 +191,25 @@ mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b
160
191
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
161
192
  style='mso-tab-count:1'>                                                                                                                                                                           </span>©
162
193
  Cloud Security Alliance, LLC.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
194
+ </div>
163
195
 
196
+ <div style='mso-element:footer' id=ef3l>
197
+ <p class=MsoFooterLandscape style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
198
+ exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
199
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
200
+ style='mso-element:field-begin'></span><span
201
+ style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
202
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
203
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
204
+ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
205
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
206
+ mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
207
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
208
+ style='mso-tab-count:1'>                                                                                                                                                                           </span>©
209
+ Cloud Security Alliance, LLC.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
164
210
  </div>
165
211
 
166
212
  <div style='mso-element:footer' id=f3>
167
-
168
213
  <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
169
214
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
170
215
  Cloud Security Alliance, LLC.&nbsp;{{ docyear }}&nbsp;– All
@@ -178,7 +223,22 @@ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>3</span></span></b><!-
178
223
  style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
179
224
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
180
225
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
226
+ </div>
181
227
 
228
+ <div style='mso-element:footer' id=f3l>
229
+ <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
230
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>©
231
+ Cloud Security Alliance, LLC.&nbsp;{{ docyear }}&nbsp;– All
232
+ rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
233
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
234
+ mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
235
+ PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
236
+ style='mso-element:field-separator'></span></span></b><![endif]--><b
237
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
238
+ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>3</span></span></b><!--[if supportFields]><b
239
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
240
+ mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
241
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
182
242
  </div>
183
243
 
184
244
  </body>
data/lib/isodoc/csa/html/wordstyle.scss CHANGED
@@ -158,6 +158,17 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
158
158
  mso-fareast-font-family:"Times New Roman";
159
159
  mso-ansi-language:EN-US;
160
160
  mso-fareast-language:EN-US;}
161
+ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
162
+ {mso-style-unhide:no;
163
+ margin:0cm;
164
+ margin-bottom:.0001pt;
165
+ mso-pagination:widow-orphan;
166
+ tab-stops:center 367.0pt right 734.0pt;
167
+ font-size:10.5pt;
168
+ font-family:$bodyfont;
169
+ mso-fareast-font-family:"Times New Roman";
170
+ mso-ansi-language:EN-US;
171
+ mso-fareast-language:EN-US;}
161
172
  p.MsoFooter, li.MsoFooter, div.MsoFooter
162
173
  {mso-style-unhide:no;
163
174
  margin:0cm;
@@ -169,6 +180,17 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
169
180
  mso-fareast-font-family:"Times New Roman";
170
181
  mso-ansi-language:EN-US;
171
182
  mso-fareast-language:EN-US;}
183
+ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
184
+ {mso-style-unhide:no;
185
+ margin:0cm;
186
+ margin-bottom:.0001pt;
187
+ mso-pagination:widow-orphan;
188
+ tab-stops:right 734.0pt;
189
+ font-size:10.5pt;
190
+ font-family:$bodyfont;
191
+ mso-fareast-font-family:"Times New Roman";
192
+ mso-ansi-language:EN-US;
193
+ mso-fareast-language:EN-US;}
172
194
  span.MsoCommentReference
173
195
  {mso-style-noshow:yes;
174
196
  mso-style-unhide:no;
data/lib/metanorma/csa/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Metanorma
4
4
  module Csa
5
- VERSION = '1.4.2'
5
+ VERSION = '1.4.3'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-csa
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.2
4
+ version: 1.4.3
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: htmlentities