metanorma-mpfd 0.3.10 → 0.3.11

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 (11) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/mpfd.rb +0 -1
  3. data/lib/asciidoctor/mpfd/converter.rb +3 -9
  4. data/lib/asciidoctor/mpfd/mpfd.rng +1 -1
  5. data/lib/asciidoctor/mpfd/section.rb +10 -9
  6. data/lib/isodoc/mpfd/base_convert.rb +1 -1
  7. data/lib/isodoc/mpfd/html/header.html +64 -6
  8. data/lib/isodoc/mpfd/html/rsd.scss +8 -8
  9. data/lib/isodoc/mpfd/html/wordstyle.scss +22 -0
  10. data/lib/metanorma/mpfd/version.rb +1 -1
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8b0eca8b2d17967c7f3d6da4333880af46405921d7faef4548242ffcc6ae0349
4
- data.tar.gz: 89c48d0645cb94780e5671bfe01e10e3af7270c3139fd67484ef2e2ec51547fb
3
+ metadata.gz: 4b3db8aa497e6fac24229ffb6b252499e7be2055d84b4df3cb3860497baa6fb6
4
+ data.tar.gz: a4fdc8195fdfa3d148515b274d4feca2a44c8d8d13900ae69d53c3fa96eecece
5
5
  SHA512:
6
- metadata.gz: 17308cc3ddb0ced2e16db36e7be0cb289c4fde2568e6d466cf5694f06924baeeb44310246ac5563ebd6e2e7b7059967551502455f08816334c4ac7bdae19dea4
7
- data.tar.gz: 9910f81aebbca356fd7677e7d5ca93358ac94ac3330152b356e4dc9b20dc8cb05140f58e71abcc03028441010b6c57bd86e3e6c2a5a60deb63be84c50af79d89
6
+ metadata.gz: 16a1c149d4cacf47c2f7a01e8384a58b4f8ed2fe2301ffa2cdcc806c415ca61e5537983ca1bebb5796072d3e872bb9f459365e32b909b9dbfb263ef1bcbac349
7
+ data.tar.gz: ec5bc05411887ee6811268045e4971005c18a77f7ae0020a2a47ceca535ce2ae64c7b64fa9db5aa401abdd7e3fa4e715cf03449378c6494faaaaca1cc6fb9329
data/lib/asciidoctor/mpfd.rb CHANGED
@@ -1,7 +1,6 @@
1
1
  module Asciidoctor
2
2
  module Mpfd
3
3
 
4
- MPFD_NAMESPACE = "https://open.ribose.com/standards/mpfd"
5
4
 
6
5
  end
7
6
  end
data/lib/asciidoctor/mpfd/converter.rb CHANGED
@@ -14,6 +14,8 @@ module Asciidoctor
14
14
  # schema encapsulation of the document for validation
15
15
  #
16
16
  class Converter < Standoc::Converter
17
+ XML_ROOT_TAG = "mpfd-standard".freeze
18
+ XML_NAMESPACE = "https://www.metanorma.com/ns/mpfd".freeze
17
19
 
18
20
  register_for "mpfd"
19
21
 
@@ -74,16 +76,8 @@ module Asciidoctor
74
76
  end
75
77
 
76
78
  def makexml(node)
77
- result = ["<?xml version='1.0' encoding='UTF-8'?>\n<mpfd-standard>"]
78
79
  @draft = node.attributes.has_key?("draft")
79
- result << noko { |ixml| front node, ixml }
80
- result << noko { |ixml| middle node, ixml }
81
- result << "</mpfd-standard>"
82
- result = textcleanup(result)
83
- ret1 = cleanup(Nokogiri::XML(result))
84
- validate(ret1) unless @novalid
85
- ret1.root.add_namespace(nil, MPFD_NAMESPACE)
86
- ret1
80
+ super
87
81
  end
88
82
 
89
83
  def doctype(node)
data/lib/asciidoctor/mpfd/mpfd.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/mpfd" 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/asciidoctor/mpfd/section.rb CHANGED
@@ -23,23 +23,24 @@ module Asciidoctor
23
23
  end
24
24
  end
25
25
 
26
+ def sectiontype_streamline(ret)
27
+ case ret
28
+ when "glossary" then "terms and definitions"
29
+ else
30
+ super
31
+ end
32
+ end
33
+
26
34
  def section(node)
27
35
  a = section_attributes(node)
28
36
  noko do |xml|
29
37
  case sectiontype(node)
30
38
  when "introduction" then introduction_parse(a, xml, node)
31
- when "terms and definitions",
32
- "terms, definitions, symbols and abbreviated terms",
33
- "terms, definitions, symbols and abbreviations",
34
- "terms, definitions and symbols",
35
- "terms, definitions and abbreviations",
36
- "terms, definitions and abbreviated terms",
37
- "glossary"
39
+ when "terms and definitions"
38
40
  @term_def = true
39
41
  term_def_parse(a, xml, node, true)
40
42
  @term_def = false
41
- when "symbols and abbreviated terms",
42
- "symbols", "abbreviated terms", "abbrevations"
43
+ when "symbols and abbreviated terms"
43
44
  symbols_parse(a, xml, node)
44
45
  when "bibliography" then bibliography_parse(a, xml, node)
45
46
  else
data/lib/isodoc/mpfd/base_convert.rb CHANGED
@@ -204,7 +204,7 @@ module IsoDoc
204
204
  inline_header_title(out, node, c1)
205
205
  else
206
206
  attrs = { class: node["container"] ? "containerhdr" : nil }
207
- div.send "h#{anchor(node['id'], :level) || '1'}", **attr_code(attrs) do |h|
207
+ div.send "h#{anchor(node['id'], :level, :false) || '1'}", **attr_code(attrs) do |h|
208
208
  lbl = anchor(node['id'], :label, false)
209
209
  h << "#{lbl}. " if lbl && !@suppressheadingnumbers
210
210
  c1&.children&.each { |c2| parse(c2, h) }
data/lib/isodoc/mpfd/html/header.html CHANGED
@@ -98,21 +98,26 @@ Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></sp
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>Ribose Group Inc.&nbsp;{{ docnumber }}:{{ docyear }}</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>Ribose Group Inc.&nbsp;{{ docnumber }}:{{ docyear }}</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>Ribose Group Inc.&nbsp;{{ docnumber }}:{{ docyear }}</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>Ribose Group Inc.&nbsp;{{ docnumber }}:{{ docyear }}</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
  Ribose Group Inc.&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
+ Ribose Group Inc.&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'>© Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All
135
153
  rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
@@ -141,11 +159,23 @@ style='mso-no-proof:yes'>iii</span></span><!--[if supportFields]><span
141
159
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
142
160
  style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
143
161
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
162
+ </div>
144
163
 
164
+ <div style='mso-element:footer' id=f2l>
165
+ <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
166
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All
167
+ rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
168
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
169
+ style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
170
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
171
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
172
+ style='mso-no-proof:yes'>iii</span></span><!--[if supportFields]><span
173
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
174
+ style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
175
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
145
176
  </div>
146
177
 
147
178
  <div style='mso-element:footer' id=ef3>
148
-
149
179
  <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
150
180
  exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
151
181
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
@@ -159,11 +189,25 @@ mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b
159
189
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
160
190
  style='mso-tab-count:1'>                                                                                                                                                                           </span>©
161
191
  Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
192
+ </div>
162
193
 
194
+ <div style='mso-element:footer' id=ef3l>
195
+ <p class=MsoFooterLandscape style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
196
+ exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
197
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
198
+ style='mso-element:field-begin'></span><span
199
+ style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
200
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
201
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
202
+ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><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-element:field-end'></span></span></b><![endif]--><span
205
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
206
+ style='mso-tab-count:1'>                                                                                                                                                                           </span>©
207
+ Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
163
208
  </div>
164
209
 
165
210
  <div style='mso-element:footer' id=f3>
166
-
167
211
  <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
168
212
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All
169
213
  rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
@@ -176,7 +220,21 @@ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>3</span></span></b><!-
176
220
  style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
177
221
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
178
222
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
223
+ </div>
179
224
 
225
+ <div style='mso-element:footer' id=f3l>
226
+ <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
227
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose Group Inc.&nbsp;{{ docyear }}&nbsp;– All
228
+ rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
229
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
230
+ mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
231
+ PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
232
+ style='mso-element:field-separator'></span></span></b><![endif]--><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-no-proof:yes'>3</span></span></b><!--[if supportFields]><b
235
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
236
+ mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
237
+ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
180
238
  </div>
181
239
 
182
240
  </body>
data/lib/isodoc/mpfd/html/rsd.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/mpfd/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/mpfd/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Mpfd
3
- VERSION = "0.3.10"
3
+ VERSION = "0.3.11"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-mpfd
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.10
4
+ version: 0.3.11
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