metanorma-iso 1.3.15 → 1.3.16

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iso/base.rb +3 -8
  3. data/lib/asciidoctor/iso/boilerplate.xml +7 -5
  4. data/lib/asciidoctor/iso/isostandard.rng +2 -1
  5. data/lib/asciidoctor/iso/section.rb +2 -8
  6. data/lib/isodoc/iso/html/header.html +64 -6
  7. data/lib/isodoc/iso/html/isodoc.scss +2 -2
  8. data/lib/isodoc/iso/html/style-human.scss +0 -4
  9. data/lib/isodoc/iso/html/style-iso.scss +0 -4
  10. data/lib/isodoc/iso/html/wordstyle.scss +48 -8
  11. data/lib/isodoc/iso/word_convert.rb +3 -3
  12. data/lib/metanorma/iso/version.rb +1 -1
  13. data/spec/asciidoctor-iso/base_spec.rb +5 -5
  14. data/spec/isodoc/postproc_spec.rb +23 -12
  15. data/spec/spec_helper.rb +1 -1
  16. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fb314f55f3e73832c6cee29979364f7295a023fee9be6232e2afdad0115e87be
4
- data.tar.gz: 91ca3edc544fa5cd6d600e26228aca82eae0a7bbf0079170480618b00b7f46a1
3
+ metadata.gz: 723cf4b385bb47322ec7cad7e9dcaf79cbc9a317a59866c783f9dd9081300a94
4
+ data.tar.gz: 0cf4149d4c90a3605280e4d5cdb50d20d1d3c17d98d4ba71a565fcfba877d4c7
5
5
  SHA512:
6
- metadata.gz: 1e11fda00b300aca100389d53ae6f6b1558d77df4c5691a0c68770acf81eb9055c29d53b12211c3b038050e05725536541da68669c0664b5648f083017ac3bf5
7
- data.tar.gz: 88d2cafa681d840fc0ffa908331624c7a5645299cccc1df788241ff4e37d5572f29df61ff5c99631e606425bf0893e223c2f297871817d20d191f9b4d8cc9e26
6
+ metadata.gz: 25adc13a5e2bbf24e8ce803a24b1167892b529baaa2b2f223dc7d5c0cc83f32be5ba2d966e8d74b9eaee4691da25ca15cf32ba2e01eaaf1140b04079a1ad6df7
7
+ data.tar.gz: e7d4bc018e56e80592d2d98acbb001f6df8c426aeb90a5fc27057a0a87c43fdc06e37aafa7d837fafc39e96e3a4aef5492e8834c8d2f605e507e32cb5d967885
data/lib/asciidoctor/iso/base.rb CHANGED
@@ -10,6 +10,9 @@ require "fileutils"
10
10
  module Asciidoctor
11
11
  module ISO
12
12
  class Converter < Standoc::Converter
13
+ XML_ROOT_TAG = "iso-standard".freeze
14
+ XML_NAMESPACE = "https://www.metanorma.com/ns/iso".freeze
15
+
13
16
  def html_converter(node)
14
17
  IsoDoc::Iso::HtmlConvert.new(html_extract_attributes(node))
15
18
  end
@@ -37,14 +40,6 @@ module Asciidoctor
37
40
  ret
38
41
  end
39
42
 
40
- def makexml1(node)
41
- result = ["<?xml version='1.0' encoding='UTF-8'?>\n<iso-standard>"]
42
- result << noko { |ixml| front node, ixml }
43
- result << noko { |ixml| middle node, ixml }
44
- result << "</iso-standard>"
45
- textcleanup(result)
46
- end
47
-
48
43
  def load_yaml(lang, script)
49
44
  y = if @i18nyaml then YAML.load_file(@i18nyaml)
50
45
  elsif lang == "en"
data/lib/asciidoctor/iso/boilerplate.xml CHANGED
@@ -2,7 +2,7 @@
2
2
  <copyright-statement>
3
3
  <clause>
4
4
  <p id="boilerplate-year">
5
- &copy; {{ agency }} {{ docyear }}, Published in Switzerland
5
+ &copy; {{ agency }} {{ docyear }}
6
6
  </p>
7
7
 
8
8
  <p id="boilerplate-message">
@@ -14,15 +14,17 @@ without prior written permission. Permission can be requested from either ISO
14
14
  at the address below or ISO's member body in the country of the requester.
15
15
  </p>
16
16
 
17
- <p id="boilerplate-name">ISO copyright office</p>
18
-
19
17
  <p id="boilerplate-address" align="left">
18
+ ISO copyright office<br/>
20
19
  Ch. de Blandonnet 8 &#x2022; CP 401<br/>
21
20
  CH-1214 Vernier, Geneva, Switzerland<br/>
22
21
  Tel.&nbsp;&nbsp;+ 41 22 749 01 11<br/>
23
22
  Fax&nbsp;&nbsp;+ 41 22 749 09 47<br/>
24
- copyright@iso.org<br/>
25
- www.iso.org
23
+ Email: copyright@iso.org<br/>
24
+ Website: www.iso.org
25
+ </p>
26
+ <p id="boilerplate-place">
27
+ Published in Switzerland
26
28
  </p>
27
29
  </clause>
28
30
  </copyright-statement>
data/lib/asciidoctor/iso/isostandard.rng CHANGED
@@ -1,5 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <grammar ns="http://riboseinc.com/isoxml" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
2
+ <grammar ns="https://www.metanorma.com/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
+ <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
3
4
  <include href="isodoc.rng">
4
5
  <start>
5
6
  <ref name="iso-standard"/>
data/lib/asciidoctor/iso/section.rb CHANGED
@@ -12,17 +12,11 @@ module Asciidoctor
12
12
  when "patent notice" then patent_notice_parse(xml, node)
13
13
  when "scope" then scope_parse(a, xml, node)
14
14
  when "normative references" then norm_ref_parse(a, xml, node)
15
- when "terms and definitions",
16
- "terms, definitions, symbols and abbreviated terms",
17
- "terms, definitions, symbols and abbreviations",
18
- "terms, definitions and symbols",
19
- "terms, definitions and abbreviations",
20
- "terms, definitions and abbreviated terms"
15
+ when "terms and definitions"
21
16
  @term_def = true
22
17
  term_def_parse(a, xml, node, true)
23
18
  @term_def = false
24
- when "symbols and abbreviated terms",
25
- "abbreviations", "abbreviated terms", "symbols"
19
+ when "symbols and abbreviated terms"
26
20
  symbols_parse(a, xml, node)
27
21
  when "bibliography" then bibliography_parse(a, xml, node)
28
22
  else
data/lib/isodoc/iso/html/header.html CHANGED
@@ -98,21 +98,26 @@ style='mso-tab-count:1'>                            
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>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</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>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</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>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</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>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</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
  {{ agency }}&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
+ {{ agency }}&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'>© {{ agency }}&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'>© {{ agency }}&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
  {{ agency }}&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
+ {{ agency }}&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'>© {{ agency }}&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'>© {{ agency }}&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
  <div style='mso-element:footer' id=f4>
data/lib/isodoc/iso/html/isodoc.scss CHANGED
@@ -410,7 +410,7 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright
410
410
  border:none;
411
411
  padding:0cm;
412
412
  mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
413
- font-size:11.0pt;
413
+ font-size:10.0pt;
414
414
  font-family:$bodyfont;
415
415
  mso-fareast-font-family:$bodyfont;
416
416
  mso-bidi-font-family:$bodyfont;
@@ -436,7 +436,7 @@ p.zzCopyright1
436
436
  mso-ansi-language:EN-GB;}
437
437
  p.zzAddress {
438
438
  margin:0cm;
439
- margin-bottom:.0001pt;
439
+ margin-bottom:12pt;
440
440
  margin-left:20.15pt;
441
441
  mso-layout-grid-align:none;
442
442
  text-autospace:none;
data/lib/isodoc/iso/html/style-human.scss CHANGED
@@ -213,10 +213,6 @@ span.title {
213
213
  margin-top: 1em;
214
214
  line-height: 1.1em;
215
215
  display: block;
216
- }
217
-
218
- .boilerplate-copyright #boilerplate-message, .boilerplate-copyright #boilerplate-name,
219
- .boilerplate-copyright #boilerplate-address {
220
216
  font-size: 0.9em;
221
217
  }
222
218
 
data/lib/isodoc/iso/html/style-iso.scss CHANGED
@@ -208,10 +208,6 @@ span.partlabel {
208
208
  .boilerplate-copyright p {
209
209
  margin-top: 1em;
210
210
  display: block;
211
- }
212
-
213
- .boilerplate-copyright #boilerplate-message, .boilerplate-copyright #boilerplate-name,
214
- .boilerplate-copyright #boilerplate-address {
215
211
  font-size: 0.9em;
216
212
  }
217
213
 
data/lib/isodoc/iso/html/wordstyle.scss CHANGED
@@ -440,6 +440,27 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
440
440
  mso-ansi-language:EN-GB;
441
441
  font-weight:bold;
442
442
  mso-bidi-font-weight:normal;}
443
+ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
444
+ {mso-style-noshow:yes;
445
+ mso-style-priority:99;
446
+ mso-style-unhide:no;
447
+ mso-style-link:"Header Char";
448
+ margin-top:0cm;
449
+ margin-right:0cm;
450
+ margin-bottom:30.0pt;
451
+ margin-left:0cm;
452
+ text-align:justify;
453
+ line-height:11.0pt;
454
+ mso-line-height-rule:exactly;
455
+ mso-pagination:widow-orphan;
456
+ tab-stops:20.15pt;
457
+ font-size:11.0pt;
458
+ font-family:$headerfont;
459
+ mso-fareast-font-family:$headerfont;
460
+ mso-bidi-font-family:$headerfont;
461
+ mso-ansi-language:EN-GB;
462
+ font-weight:bold;
463
+ mso-bidi-font-weight:normal;}
443
464
  p.MsoFooter, li.MsoFooter, div.MsoFooter
444
465
  {mso-style-noshow:yes;
445
466
  mso-style-priority:99;
@@ -459,6 +480,25 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
459
480
  mso-fareast-font-family:$headerfont;
460
481
  mso-bidi-font-family:$headerfont;
461
482
  mso-ansi-language:EN-GB;}
483
+ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
484
+ {mso-style-noshow:yes;
485
+ mso-style-priority:99;
486
+ mso-style-unhide:no;
487
+ mso-style-link:"Footer Char";
488
+ margin-top:18.0pt;
489
+ margin-right:0cm;
490
+ margin-bottom:6.0pt;
491
+ margin-left:0cm;
492
+ text-align:justify;
493
+ line-height:11.0pt;
494
+ mso-line-height-rule:exactly;
495
+ mso-pagination:widow-orphan;
496
+ tab-stops:right 734.0pt;
497
+ font-size:11.0pt;
498
+ font-family:$headerfont;
499
+ mso-fareast-font-family:$headerfont;
500
+ mso-bidi-font-family:$headerfont;
501
+ mso-ansi-language:EN-GB;}
462
502
  span.MsoFootnoteReference
463
503
  {mso-style-priority:99;
464
504
  vertical-align:super;}
@@ -875,10 +915,10 @@ div.WordSection1
875
915
  margin:39.7pt 53.85pt 1.0cm 53.85pt;
876
916
  mso-header-margin:35.45pt;
877
917
  mso-footer-margin:14.2pt;
878
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
879
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
880
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
881
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
918
+ mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
919
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
920
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
921
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2l;
882
922
  mso-paper-source:0;}
883
923
  @page WordSection2P
884
924
  {size:595.3pt 841.9pt;
@@ -908,10 +948,10 @@ div.WordSection2
908
948
  margin:39.7pt 53.85pt 1.0cm 53.85pt;
909
949
  mso-header-margin:35.45pt;
910
950
  mso-footer-margin:14.2pt;
911
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
912
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
913
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
914
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
951
+ mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
952
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
953
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
954
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3l;
915
955
  mso-paper-source:0;}
916
956
  @page WordSection3P
917
957
  {size:595.3pt 841.9pt;
data/lib/isodoc/iso/word_convert.rb CHANGED
@@ -82,13 +82,13 @@ module IsoDoc
82
82
  end
83
83
 
84
84
  def authority_hdr_cleanup(docxml)
85
- docxml&.xpath("//div[@class = 'license']").each do |d|
85
+ docxml&.xpath("//div[@class = 'boilerplate-license']").each do |d|
86
86
  d.xpath(".//h1").each do |p|
87
87
  p.name = "p"
88
88
  p["class"] = "zzWarningHdr"
89
89
  end
90
90
  end
91
- docxml&.xpath("//div[@class = 'copyright']").each do |d|
91
+ docxml&.xpath("//div[@class = 'boilerplate-copyright']").each do |d|
92
92
  d.xpath(".//h1").each do |p|
93
93
  p.name = "p"
94
94
  p["class"] = "zzCopyrightHdr"
@@ -106,7 +106,7 @@ module IsoDoc
106
106
  auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzCopyright" }
107
107
  auth&.xpath(".//p[@id = 'boilerplate-message']")&.each { |p| p["class"] = "zzCopyright1" }
108
108
  auth&.xpath(".//p[@id = 'boilerplate-address']")&.each { |p| p["class"] = "zzAddress" }
109
- auth&.xpath(".//p[@id = 'boilerplate-name']")&.each { |p| p["class"] = "boilerplate-name" }
109
+ auth&.xpath(".//p[@id = 'boilerplate-place']")&.each { |p| p["class"] = "zzCopyright1" }
110
110
  auth and insert.children = auth
111
111
  end
112
112
 
data/lib/metanorma/iso/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ISO
3
- VERSION = "1.3.15".freeze
3
+ VERSION = "1.3.16".freeze
4
4
  end
5
5
  end
data/spec/asciidoctor-iso/base_spec.rb CHANGED
@@ -89,7 +89,7 @@ RSpec.describe Asciidoctor::ISO do
89
89
  :library-ics: 1,2,3
90
90
  INPUT
91
91
  <?xml version="1.0" encoding="UTF-8"?>
92
- <iso-standard xmlns="http://riboseinc.com/isoxml">
92
+ <iso-standard xmlns="https://www.metanorma.com/ns/iso">
93
93
  <bibdata type="standard">
94
94
  <title language="en" format="text/plain" type="main">Introduction — Main Title — Title — Title Part</title>
95
95
  <title language="en" format="text/plain" type="title-intro">Introduction</title>
@@ -185,7 +185,7 @@ RSpec.describe Asciidoctor::ISO do
185
185
  :copyright-year: 2001
186
186
  INPUT
187
187
  <?xml version="1.0" encoding="UTF-8"?>
188
- <iso-standard xmlns="http://riboseinc.com/isoxml">
188
+ <iso-standard xmlns="https://www.metanorma.com/ns/iso">
189
189
  <bibdata type="standard">
190
190
  <docidentifier type="iso">ISO/IEC/IETF 1000-1-1:2001</docidentifier>
191
191
  <docidentifier type='iso-with-lang'>ISO/IEC/IETF 1000-1-1:2001 (X)</docidentifier>
@@ -293,7 +293,7 @@ RSpec.describe Asciidoctor::ISO do
293
293
  :docstage: 50
294
294
  :language: fr
295
295
  INPUT
296
- <iso-standard xmlns="http://riboseinc.com/isoxml">
296
+ <iso-standard xmlns="https://www.metanorma.com/ns/iso">
297
297
  <bibdata type="standard">
298
298
  <docidentifier type="iso">ISO/FDIS 1000</docidentifier>
299
299
  <docidentifier type='iso-with-lang'>ISO/FDIS 1000 (F)</docidentifier>
@@ -356,7 +356,7 @@ OUTPUT
356
356
  :docnumber: 1000
357
357
  :docstage: 60
358
358
  INPUT
359
- <iso-standard xmlns="http://riboseinc.com/isoxml">
359
+ <iso-standard xmlns="https://www.metanorma.com/ns/iso">
360
360
  <bibdata type="standard">
361
361
  <docidentifier type="iso">ISO 1000</docidentifier>
362
362
  <docidentifier type='iso-with-lang'>ISO 1000 (E)</docidentifier>
@@ -420,7 +420,7 @@ OUTPUT
420
420
  :docstage: 60
421
421
  :docsubstage: 00
422
422
  INPUT
423
- <iso-standard xmlns="http://riboseinc.com/isoxml">
423
+ <iso-standard xmlns="https://www.metanorma.com/ns/iso">
424
424
  <bibdata type="standard">
425
425
  <docidentifier type="iso">ISO/PRF 1000</docidentifier>
426
426
  <docidentifier type='iso-with-lang'>ISO/PRF 1000 (E)</docidentifier>
data/spec/isodoc/postproc_spec.rb CHANGED
@@ -550,7 +550,7 @@ end
550
550
 
551
551
  <p id="boilerplate-message">No soup for you</p>
552
552
 
553
- <p id="boilerplate-name">Dilbert Associates</p>
553
+ <p id="boilerplate-place">Dilbert Associates</p>
554
554
  <p id="boilerplate-address" align="left">Elbonia 5000</p>
555
555
  </clause>
556
556
  </copyright-statement>
@@ -568,17 +568,28 @@ end
568
568
  </iso-standard>
569
569
  INPUT
570
570
  word = File.read("test.doc", encoding: "UTF-8")
571
- expect(xmlpp(word.sub(%r{^.*<p class="zzCopyright">}m, '<p class="zzCopyright">').sub(%r{</p>.*$}m, '</p>'))).to be_equivalent_to xmlpp(<<~"OUTPUT")
572
- <p class="zzCopyright"><a name="boilerplate-year" id="boilerplate-year"></a>Published in Elbonia</p>
573
- OUTPUT
574
- expect(xmlpp(word.sub(%r{^.*<p class="zzCopyright1">}m, '<p class="zzCopyright1">').sub(%r{</p>.*$}m, '</p>'))).to be_equivalent_to xmlpp(<<~"OUTPUT")
575
- <p class="zzCopyright1"><a name="boilerplate-message" id="boilerplate-message"></a>No soup for you</p>
576
- OUTPUT
577
- expect(xmlpp(word.sub(%r{^.*<p align="left" style="text-align:left" class="zzAddress">}m, '<p align="left" style="text-align:left" class="zzAddress">').sub(%r{</p>.*$}m, '</p>'))).to be_equivalent_to xmlpp(<<~"OUTPUT")
578
- <p align="left" style="text-align:left" class="zzAddress"><a name="boilerplate-address" id="boilerplate-address"></a>Elbonia 5000</p>
579
- OUTPUT
580
- expect(xmlpp(word.sub(%r{^.*<p class="boilerplate-name">}m, '<p class="boilerplate-name">').sub(%r{</p>.*$}m, '</p>'))).to be_equivalent_to xmlpp(<<~"OUTPUT")
581
- <p class="boilerplate-name"><a name="boilerplate-name" id="boilerplate-name"></a>Dilbert Associates</p>
571
+ expect(xmlpp(word.sub(%r{^.*<div class="boilerplate-copyright">}m, '<div class="boilerplate-copyright">').sub(%r{</div>.*$}m, '</div></div>'))).to be_equivalent_to xmlpp(<<~"OUTPUT")
572
+ <div class='boilerplate-copyright'>
573
+ <div>
574
+ <p class='zzCopyrightHdr'/>
575
+ <p class='zzCopyright'>
576
+ <a name='boilerplate-year' id='boilerplate-year'/>
577
+ Published in Elbonia
578
+ </p>
579
+ <p class='zzCopyright1'>
580
+ <a name='boilerplate-message' id='boilerplate-message'/>
581
+ No soup for you
582
+ </p>
583
+ <p class='zzCopyright1'>
584
+ <a name='boilerplate-place' id='boilerplate-place'/>
585
+ Dilbert Associates
586
+ </p>
587
+ <p align='left' style='text-align:left' class='zzAddress'>
588
+ <a name='boilerplate-address' id='boilerplate-address'/>
589
+ Elbonia 5000
590
+ </p>
591
+ </div>
592
+ </div>
582
593
  OUTPUT
583
594
  expect(word).to include '<p class="zzWarning">I am the Walrus</p>'
584
595
  end
data/spec/spec_helper.rb CHANGED
@@ -106,7 +106,7 @@ BOILERPLATE =
106
106
 
107
107
  BLANK_HDR = <<~"HDR"
108
108
  <?xml version="1.0" encoding="UTF-8"?>
109
- <iso-standard xmlns="http://riboseinc.com/isoxml">
109
+ <iso-standard xmlns="https://www.metanorma.com/ns/iso">
110
110
  <bibdata type="standard">
111
111
  <contributor>
112
112
  <role type="author"/>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iso
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.15
4
+ version: 1.3.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
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: ruby-jing