metanorma-iso 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f22c94d1c862cca77258350af0650f8b736410dc43faa81491fb81e4d5c1181
-  data.tar.gz: f63dbc9d704fb62c6dce58a35c415342c3b706c5fd808c8523f6092215e90c99
+  metadata.gz: ee39375384be0c9f62cc38c73fa594f7801ecd2f8b29e1f59899a72fe5675a6f
+  data.tar.gz: 9387fa058b07994b39c75b6f278a2827a883f1734e6e56553fc464a66cebc362
 SHA512:
-  metadata.gz: 7829b974b2acc494439813ea14e184f7b1c0bdda2d8f6c2aefb7154963a64d0371fb0cdf93908a50e78bc7cb5fa958226ca6d2fe44da3088fefe6ecd287fc877
-  data.tar.gz: bb8bab6f488ca2d35314567a483c69f08ec4500c633d2a8b0d32ca2e869a453d8485ac2bd25beeabb7a904547e27a5df0d615995f16f2457d74e20010ca589f5
+  metadata.gz: fa215941951f4f41451ea5e59917eab3244c8474b60ba2e075cf04e1a3d3bb2c0a64d2165868aadaf7f754fde1d7944ce9a6b7c492e8de1be0bc69f3c21c0db3
+  data.tar.gz: b5730599e19b0e297836a2d248e6ec94cd937f6138b6db2ef91f2b63c88253f35dbee859c4650f273740bf40f93c1030a97ca931cd5535786eb4d72e56158608

data/lib/asciidoctor/iso/biblio.rng

@@ -837,26 +837,29 @@
       <ref name="ContributorInfo"/>
     </element>
   </define>
+  <define name="DocRelationType">
+    <choice>
+      <value>obsoletes</value>
+      <value>updates</value>
+      <value>updatedBy</value>
+      <value>complements</value>
+      <value>derivedFrom</value>
+      <value>translatedFrom</value>
+      <value>adoptedFrom</value>
+      <value>equivalent</value>
+      <value>identical</value>
+      <value>nonequivalent</value>
+      <value>includedIn</value>
+      <value>includes</value>
+      <value>instance</value>
+      <value>partOf</value>
+      <value>hasDraft</value>
+    </choice>
+  </define>
   <define name="docrelation">
     <element name="relation">
       <attribute name="type">
-        <choice>
-          <value>obsoletes</value>
-          <value>updates</value>
-          <value>updatedBy</value>
-          <value>complements</value>
-          <value>derivedFrom</value>
-          <value>translatedFrom</value>
-          <value>adoptedFrom</value>
-          <value>equivalent</value>
-          <value>identical</value>
-          <value>nonequivalent</value>
-          <value>includedIn</value>
-          <value>includes</value>
-          <value>instance</value>
-          <value>partOf</value>
-          <value>hasDraft</value>
-        </choice>
+        <ref name="DocRelationType"/>
       </attribute>
       <element name="bibitem">
         <ref name="BibliographicItem"/>

data/lib/isodoc/iso/html/scripts.html

@@ -1,7 +1,8 @@
 <script>
     //TOC generation
       $('#toc').toc({
-          'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
+          //'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
+          'selectors': toclevel(),  //elements to use as headings
           'container': 'main', //element to find all selectors in
           'smoothScrolling': true, //enable or disable smooth scrolling on click
           'prefix': 'toc', //prefix for anchor tags and class names

data/lib/isodoc/iso/html/wordstyle.scss

@@ -220,7 +220,7 @@ h1.Annex
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-.h2Annex
+.h2Annex, h2
         {mso-style-priority:2;
         mso-style-unhide:no;
         mso-style-qformat:yes;
@@ -247,32 +247,8 @@ h1.Annex
         mso-fareast-language:JA;
         mso-bidi-font-weight:normal;}
 h2
-	{mso-style-priority:2;
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	mso-style-parent:"Heading 1";
-	mso-style-link:"Heading 2 Char";
-	mso-style-next:Normal;
-	margin-top:3.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	margin-left:0cm;
-	text-indent:0cm;
-	line-height:12.5pt;
-	mso-pagination:widow-orphan;
-	page-break-after:avoid;
-	mso-outline-level:2;
-	mso-list:l1 level2 lfo6;
-	mso-hyphenate:none;
-	tab-stops:27.0pt 35.0pt;
-	font-size:12.0pt;
-	mso-bidi-font-size:11.0pt;
-	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
-	mso-ansi-language:EN-GB;
-	mso-fareast-language:JA;
-	mso-bidi-font-weight:normal;}
-h3
+	{ mso-list:l1 level2 lfo6;}
+.h3Annex, h3
 	{mso-style-priority:3;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -288,7 +264,6 @@ h3
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
 	mso-outline-level:3;
-	mso-list:l1 level3 lfo6;
 	mso-hyphenate:none;
 	tab-stops:list 36.0pt left 44.0pt;
 	font-size:11.0pt;
@@ -297,7 +272,8 @@ h3
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h4
+h3      {mso-list:l1 level3 lfo6;}
+.h4Annex, h4
 	{mso-style-priority:4;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -313,7 +289,6 @@ h4
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
 	mso-outline-level:4;
-	mso-list:l1 level4 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt 57.0pt 68.0pt;
 	font-size:11.0pt;
@@ -322,7 +297,8 @@ h4
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h5
+h4      {mso-list:l1 level4 lfo6;}
+.h5Annex, h5
 	{mso-style-priority:5;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -338,7 +314,6 @@ h5
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
 	mso-outline-level:5;
-	mso-list:l1 level5 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt list 54.0pt;
 	font-size:11.0pt;
@@ -347,6 +322,7 @@ h5
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+h5      {mso-list:l1 level5 lfo6;}
 h6
 	{mso-style-priority:6;
 	mso-style-unhide:no;
@@ -363,7 +339,6 @@ h6
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
 	mso-outline-level:6;
-	mso-list:l1 level6 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt list 72.0pt;
 	font-size:11.0pt;
@@ -372,6 +347,7 @@ h6
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+h6      {mso-list:l1 level6 lfo6;}
 p.MsoToc1, li.MsoToc1, div.MsoToc1
 	{mso-style-priority:39;
 	mso-style-unhide:no;

data/lib/isodoc/iso/word_convert.rb

@@ -227,6 +227,22 @@ module IsoDoc
           t.parent = d.first
         end
       end
+
+      # force Annex h2 down to be p.h2Annex, so it is not picked up by ToC
+      def word_annex_cleanup1(docxml, i)
+        docxml.xpath("//h#{i}[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = "h#{i}Annex"
+        end
+      end
+
+      def word_annex_cleanup(docxml)
+        word_annex_cleanup1(docxml, 2)
+        word_annex_cleanup1(docxml, 3)
+        word_annex_cleanup1(docxml, 4)
+        word_annex_cleanup1(docxml, 5)
+        word_annex_cleanup1(docxml, 6)
+      end
     end
   end
 end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.1.4".freeze
+    VERSION = "1.1.5".freeze
   end
 end

data/spec/assets/iso.doc

@@ -1,7 +1,7 @@
 MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----=_NextPart_4a7c58ba.b9e4.4c09"
+Content-Type: multipart/related; boundary="----=_NextPart_13bf1059.8283.40e9"
 
-------=_NextPart_4a7c58ba.b9e4.4c09
+------=_NextPart_13bf1059.8283.40e9
 Content-Location: file:///C:/Doc/iso.htm
 Content-Type: text/html; charset="utf-8"
 
@@ -891,11 +891,11 @@ Switzerland<p class="MsoNormal"></p></span></p>
 <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
   \o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
 <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-<a href="#_Toc953690943">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<a href="#_Toc499677114">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
 <span style="mso-tab-count:1 dotted">. </span>
 </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
 <span style="mso-element:field-begin"></span></span>
-<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc953690943 \h </span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc499677114 \h </span>
   <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>
   <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>
 
@@ -932,7 +932,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
 </html>
 
 
-------=_NextPart_4a7c58ba.b9e4.4c09
+------=_NextPart_13bf1059.8283.40e9
 Content-Location: file:///C:/Doc/iso_files/filelist.xml
 Content-Transfer-Encoding: base64
 Content-Type: application/xml
@@ -942,7 +942,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
 bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
 L3htbD4K
 
-------=_NextPart_4a7c58ba.b9e4.4c09
+------=_NextPart_13bf1059.8283.40e9
 Content-Location: file:///C:/Doc/iso_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
@@ -1135,4 +1135,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
 ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
 bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
 
-------=_NextPart_4a7c58ba.b9e4.4c09--
+------=_NextPart_13bf1059.8283.40e9--

data/spec/assets/iso.html

@@ -11,13 +11,20 @@
 
 <!--TOC script import-->
 <script type="text/javascript" src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
+<script type="text/javascript">function toclevel() { var i; var text = "";
+  for(i = 1; i <= 2; i++) {
+    if (i > 1) { text += ","; } text += "h" + i + ":not(.TermNum)"; } 
+  return text;}
+</script>
 
 <!--Google fonts-->
-<link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet" />
+  <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet" />
 <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet" />
+
 <!--Font awesome import for the link icon-->
 <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous" />
+<style class="anchorjs"></style>
 </head>
   <body lang="EN-US" link="blue" vlink="#954F72" xml:lang="EN-US">
     <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
 <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script><script>
     //TOC generation
       $('#toc').toc({
-          'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
+          //'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
+          'selectors': toclevel(),  //elements to use as headings
           'container': 'main', //element to find all selectors in
           'smoothScrolling': true, //enable or disable smooth scrolling on click
           'prefix': 'toc', //prefix for anchor tags and class names

data/spec/examples/rice.preview.html

@@ -1763,7 +1763,7 @@ end</code></pre>
 <div class="ulist bibliography">
 <ul class="bibliography">
 <li>
-<p><a id="ISO3696"></a>[ISO 3696], <em>Water for analytical laboratory use&#8201;&#8212;&#8201;Specification and test methods</em></p>
+<p><a id="ISO3696"></a>[ISO 3696] <em>Water for analytical laboratory use&#8201;&#8212;&#8201;Specification and test methods</em></p>
 </li>
 <li>
 <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>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2018-11-26 22:27:17 +1100
+Last updated 2019-03-28 23:58:13 +1100
 </div>
 </div>
 <script type="text/x-mathjax-config">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor