metanorma-iso 1.1.4 → 1.1.5

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2f22c94d1c862cca77258350af0650f8b736410dc43faa81491fb81e4d5c1181
4
- data.tar.gz: f63dbc9d704fb62c6dce58a35c415342c3b706c5fd808c8523f6092215e90c99
3
+ metadata.gz: ee39375384be0c9f62cc38c73fa594f7801ecd2f8b29e1f59899a72fe5675a6f
4
+ data.tar.gz: 9387fa058b07994b39c75b6f278a2827a883f1734e6e56553fc464a66cebc362
5
5
  SHA512:
6
- metadata.gz: 7829b974b2acc494439813ea14e184f7b1c0bdda2d8f6c2aefb7154963a64d0371fb0cdf93908a50e78bc7cb5fa958226ca6d2fe44da3088fefe6ecd287fc877
7
- data.tar.gz: bb8bab6f488ca2d35314567a483c69f08ec4500c633d2a8b0d32ca2e869a453d8485ac2bd25beeabb7a904547e27a5df0d615995f16f2457d74e20010ca589f5
6
+ metadata.gz: fa215941951f4f41451ea5e59917eab3244c8474b60ba2e075cf04e1a3d3bb2c0a64d2165868aadaf7f754fde1d7944ce9a6b7c492e8de1be0bc69f3c21c0db3
7
+ data.tar.gz: b5730599e19b0e297836a2d248e6ec94cd937f6138b6db2ef91f2b63c88253f35dbee859c4650f273740bf40f93c1030a97ca931cd5535786eb4d72e56158608
@@ -837,26 +837,29 @@
837
837
  <ref name="ContributorInfo"/>
838
838
  </element>
839
839
  </define>
840
+ <define name="DocRelationType">
841
+ <choice>
842
+ <value>obsoletes</value>
843
+ <value>updates</value>
844
+ <value>updatedBy</value>
845
+ <value>complements</value>
846
+ <value>derivedFrom</value>
847
+ <value>translatedFrom</value>
848
+ <value>adoptedFrom</value>
849
+ <value>equivalent</value>
850
+ <value>identical</value>
851
+ <value>nonequivalent</value>
852
+ <value>includedIn</value>
853
+ <value>includes</value>
854
+ <value>instance</value>
855
+ <value>partOf</value>
856
+ <value>hasDraft</value>
857
+ </choice>
858
+ </define>
840
859
  <define name="docrelation">
841
860
  <element name="relation">
842
861
  <attribute name="type">
843
- <choice>
844
- <value>obsoletes</value>
845
- <value>updates</value>
846
- <value>updatedBy</value>
847
- <value>complements</value>
848
- <value>derivedFrom</value>
849
- <value>translatedFrom</value>
850
- <value>adoptedFrom</value>
851
- <value>equivalent</value>
852
- <value>identical</value>
853
- <value>nonequivalent</value>
854
- <value>includedIn</value>
855
- <value>includes</value>
856
- <value>instance</value>
857
- <value>partOf</value>
858
- <value>hasDraft</value>
859
- </choice>
862
+ <ref name="DocRelationType"/>
860
863
  </attribute>
861
864
  <element name="bibitem">
862
865
  <ref name="BibliographicItem"/>
@@ -1,7 +1,8 @@
1
1
  <script>
2
2
  //TOC generation
3
3
  $('#toc').toc({
4
- 'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
4
+ //'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
5
+ 'selectors': toclevel(), //elements to use as headings
5
6
  'container': 'main', //element to find all selectors in
6
7
  'smoothScrolling': true, //enable or disable smooth scrolling on click
7
8
  'prefix': 'toc', //prefix for anchor tags and class names
@@ -220,7 +220,7 @@ h1.Annex
220
220
  mso-ansi-language:EN-GB;
221
221
  mso-fareast-language:JA;
222
222
  mso-bidi-font-weight:normal;}
223
- .h2Annex
223
+ .h2Annex, h2
224
224
  {mso-style-priority:2;
225
225
  mso-style-unhide:no;
226
226
  mso-style-qformat:yes;
@@ -247,32 +247,8 @@ h1.Annex
247
247
  mso-fareast-language:JA;
248
248
  mso-bidi-font-weight:normal;}
249
249
  h2
250
- {mso-style-priority:2;
251
- mso-style-unhide:no;
252
- mso-style-qformat:yes;
253
- mso-style-parent:"Heading 1";
254
- mso-style-link:"Heading 2 Char";
255
- mso-style-next:Normal;
256
- margin-top:3.0pt;
257
- margin-right:0cm;
258
- margin-bottom:12.0pt;
259
- margin-left:0cm;
260
- text-indent:0cm;
261
- line-height:12.5pt;
262
- mso-pagination:widow-orphan;
263
- page-break-after:avoid;
264
- mso-outline-level:2;
265
- mso-list:l1 level2 lfo6;
266
- mso-hyphenate:none;
267
- tab-stops:27.0pt 35.0pt;
268
- font-size:12.0pt;
269
- mso-bidi-font-size:11.0pt;
270
- font-family:$headerfont;
271
- mso-fareast-font-family:$headerfont;
272
- mso-ansi-language:EN-GB;
273
- mso-fareast-language:JA;
274
- mso-bidi-font-weight:normal;}
275
- h3
250
+ { mso-list:l1 level2 lfo6;}
251
+ .h3Annex, h3
276
252
  {mso-style-priority:3;
277
253
  mso-style-unhide:no;
278
254
  mso-style-qformat:yes;
@@ -288,7 +264,6 @@ h3
288
264
  mso-pagination:widow-orphan;
289
265
  page-break-after:avoid;
290
266
  mso-outline-level:3;
291
- mso-list:l1 level3 lfo6;
292
267
  mso-hyphenate:none;
293
268
  tab-stops:list 36.0pt left 44.0pt;
294
269
  font-size:11.0pt;
@@ -297,7 +272,8 @@ h3
297
272
  mso-ansi-language:EN-GB;
298
273
  mso-fareast-language:JA;
299
274
  mso-bidi-font-weight:normal;}
300
- h4
275
+ h3 {mso-list:l1 level3 lfo6;}
276
+ .h4Annex, h4
301
277
  {mso-style-priority:4;
302
278
  mso-style-unhide:no;
303
279
  mso-style-qformat:yes;
@@ -313,7 +289,6 @@ h4
313
289
  mso-pagination:widow-orphan;
314
290
  page-break-after:avoid;
315
291
  mso-outline-level:4;
316
- mso-list:l1 level4 lfo6;
317
292
  mso-hyphenate:none;
318
293
  tab-stops:51.05pt 57.0pt 68.0pt;
319
294
  font-size:11.0pt;
@@ -322,7 +297,8 @@ h4
322
297
  mso-ansi-language:EN-GB;
323
298
  mso-fareast-language:JA;
324
299
  mso-bidi-font-weight:normal;}
325
- h5
300
+ h4 {mso-list:l1 level4 lfo6;}
301
+ .h5Annex, h5
326
302
  {mso-style-priority:5;
327
303
  mso-style-unhide:no;
328
304
  mso-style-qformat:yes;
@@ -338,7 +314,6 @@ h5
338
314
  mso-pagination:widow-orphan;
339
315
  page-break-after:avoid;
340
316
  mso-outline-level:5;
341
- mso-list:l1 level5 lfo6;
342
317
  mso-hyphenate:none;
343
318
  tab-stops:51.05pt list 54.0pt;
344
319
  font-size:11.0pt;
@@ -347,6 +322,7 @@ h5
347
322
  mso-ansi-language:EN-GB;
348
323
  mso-fareast-language:JA;
349
324
  mso-bidi-font-weight:normal;}
325
+ h5 {mso-list:l1 level5 lfo6;}
350
326
  h6
351
327
  {mso-style-priority:6;
352
328
  mso-style-unhide:no;
@@ -363,7 +339,6 @@ h6
363
339
  mso-pagination:widow-orphan;
364
340
  page-break-after:avoid;
365
341
  mso-outline-level:6;
366
- mso-list:l1 level6 lfo6;
367
342
  mso-hyphenate:none;
368
343
  tab-stops:51.05pt list 72.0pt;
369
344
  font-size:11.0pt;
@@ -372,6 +347,7 @@ h6
372
347
  mso-ansi-language:EN-GB;
373
348
  mso-fareast-language:JA;
374
349
  mso-bidi-font-weight:normal;}
350
+ h6 {mso-list:l1 level6 lfo6;}
375
351
  p.MsoToc1, li.MsoToc1, div.MsoToc1
376
352
  {mso-style-priority:39;
377
353
  mso-style-unhide:no;
@@ -227,6 +227,22 @@ module IsoDoc
227
227
  t.parent = d.first
228
228
  end
229
229
  end
230
+
231
+ # force Annex h2 down to be p.h2Annex, so it is not picked up by ToC
232
+ def word_annex_cleanup1(docxml, i)
233
+ docxml.xpath("//h#{i}[ancestor::*[@class = 'Section3']]").each do |h2|
234
+ h2.name = "p"
235
+ h2["class"] = "h#{i}Annex"
236
+ end
237
+ end
238
+
239
+ def word_annex_cleanup(docxml)
240
+ word_annex_cleanup1(docxml, 2)
241
+ word_annex_cleanup1(docxml, 3)
242
+ word_annex_cleanup1(docxml, 4)
243
+ word_annex_cleanup1(docxml, 5)
244
+ word_annex_cleanup1(docxml, 6)
245
+ end
230
246
  end
231
247
  end
232
248
  end
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ISO
3
- VERSION = "1.1.4".freeze
3
+ VERSION = "1.1.5".freeze
4
4
  end
5
5
  end
@@ -1,7 +1,7 @@
1
1
  MIME-Version: 1.0
2
- Content-Type: multipart/related; boundary="----=_NextPart_4a7c58ba.b9e4.4c09"
2
+ Content-Type: multipart/related; boundary="----=_NextPart_13bf1059.8283.40e9"
3
3
 
4
- ------=_NextPart_4a7c58ba.b9e4.4c09
4
+ ------=_NextPart_13bf1059.8283.40e9
5
5
  Content-Location: file:///C:/Doc/iso.htm
6
6
  Content-Type: text/html; charset="utf-8"
7
7
 
@@ -891,11 +891,11 @@ Switzerland<p class="MsoNormal"></p></span></p>
891
891
  <p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes">&#xA0;</span>TOC
892
892
  \o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
893
893
  <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
894
- <a href="#_Toc953690943">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
894
+ <a href="#_Toc499677114">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
895
895
  <span style="mso-tab-count:1 dotted">. </span>
896
896
  </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
897
897
  <span style="mso-element:field-begin"></span></span>
898
- <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc953690943 \h </span>
898
+ <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc499677114 \h </span>
899
899
  <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
900
900
  <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span></span></p>
901
901
 
@@ -932,7 +932,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
932
932
  </html>
933
933
 
934
934
 
935
- ------=_NextPart_4a7c58ba.b9e4.4c09
935
+ ------=_NextPart_13bf1059.8283.40e9
936
936
  Content-Location: file:///C:/Doc/iso_files/filelist.xml
937
937
  Content-Transfer-Encoding: base64
938
938
  Content-Type: application/xml
@@ -942,7 +942,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
942
942
  bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
943
943
  L3htbD4K
944
944
 
945
- ------=_NextPart_4a7c58ba.b9e4.4c09
945
+ ------=_NextPart_13bf1059.8283.40e9
946
946
  Content-Location: file:///C:/Doc/iso_files/header.html
947
947
  Content-Transfer-Encoding: base64
948
948
  Content-Type: text/html charset="utf-8"
@@ -1135,4 +1135,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
1135
1135
  ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
1136
1136
  bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
1137
1137
 
1138
- ------=_NextPart_4a7c58ba.b9e4.4c09--
1138
+ ------=_NextPart_13bf1059.8283.40e9--
@@ -11,13 +11,20 @@
11
11
 
12
12
  <!--TOC script import-->
13
13
  <script type="text/javascript" src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
14
+ <script type="text/javascript">function toclevel() { var i; var text = "";
15
+ for(i = 1; i <= 2; i++) {
16
+ if (i > 1) { text += ","; } text += "h" + i + ":not(.TermNum)"; }
17
+ return text;}
18
+ </script>
14
19
 
15
20
  <!--Google fonts-->
16
- <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet" />
21
+ <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet" />
17
22
  <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet" />
23
+
18
24
  <!--Font awesome import for the link icon-->
19
25
  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous" />
20
26
  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous" />
27
+ <style class="anchorjs"></style>
21
28
  </head>
22
29
  <body lang="EN-US" link="blue" vlink="#954F72" xml:lang="EN-US">
23
30
  <div class="title-section"> <div id="toggle"> <span>&#x2022;</span> </div>
@@ -117,7 +124,8 @@ at the address below or ISO&#x2019;s member body in the country of the requester
117
124
  <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script><script>
118
125
  //TOC generation
119
126
  $('#toc').toc({
120
- 'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
127
+ //'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
128
+ 'selectors': toclevel(), //elements to use as headings
121
129
  'container': 'main', //element to find all selectors in
122
130
  'smoothScrolling': true, //enable or disable smooth scrolling on click
123
131
  'prefix': 'toc', //prefix for anchor tags and class names
@@ -1763,7 +1763,7 @@ end</code></pre>
1763
1763
  <div class="ulist bibliography">
1764
1764
  <ul class="bibliography">
1765
1765
  <li>
1766
- <p><a id="ISO3696"></a>[ISO 3696], <em>Water for analytical laboratory use&#8201;&#8212;&#8201;Specification and test methods</em></p>
1766
+ <p><a id="ISO3696"></a>[ISO 3696] <em>Water for analytical laboratory use&#8201;&#8212;&#8201;Specification and test methods</em></p>
1767
1767
  </li>
1768
1768
  <li>
1769
1769
  <p><a id="ISO5725-1"></a>[ISO 5725-1], <em>Accuracy (trueness and precision) of measurement methods and results&#8201;&#8212;&#8201;Part 1: General principles and definitions</em></p>
@@ -1847,7 +1847,7 @@ end</code></pre>
1847
1847
  </div>
1848
1848
  <div id="footer">
1849
1849
  <div id="footer-text">
1850
- Last updated 2018-11-26 22:27:17 +1100
1850
+ Last updated 2019-03-28 23:58:13 +1100
1851
1851
  </div>
1852
1852
  </div>
1853
1853
  <script type="text/x-mathjax-config">
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.1.4
4
+ version: 1.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-03-23 00:00:00.000000000 Z
11
+ date: 2019-04-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor