metanorma-iso 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b2fd50423287814aff0d576d39555ea55d61e81aae37b935f93b7b524d49f41
-  data.tar.gz: cc19dd56225507e4327df1dfd6adfb0b1976269207751b18aca8c4d87704a1e7
+  metadata.gz: 179190ccdc49a7ddf4f806925dcf997b6285d13d4309ead22f55f8aeaf231889
+  data.tar.gz: afc5ed2bd10715e2a812aa5407deb4c37b77f2a5f665565c074c7cab46f76b80
 SHA512:
-  metadata.gz: d754116f5aa51090288365d923f0c157ff68aab9453758e76f0566f18fb5f9a778e92687284920d528e1cca7081bb132a1d16d3acf8aa344c0c561706efeebdc
-  data.tar.gz: 906ab5fd28c1a66af873e89cdac4486335681400a405335f110380a9840b0a3f5304b52f2204f17c12833b46df9554667c24067a00dbf03664719372d1faf8c7
+  metadata.gz: 5489d3e8cf75741c9f55318594a33e951de37a147c734a3cd4c5ce3d9360ab1427acae5cf0eb1d825f515d5c60d9ed199aeae804d56be671a444ebba36036558
+  data.tar.gz: aa09a4f8e3927f98c84739d9b4df370d447b168cb298ddf17af3449cc2be653befe2242fc93e456c08cd663df1cd97cb328847dc080d085563e9001a400c2924

data/docs/adopting-spec.adoc

@@ -1,6 +1,6 @@
 = How can I adopt the StanDoc specification for my own publications?
 
-TIP: Copy the RSD schema from https://github.com/riboseinc/metanorma-iso/blob/master/grammars/rsd.rng. You may need to adapt some of the enums in the model, or in the ISO Standards model that it inherits; but in the first instance, you can just ignore the differences—and ignore the validation feedback that the toolset gives.
+TIP: Copy the RSD schema from https://github.com/riboseinc/metanorma-model-iso/blob/master/grammars/rsd.rng. You may need to adapt some of the enums in the model, or in the ISO Standards model that it inherits; but in the first instance, you can just ignore the differences—and ignore the validation feedback that the toolset gives.
 
 The Standoc specification is expressed in http://www.relaxng.org[RelaxNG schema for XML], and is intended to be customisable for different types of publication. The customisation of Standoc relies on inheritance, with the following schemas embedded hierarchically:
 

data/docs/adopting-toolchain.adoc

@@ -20,9 +20,9 @@ The modules involve classes which rely on inheritance from other classes; the cu
 
 In the case of `Asciidoctor::X` classes, the changes you will need to make involve the intermediate XML representation of your document, which is built up through Nokogiri Builder; e.g. adding different enums, or adding new elements. The adaptations in `Asciidoctor::Sample::Converter` are limited, and most projects can take them across as is. 
 
-The customisations needed for Metanorma::Sample::Processor are minor, and involve invoking methods specific to the gem for document generation.
+The customisations needed for `Metanorma::Sample::Processor` are minor, and involve invoking methods specific to the gem for document generation.
 
-The customisations needed for Isodoc::Sample are more extensive. Three base classes are involved: 
+The customisations needed for `Isodoc::Sample` are more extensive. Three base classes are involved: 
 
 * `Isodoc::Metadata` processes the metadata about the document stored in `//bibdata`. This information typically ends up in the document title page, as opposed to the document body. For that reason, metadata is extracted into a hash, which is passed to document output (title page, Word header) via the https://shopify.github.io/liquid/[Liquid template language].
 * `Isodoc::HtmlConvert` converts Standoc XML to HTML.
@@ -32,7 +32,7 @@ The `Isodoc::HtmlConvert` and `Isodoc::WordConvert` overlap substantially, as bo
 
 === Asciidoctor::Standoc customisation in metanorma-sample
 
-Examples from Asciidoctor::Sample in metanorma-sample. In the following snippets, the parameter `node` represents the current node of the Asciidoctor document, and `xml` represents the Nokogiri Builder node of the XML output.
+Examples from `Asciidoctor::Sample` in metanorma-sample. In the following snippets, the parameter `node` represents the current node of the Asciidoctor document, and `xml` represents the Nokogiri Builder node of the XML output.
 
 * The boilerplate representation of the document's author, publisher and copyright holder names Acme instead of ISO as the responsible organisation.
 

data/docs/guidance.adoc

@@ -98,8 +98,8 @@ For references to standards with a document identifier, the entry must be preced
 [subs="quotes"]
 ISO 6646 in this example would be cited from elsewhere in the document through crossreferences to the `ricepotentialmilling` identifier; e.g. `<< ricepotentialmilling>>` (which will be rendered as `ISO 6646`), `<<``ricepotentialmilling, section 5``>>` (which will be rendered as `ISO 6646, Section 5`), `<<``ricepotentialmilling,section 5: the foregoing discussion``>>` (which will be tagged in the XML representation as Section 5 of ISO 6646, but will be displayed as `the foregoing discussion`.)
 
-TIP
-----
+[TIP]
+====
 If an ISO reference is in preparation, ISO/IEC DIR 2 dictates that details of the reference status be given as a footnote. In Asciidoc, this is done by giving the date as a double dash, and following the bibliographic anchor with a footnote macro:
 
 [source,asciidoc]
@@ -113,7 +113,7 @@ If an ISO reference includes all parts of the standard, that is indicated by app
 --
 * [[[ISO16634,ISO 16634 (all parts)]]] _Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs -- Determination of the total nitrogen content by combustion according to the Dumas principle and calculation of the crude protein content_
 --
-----
+====
 
 In informative references, references to standards documents are still given with the same format of bibliographic anchor, and they are cited by their document identifier -- although they are displayed with an incrementing reference number in brackets, for consistency with any bibliographic entries that are not standards documents. (This convention is taken from ISO.) So
 
@@ -309,8 +309,8 @@ Informative clauses are indicated with the attribute `[obligation=informative]`;
 
 All annexes must be preceded by the style attribute `[appendix]`, in order to be recognised correctly. Like all clauses, annexes are normative by default, an informative annex is indicated with `[appendix,obligation=informative]`.
 
-TIP
-----
+[TIP]
+====
 In ISO, Appendixes to annexes can occur, although they are not mentioned in ISO/IEC DIR 2; ISO/IEC DIR 1 features them. They are marked up as immediate subsections of annexes, and must be tagged with an option attribute of "appendix":
 
 [source,asciidoc]
@@ -323,7 +323,7 @@ Text
 === Appendix 1
 Text
 --
----
+====
 
 The numbering of annexes and appendices is automatic: do not insert "Annex A" or "Appendix 1" as part of the title. Annex and Appendix titles can be left blank, as with Clauses.
 

data/docs/navigation.adoc

@@ -1,23 +1,23 @@
 ---
-sections:
-- name: Introduction
+items:
+- title: Introduction
   items:
-    - quickstart
-- name: Using Metanorma-ISO
+    - { title: Quickstart, path: quickstart/ }
+- title: Using Metanorma-ISO
   items:
-    - guidance
-    - outputs
-    - htmloutput
-    - customisation
-    - asciiiso-syntax
-- name: "Adopting Metanorma: FAQ"
+    - { title: Authoring guidance, path: guidance/ }
+    - { title: Output formats, path: outputs/ }
+    - { title: HTML output, path: htmloutput/ }
+    - { title: Customisation, path: customisation/ }
+    - { title: AsciiISO syntax, path: asciiiso-syntax/ }
+- title: "Adopting Metanorma: FAQ"
   items:
-    - adopting-spec
-    - adopting-toolchain
-    - styling-output-html
-    - styling-output-msword
-    - localizing-output
-    - replacing-asciidoc
+    - { title: How to adopt StanDoc in your own specs, path: adopting-spec/ }
+    - { title: How to use StanDoc toolchain for your specs, path: adopting-toolchain/ }
+    - { title: How to style HTML output, path: styling-output-html/ }
+    - { title: How to style MS Word output, path: styling-output-msword/ }
+    - { title: How to localize the output, path: localizing-output/ }
+    - { title: How to bypass AsciiDoc, path: replacing-asciidoc/ }
 ---
 
 = Navigation

data/lib/asciidoctor/iso/biblio.rng

@@ -488,6 +488,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
+    <optional>
+      <ref name="version"/>
+    </optional>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
@@ -866,6 +869,34 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="version">
+    <element name="version">
+      <optional>
+        <ref name="vedition"/>
+      </optional>
+      <optional>
+        <ref name="revision-date"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="draft"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="vedition">
+    <element name="edition">
+      <data type="int"/>
+    </element>
+  </define>
+  <define name="revision-date">
+    <element name="revision-date">
+      <data type="date"/>
+    </element>
+  </define>
+  <define name="draft">
+    <element name="draft">
+      <text/>
+    </element>
+  </define>
   <!--
     Anycontents = mixed {
     https://github.com/relaxng/jing-trang/issues/211

data/lib/asciidoctor/iso/isodoc.rng

@@ -39,9 +39,6 @@
   <define name="standard-document">
     <element name="standard-document">
       <ref name="bibdata"/>
-      <optional>
-        <ref name="version"/>
-      </optional>
       <optional>
         <ref name="preface"/>
       </optional>
@@ -59,34 +56,6 @@
       <ref name="BibData"/>
     </element>
   </define>
-  <define name="version">
-    <element name="version">
-      <optional>
-        <ref name="vedition"/>
-      </optional>
-      <optional>
-        <ref name="revision-date"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="draft"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="vedition">
-    <element name="edition">
-      <data type="int"/>
-    </element>
-  </define>
-  <define name="revision-date">
-    <element name="revision-date">
-      <data type="date"/>
-    </element>
-  </define>
-  <define name="draft">
-    <element name="draft">
-      <text/>
-    </element>
-  </define>
   <define name="preface">
     <element name="preface">
       <oneOrMore>
@@ -1068,6 +1037,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
+    <optional>
+      <ref name="version"/>
+    </optional>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>

data/lib/asciidoctor/iso/isostandard.rng

@@ -96,6 +96,9 @@
       <optional>
         <ref name="edition"/>
       </optional>
+      <optional>
+        <ref name="version"/>
+      </optional>
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
@@ -178,6 +181,9 @@
       <optional>
         <ref name="edition"/>
       </optional>
+      <optional>
+        <ref name="version"/>
+      </optional>
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
@@ -762,9 +768,6 @@
   <define name="iso-standard">
     <element name="iso-standard">
       <ref name="bibdata"/>
-      <optional>
-        <ref name="version"/>
-      </optional>
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>

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

@@ -478,8 +478,6 @@ table.MsoISOTable
 	mso-yfti-tbllook:480;
 	mso-border-insideh:.75pt solid windowtext;
 	mso-border-insidev:.75pt solid windowtext;
-        mso-table-anchor-vertical:paragraph;
-        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 table.MsoISOTable tr
@@ -506,8 +504,6 @@ table.MsoTableGrid
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-        mso-table-anchor-vertical:paragraph;
-        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 td { page-break-inside:avoid; }
@@ -669,10 +665,6 @@ p.example, li.example, div.example, td.example
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 
-table.example {
-        margin-bottom:12pt;
-}
-
 td.example p.MsoListParagraph {
   font-size: 10.0pt;
 }

data/lib/isodoc/iso/html/style-human.scss

@@ -369,7 +369,7 @@ p.Terms {
 }
   
 @media screen {
-  img { 
+  div.figure > img { 
       width: 100%;   
       height: auto;
   }
@@ -417,7 +417,7 @@ p.Terms {
     color: white;
 }
 
-ul li {
+ul > li {
     list-style: none;
   }
 
@@ -651,6 +651,19 @@ text-align: center;
     margin: 0;
 }
 
+.Admonition {
+    background-color: #ffcccc;
+    color: #47430c;
+    padding: 0.5em;
+    margin: 1.5em 0 1.5em 0;
+    text-align: left;
+}
+
+.Admonition p {
+    margin: 0;
+}
+
+
 /*
 3.8 Examples
 */

data/lib/isodoc/iso/html/style-iso.scss

@@ -253,7 +253,7 @@ h2 p {
 }
 
   
-  ul li {
+  ul > li {
     list-style: none;
   }
   
@@ -372,7 +372,7 @@ p.Terms {
 }
   
 @media screen {
-  img { 
+  div.figure > img { 
       width: 100%;   
       height: auto;
   }
@@ -636,6 +636,19 @@ text-align: left;
     margin: 0;
 }
 
+.Admonition {
+background-color: #ffcccc;
+color: #47430c;
+padding: 0.5em;
+margin: 1.5em 0 1.5em 0;
+text-align: left;
+}
+
+.Admonition p {
+    margin: 0;
+}
+
+
 /*
 3.8 Examples
 */

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

@@ -1242,8 +1242,6 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-        mso-table-anchor-vertical:paragraph;
-        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 br.section

data/lib/isodoc/iso/html_convert.rb

@@ -109,7 +109,7 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] = { label: num, xref: num, level: level }
-        clause.xpath(ns(".//clause")).each_with_index do |c, i|
+        clause.xpath(ns("./clause")).each_with_index do |c, i|
           annex_names1(c, "#{num}.#{i + 1}", level + 1)
         end
       end
@@ -120,17 +120,18 @@ module IsoDoc
         ret += " 第#{from.text}" if from
         ret += "–#{to}" if to
         loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
-        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$/)
+        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$|^IEC 60050-/)
         ret += ")" if type == "list"
         ret
       end
 
       def eref_localities1(target, type, from, to, lang = "en")
         subsection = from&.text&.match(/\./)
+        type = type.downcase
         return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
         ret = type == "list" ? "" : ","
         loc = @locality[type] || type.sub(/^locality:/, "").capitalize
-        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$/)
+        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$|^IEC 60050-/)
         ret += " #{from.text}" if from
         ret += "–#{to.text}" if to
         ret += ")" if type == "list"

data/lib/isodoc/iso/word_convert.rb

@@ -134,28 +134,29 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] = { label: num, xref: num, level: level }
-        clause.xpath(ns(".//clause")).each_with_index do |c, i|
+        clause.xpath(ns("./clause")).each_with_index do |c, i|
           annex_names1(c, "#{num}.#{i + 1}", level + 1)
         end
       end
 
-      def eref_localities1_zh(target, type, from, to)
+            def eref_localities1_zh(target, type, from, to)
         subsection = from&.text&.match(/\./)
         ret = type == "list" ? "" : ","
         ret += " 第#{from.text}" if from
         ret += "–#{to}" if to
         loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
-        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$/)
+        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$|^IEC 60050-/)
         ret += ")" if type == "list"
         ret
       end
 
       def eref_localities1(target, type, from, to, lang = "en")
         subsection = from&.text&.match(/\./)
+        type = type.downcase
         return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
         ret = type == "list" ? "" : ","
         loc = @locality[type] || type.sub(/^locality:/, "").capitalize
-        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$/)
+        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$|^IEC 60050-/)
         ret += " #{from.text}" if from
         ret += "–#{to.text}" if to
         ret += ")" if type == "list"

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.0.12".freeze
+    VERSION = "1.0.13".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "iev", "~> 0.2.0"
   spec.add_dependency "metanorma-standoc", "~> 1.0.0"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

data/spec/asciidoctor-iso/refs_spec.rb

@@ -468,7 +468,7 @@ RSpec.describe Asciidoctor::ISO do
           <substage>60</substage>
         </status>
         <copyright>
-          <from>2018</from>
+          <from>#{Time.now.year}</from>
           <owner>
             <organization>
               <name>International Organization for Standardization</name>

data/spec/assets/iso.doc

@@ -1,7 +1,7 @@
 MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----=_NextPart_c199ad4e.a0ae.4a75"
+Content-Type: multipart/related; boundary="----=_NextPart_46e31af2.9c48.4ec0"
 
-------=_NextPart_c199ad4e.a0ae.4a75
+------=_NextPart_46e31af2.9c48.4ec0
 Content-Location: file:///C:/Doc/iso.htm
 Content-Type: text/html; charset="utf-8"
 
@@ -533,8 +533,6 @@ table.MsoISOTable {
   mso-yfti-tbllook: 480;
   mso-border-insideh: .75pt solid windowtext;
   mso-border-insidev: .75pt solid windowtext;
-  mso-table-anchor-vertical: paragraph;
-  mso-table-bspace: 12.0pt;
   font-size: 10.0pt;
   font-family: "Cambria", serif; }
 
@@ -565,8 +563,6 @@ table.MsoTableGrid {
   mso-para-margin: 0cm;
   mso-para-margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
-  mso-table-anchor-vertical: paragraph;
-  mso-table-bspace: 12.0pt;
   font-size: 10.0pt;
   font-family: "Cambria", serif; }
 
@@ -724,9 +720,6 @@ p.example, li.example, div.example, td.example {
   font-size: 10.0pt;
   font-family: "Cambria", serif; }
 
-table.example {
-  margin-bottom: 12pt; }
-
 td.example p.MsoListParagraph {
   font-size: 10.0pt; }
 
@@ -798,7 +791,9 @@ span.note_label, span.example_label, td.example_label, td.note_label {
 
       <p class="MsoNormal">&#xA0;</p>
     </div>
-    <br clear="all" class="section"/>
+    <p class="MsoNormal">
+      <br clear="all" class="section"/>
+    </p>
     <div class="WordSection2"><div style="mso-element:para-border-div;border:solid windowtext 1.0pt;&#10;border-bottom:none;mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:&#10;solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 0cm 4.0pt;&#10;margin-left:5.1pt;margin-right:5.1pt">
 
 <p class="zzCopyright" align="left" style="margin-top:2.0pt;margin-right:0cm;&#10;margin-bottom:12.0pt;margin-left:0cm;text-align:left;page-break-before:always;&#10;mso-layout-grid-align:none;text-autospace:none;border:none;mso-border-top-alt:&#10;solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;mso-border-right-alt:&#10;solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 0cm 4.0pt"><span lang="EN-GB" style="color:windowtext" xml:lang="EN-GB">&#xA9;  , Published in Switzerland.<p class="MsoNormal"></p></span></p>
@@ -834,11 +829,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="#_Toc355783382">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<a href="#_Toc221259265">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 _Toc355783382 \h </span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc221259265 \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>
 
@@ -852,7 +847,9 @@ Switzerland<p class="MsoNormal"></p></span></p>
 </p>
 
 
-      <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+      <p class="MsoNormal">
+        <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+      </p>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
         <div id="" class="Note">
@@ -861,7 +858,9 @@ Switzerland<p class="MsoNormal"></p></span></p>
       </div>
       <p class="MsoNormal">&#xA0;</p>
     </div>
-    <br clear="all" class="section"/>
+    <p class="MsoNormal">
+      <br clear="all" class="section"/>
+    </p>
     <div class="WordSection3">
       <p class="zzSTDTitle1"></p>
     </div>
@@ -871,7 +870,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
 </html>
 
 
-------=_NextPart_c199ad4e.a0ae.4a75
+------=_NextPart_46e31af2.9c48.4ec0
 Content-Location: file:///C:/Doc/iso_files/filelist.xml
 Content-Transfer-Encoding: base64
 Content-Type: application/xml
@@ -881,7 +880,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
 bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
 L3htbD4K
 
-------=_NextPart_c199ad4e.a0ae.4a75
+------=_NextPart_46e31af2.9c48.4ec0
 Content-Location: file:///C:/Doc/iso_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
@@ -1074,4 +1073,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
 ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
 bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
 
-------=_NextPart_c199ad4e.a0ae.4a75--
+------=_NextPart_46e31af2.9c48.4ec0--

data/spec/isodoc/postproc_spec.rb

@@ -112,7 +112,7 @@ RSpec.describe IsoDoc do
     expect(word).to be_equivalent_to <<~"OUTPUT"
            <div class="WordSection3">
                <p class="zzSTDTitle1"></p>
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p class="MsoNormal"><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div class="Section3"><a name="P" id="P"></a>
                  <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
                  <div><a name="Q" id="Q"></a>

data/spec/isodoc/section_spec.rb

@@ -228,14 +228,14 @@ OUTPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p id="A">This is a preamble</p>
                </div>
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div class="Section3" id="B">
                  <h1 class="IntroTitle">0.<span style="mso-tab-count:1">&#160; </span>Introduction</h1>
                  <div id="C">
@@ -245,7 +245,7 @@ OUTPUT
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
                <div id="D">
@@ -295,7 +295,7 @@ OUTPUT
           <h2>5.2. Clause 4.2</h2>
         </div>
                </div>
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div id="P" class="Section3">
                  <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
                  <div id="Q">
@@ -308,7 +308,7 @@ OUTPUT
           <h2>Appendix 1. An Appendix</h2>
         </div>
                </div>
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div>
                  <h1 class="Section3">Bibliography</h1>
                  <div>
@@ -535,11 +535,11 @@ OUTPUT
             <div class="WordSection1">
               <p>&#160;</p>
             </div>
-            <br clear="all" class="section"/>
+            <p><br clear="all" class="section"/></p>
             <div class="WordSection2">
               <p>&#160;</p>
             </div>
-            <br clear="all" class="section"/>
+            <p><br clear="all" class="section"/></p>
             <div class="WordSection3">
               <p class="zzSTDTitle1"/>
             </div>
@@ -566,11 +566,11 @@ OUTPUT
             <div class="WordSection1">
               <p>&#160;</p>
             </div>
-            <br clear="all" class="section"/>
+            <p><br clear="all" class="section"/></p>
             <div class="WordSection2">
               <p>&#160;</p>
             </div>
-            <br clear="all" class="section"/>
+            <p><br clear="all" class="section"/></p>
             <div class="WordSection3">
               <p class="zzSTDTitle1"/>
             </div>

data/spec/isodoc/terms_spec.rb

@@ -169,13 +169,13 @@ OUTPUT
        <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
 
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example" cellspacing="0" cellpadding="0" style="border-collapse:collapse"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 1</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 1</td><td valign="top" class="example">
          <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
          <ul>
          <li>A</li>
          </ul>
        </td></tr></table>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example" cellspacing="0" cellpadding="0" style="border-collapse:collapse"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 2</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 2</td><td valign="top" class="example">
          <ul>
          <li>A</li>
          </ul>
@@ -188,7 +188,7 @@ OUTPUT
        <p class="AltTerms" style="text-align:left;">rough rice</p>
        <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example" cellspacing="0" cellpadding="0" style="border-collapse:collapse"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE</td><td valign="top" class="example">
          <ul>
          <li>A</li>
          </ul>
@@ -199,6 +199,8 @@ OUTPUT
          <a href="#ISO7301">ISO 7301:2011, 3.1</a>
        [/TERMREF]</p></div>
            </div>
+           <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
+           <div class="colophon"/>
          </body>
        </html>
 

data/spec/spec_helper.rb

@@ -155,11 +155,11 @@ WORD_HDR = <<~END
            <div class="WordSection1">
              <p>&#160;</p>
            </div>
-           <br clear="all" class="section"/>
+           <p><br clear="all" class="section"/></p>
            <div class="WordSection2">
              <p>&#160;</p>
            </div>
-           <br clear="all" class="section"/>
+           <p><br clear="all" class="section"/></p>
            <div class="WordSection3">
 END
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement