metanorma-ogc 0.2.12 → 0.2.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/ogc/converter.rb +3 -10
  3. data/lib/asciidoctor/ogc/ogc.rng +1 -1
  4. data/lib/isodoc/ogc/html/header.html +62 -6
  5. data/lib/isodoc/ogc/html/ogc.scss +8 -8
  6. data/lib/isodoc/ogc/html/wordstyle.scss +22 -0
  7. data/lib/isodoc/ogc/html_convert.rb +1 -3
  8. data/lib/isodoc/ogc/pdf_convert.rb +1 -1
  9. data/lib/isodoc/ogc/word_convert.rb +1 -1
  10. data/lib/metanorma/ogc/version.rb +1 -1
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 64f06cd6b1a5d9668cb6171abd16c8d54f633d7a3a5ef32bbe18b3c74c09b59e
4
- data.tar.gz: 8dc5bf499165776f248ef7f2f9978516e481fd8b5c42959df172bed69c24e19b
3
+ metadata.gz: 17ce7e690ffd76f81ea26aee4aaedc8bf3faee2298826ef97f2fe9b5913d665f
4
+ data.tar.gz: 4199d2353e2e70d3de8073e965478b637340d9efa2b52ed8f52282aaaa0223b5
5
5
  SHA512:
6
- metadata.gz: 3016c17a64211f86c1da2aca59f4442631c8ee2058d7cdca59e681968cb6db1474d1835b42ed47b4218b7c487e0f007f7d674173e78f1cf7fa7dde71ec1132c3
7
- data.tar.gz: ed010e5bf2b6985054a5386a5a4135c27dd4be197527bc3c02d6753c8f081b7fe37e086ae43923ba78113ff541ad5de85a3ffe11676855bd4d6ccc8c6494380b
6
+ metadata.gz: b140b78f48e0ed7eebb150af132436f54e2dfca24faa1e1a17328d14feabd584a7acdb1e2fad7c99df2a8150c47a6aa2174766694feba0d80d5d563436d285cb
7
+ data.tar.gz: f0353e26f89865c6ff9cfb425c2db93d983f40af28b630a65cea3bfdf7e56b07012abb1e79826beb92722ae3efaa368c9f4022e49218d9d62f876010b044a115
data/lib/asciidoctor/ogc/converter.rb CHANGED
@@ -6,11 +6,12 @@ require_relative "validate"
6
6
 
7
7
  module Asciidoctor
8
8
  module Ogc
9
-
10
9
  # A {Converter} implementation that generates RSD output, and a document
11
10
  # schema encapsulation of the document for validation
12
11
  #
13
12
  class Converter < Standoc::Converter
13
+ XML_ROOT_TAG = "ogc-standard".freeze
14
+ XML_NAMESPACE = "https://www.metanorma.com/ns/ogc".freeze
14
15
 
15
16
  register_for "ogc"
16
17
 
@@ -19,16 +20,8 @@ module Asciidoctor
19
20
  end
20
21
 
21
22
  def makexml(node)
22
- result = ["<?xml version='1.0' encoding='UTF-8'?>\n<ogc-standard>"]
23
23
  @draft = node.attributes.has_key?("draft")
24
- result << noko { |ixml| front node, ixml }
25
- result << noko { |ixml| middle node, ixml }
26
- result << "</ogc-standard>"
27
- result = textcleanup(result)
28
- ret1 = cleanup(Nokogiri::XML(result))
29
- validate(ret1) unless @novalid
30
- ret1.root.add_namespace(nil, Metanorma::Ogc::DOCUMENT_NAMESPACE)
31
- ret1
24
+ super
32
25
  end
33
26
 
34
27
  def doctype(node)
data/lib/asciidoctor/ogc/ogc.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">
2
+ <grammar ns="https://www.metanorma.com/ns/ogc" xmlns="http://relaxng.org/ns/structure/1.0">
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/ogc/html/header.html CHANGED
@@ -97,21 +97,26 @@ style='mso-tab-count:1'>                            
97
97
  </div>
98
98
 
99
99
  <div style='mso-element:header' id=eh2>
100
-
101
100
  <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
102
101
  mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
102
+ </div>
103
103
 
104
+ <div style='mso-element:header' id=eh2l>
105
+ <p class=MsoHeaderLandscape align=left style='text-align:left;line-height:12.0pt;
106
+ mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
104
107
  </div>
105
108
 
106
109
  <div style='mso-element:header' id=h2>
107
-
108
110
  <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
109
111
  mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
112
+ </div>
110
113
 
114
+ <div style='mso-element:header' id=h2l>
115
+ <p class=MsoHeaderLandscape align=right style='text-align:right;line-height:12.0pt;
116
+ mso-line-height-rule:exactly'><span lang=EN-GB>Open Geospatial Consortium&nbsp;{{ docnumber }}:{{ docyear }}</span></p>
111
117
  </div>
112
118
 
113
119
  <div style='mso-element:footer' id=ef2>
114
-
115
120
  <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
116
121
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
117
122
  style='mso-element:field-begin'></span><span
@@ -123,11 +128,23 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
123
128
  style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
124
129
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
125
130
  style='mso-tab-count:1'>                                                                                                                                                                           </span>© {{ docyear }} OGC<o:p></o:p></span></p>
131
+ </div>
126
132
 
133
+ <div style='mso-element:footer' id=ef2l>
134
+ <p class=MsoFooterLandscape style='line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
135
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
136
+ style='mso-element:field-begin'></span><span
137
+ style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
138
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
139
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
140
+ style='mso-no-proof:yes'>ii</span></span><!--[if supportFields]><span
141
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
142
+ style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
143
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
144
+ style='mso-tab-count:1'>                                                                                                                                                                           </span>© {{ docyear }} OGC<o:p></o:p></span></p>
127
145
  </div>
128
146
 
129
147
  <div style='mso-element:footer' id=f2>
130
-
131
148
  <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
132
149
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Open Geospatial Consortium&nbsp;{{ docyear }}&nbsp;– All
133
150
  rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
@@ -139,11 +156,23 @@ style='mso-no-proof:yes'>iii</span></span><!--[if supportFields]><span
139
156
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
140
157
  style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
141
158
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
159
+ </div>
142
160
 
161
+ <div style='mso-element:footer' id=f2l>
162
+ <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
163
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Open Geospatial Consortium&nbsp;{{ docyear }}&nbsp;– All
164
+ rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
165
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
166
+ style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
167
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
168
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
169
+ style='mso-no-proof:yes'>iii</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-end'></span></span><![endif]--><span lang=EN-GB
172
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
143
173
  </div>
144
174
 
145
175
  <div style='mso-element:footer' id=ef3>
146
-
147
176
  <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
148
177
  exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
149
178
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
@@ -156,11 +185,24 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
156
185
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
157
186
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
158
187
  style='mso-tab-count:1'>                                                                                                                                                                           </span>© {{ docyear }} OGC<o:p></o:p></span></p>
188
+ </div>
159
189
 
190
+ <div style='mso-element:footer' id=ef3l>
191
+ <p class=MsoFooterLandscape style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
192
+ exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
193
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
194
+ style='mso-element:field-begin'></span><span
195
+ style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
196
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
197
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
198
+ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
199
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
200
+ mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
201
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
202
+ style='mso-tab-count:1'>                                                                                                                                                                           </span>© {{ docyear }} OGC<o:p></o:p></span></p>
160
203
  </div>
161
204
 
162
205
  <div style='mso-element:footer' id=f3>
163
-
164
206
  <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
165
207
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Open Geospatial Consortium&nbsp;{{ docyear }}&nbsp;– All
166
208
  rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
@@ -173,7 +215,21 @@ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>3</span></span></b><!-
173
215
  style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
174
216
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
175
217
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
218
+ </div>
176
219
 
220
+ <div style='mso-element:footer' id=f3l>
221
+ <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
222
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Open Geospatial Consortium&nbsp;{{ docyear }}&nbsp;– All
223
+ rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
224
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
225
+ mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
226
+ PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
227
+ style='mso-element:field-separator'></span></span></b><![endif]--><b
228
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
229
+ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>3</span></span></b><!--[if supportFields]><b
230
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
231
+ mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
232
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
177
233
  </div>
178
234
 
179
235
  </body>
data/lib/isodoc/ogc/html/ogc.scss CHANGED
@@ -606,10 +606,10 @@ div.WordSection1
606
606
  margin:39.7pt 53.85pt 1.0cm 53.85pt;
607
607
  mso-header-margin:35.45pt;
608
608
  mso-footer-margin:14.2pt;
609
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
610
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
611
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
612
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
609
+ mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
610
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
611
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
612
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2l;
613
613
  mso-paper-source:0;}
614
614
  @page WordSection2P
615
615
  {size:595.3pt 841.9pt;
@@ -639,10 +639,10 @@ div.WordSection2
639
639
  margin:39.7pt 53.85pt 1.0cm 53.85pt;
640
640
  mso-header-margin:35.45pt;
641
641
  mso-footer-margin:14.2pt;
642
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
643
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
644
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
645
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
642
+ mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
643
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
644
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
645
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3l;
646
646
  mso-paper-source:0;}
647
647
  @page WordSection3P
648
648
  {size:595.3pt 841.9pt;
data/lib/isodoc/ogc/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/isodoc/ogc/html_convert.rb CHANGED
@@ -13,8 +13,6 @@ module IsoDoc
13
13
  def initialize(options)
14
14
  @libdir = File.dirname(__FILE__)
15
15
  super
16
- #FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
17
- #@files_to_delete << "logo.jpg"
18
16
  end
19
17
 
20
18
  def default_fonts(options)
@@ -81,7 +79,7 @@ module IsoDoc
81
79
  end
82
80
 
83
81
  def authority_cleanup(docxml)
84
- authority_cleanup1(docxml, "boilerplate-contact")
82
+ authority_cleanup1(docxml, "contact")
85
83
  super
86
84
  end
87
85
 
data/lib/isodoc/ogc/pdf_convert.rb CHANGED
@@ -83,7 +83,7 @@ module IsoDoc
83
83
  end
84
84
 
85
85
  def authority_cleanup(docxml)
86
- authority_cleanup1(docxml, "boilerplate-contact")
86
+ authority_cleanup1(docxml, "contact")
87
87
  super
88
88
  end
89
89
 
data/lib/isodoc/ogc/word_convert.rb CHANGED
@@ -147,7 +147,7 @@ module IsoDoc
147
147
  end
148
148
 
149
149
  def word_license_cleanup(docxml)
150
- docxml.xpath("//div[@class = 'license']//p[not(@class)]").each do |p|
150
+ docxml.xpath("//div[@class = 'boilerplate-license']//p[not(@class)]").each do |p|
151
151
  p["class"] = "license"
152
152
  end
153
153
  end
data/lib/metanorma/ogc/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ogc
3
- VERSION = "0.2.12"
3
+ VERSION = "0.2.13"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ogc
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.12
4
+ version: 0.2.13
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