metanorma-iso 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0119bb23502ecd1f0ebef275a09c518506ec0389533594bbf07f32dc3e42e981'
-  data.tar.gz: 26f9dab92a77065322ede51ec72f51f3d672096b8e63741d470433dcde508823
+  metadata.gz: d4aead1d16c118e0178077994f40fcce1ea12a3e0d4433f5729c641b9f62946a
+  data.tar.gz: 4bee457e75a3895160d10aeb3c074f1b513445429685acf5d748e9c8eb3e70e2
 SHA512:
-  metadata.gz: da7a1fb42d0b409d6d4781fd1ee5adff54df4cd6f5d5b649261153dd3195599d85d0dba40870b57dffa1c412278c8ca8520428a09a4b5277c5757b144464a684
-  data.tar.gz: 153c46baa2c2bac4b216be5bb4000224195fed472fdc39ea6830ee6dbef2ce9567861db8ee30e0088496a1e86557ab15a5615a658bd9b82dc9ea9c4898075dff
+  metadata.gz: 9f1ac7d63a1b8d1dadc1e785de4eb46ed9e2de878fc507d8194060ed7e4a2198f20ac8343a58b2a7cd0c6392375ae1f1997b348d800569194064de433caee612
+  data.tar.gz: 479559c1c2ad91cb675f82aa1d6de6dcf30e782f16d555cfbedb85936a3e4bea5dd7d7a2850aff46602d09b1664970e23fdec7ab239c59b2b1cb7d6c72f29fe7

data/docs/guidance.adoc

@@ -404,7 +404,9 @@ Ordered lists in both HTML and Word have their labels pre-configured, to align w
 
 TIP: The stylesheets for ISO render unordered lists with em-dashes instead of bullets, as preferred by ISO. Ordered lists in Word are rendered with their labels bracketed. (_a)_, _1)_, etc.) 
 
-TIP: Asciidoctor and HTML support multiple paragraphs within a single list item (through https://asciidoctor.org/docs/user-manual/#list-continuation[list continuation]); in HTML output, all the paragraphs within a list item will be aligned. In Word, each list entry must be a single paragraph; if the Asciidoctor contains more than one paragraph for a list item, the subsequent paragraphs will not be preceded by a bullet in Word, but they will also not be indented under the first paragraph of the list item.
+TIP: Asciidoctor and HTML support multiple paragraphs within a single list item (through https://asciidoctor.org/docs/user-manual/#list-continuation[list continuation]); in HTML output, all the paragraphs within a list item will be aligned. The software attempts to do so with Word output as well, by using custom list continuation styles (`ListContLevel1` etc.); but you should check the output, and may need to manually intervene.
+
+In Word, each list entry must be a single paragraph; if the Asciidoctor contains more than one paragraph for a list item, the subsequent paragraphs will not be preceded by a bullet in Word, but they will also not be indented under the first paragraph of the list item.
 
 === Footnotes
 

data/lib/asciidoctor/iso/base.rb

@@ -42,7 +42,7 @@ module Asciidoctor
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</iso-standard>"
-        textcleanup(result.flatten * "\n")
+        textcleanup(result)
       end
     end
   end

data/lib/asciidoctor/iso/isodoc.rng

@@ -493,6 +493,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>

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

@@ -687,6 +687,11 @@ margin-top:0;
 margin-left:-1.5em;
 }
 
+
+.example .Sourcecode {
+      background: none;
+}
+
 /*
 3.9 Tables
 */

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

@@ -670,6 +670,11 @@ text-transform: uppercase;
 margin-top:0;
 }
 
+
+.example .Sourcecode {
+      background: none;
+}
+
 /*
 3.9 Tables
 */

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

@@ -1231,6 +1231,108 @@ div.colophon
 	margin-left:162.0pt;
 	text-indent:-18.0pt;}
 
+p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:18.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel2, li.ListContLevel2, div.ListContLevel2
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:36.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel3, li.ListContLevel3, div.ListContLevel3
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:54.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel4, li.ListContLevel4, div.ListContLevel4
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:72.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel5, li.ListContLevel5, div.ListContLevel5
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:90.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel6, li.ListContLevel6, div.ListContLevel6
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:108.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel7, li.ListContLevel7, div.ListContLevel7
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:126.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel8, li.ListContLevel8, div.ListContLevel8
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:144.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel9, li.ListContLevel9, div.ListContLevel9
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:162.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+
+
+
 table.MsoNormalTable
 	{mso-style-name:"Table Normal";
 	mso-tstyle-rowband-size:0;

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.1.0".freeze
+    VERSION = "1.1.1".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -6,16 +6,16 @@ RSpec.describe Asciidoctor::ISO do
     expect(Metanorma::ISO::VERSION).not_to be nil
   end
 
-  it "generates output for the Rice document" do
-    FileUtils.rm_f %w(spec/examples/rice.xml spec/examples/rice.doc spec/examples/rice.html spec/examples/rice_alt.html)
-    FileUtils.cd "spec/examples"
-    Asciidoctor.convert_file "rice.adoc", {:attributes=>{"backend"=>"iso"}, :safe=>0, :header_footer=>true, :requires=>["metanorma-iso"], :failure_level=>4, :mkdirs=>true, :to_file=>nil}
-    FileUtils.cd "../.."
-    expect(File.exist?("spec/examples/rice.xml")).to be true
-    expect(File.exist?("spec/examples/rice.doc")).to be true
-    expect(File.exist?("spec/examples/rice.html")).to be true
-    expect(File.exist?("spec/examples/rice_alt.html")).to be true
-  end
+  #it "generates output for the Rice document" do
+    #FileUtils.rm_f %w(spec/examples/rice.xml spec/examples/rice.doc spec/examples/rice.html spec/examples/rice_alt.html)
+    #FileUtils.cd "spec/examples"
+    #Asciidoctor.convert_file "rice.adoc", {:attributes=>{"backend"=>"iso"}, :safe=>0, :header_footer=>true, :requires=>["metanorma-iso"], :failure_level=>4, :mkdirs=>true, :to_file=>nil}
+    #FileUtils.cd "../.."
+    #expect(File.exist?("spec/examples/rice.xml")).to be true
+    #expect(File.exist?("spec/examples/rice.doc")).to be true
+    #expect(File.exist?("spec/examples/rice.html")).to be true
+    #expect(File.exist?("spec/examples/rice_alt.html")).to be true
+  #end
 
   it "processes a blank document" do
     expect(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)).to be_equivalent_to <<~"OUTPUT"

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -372,7 +372,7 @@ RSpec.describe Asciidoctor::ISO do
       INPUT
       #{BLANK_HDR}
        <sections>
-         <sourcecode id="_">puts "Hello, world."
+         <sourcecode lang="ruby" id="_">puts "Hello, world."
        %w{a b c}.each do |x|
          puts x
        end</sourcecode>
@@ -395,7 +395,7 @@ RSpec.describe Asciidoctor::ISO do
       <2> This is another callout
       INPUT
       #{BLANK_HDR}
-              <sections><sourcecode id="_">puts "Hello, world." <callout target="_">1</callout>
+              <sections><sourcecode lang="ruby" id="_">puts "Hello, world." <callout target="_">1</callout>
        %w{a b c}.each do |x|
          puts x <callout target="_">2</callout>
        end<annotation id="_">

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe Asciidoctor::ISO do
               <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
-         <term id="_"><preferred><stem type="AsciiMath">t_90</stem></preferred><admitted><stem type="AsciiMath">t_91</stem></admitted>
+         <term id="_"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>91</mn></msub></math></stem></admitted>
        <definition><p id="_">Time</p></definition></term>
        </terms>
        </sections>
@@ -87,8 +87,8 @@ RSpec.describe Asciidoctor::ISO do
               <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
-         <term id="_"><preferred><stem type="AsciiMath">t_90</stem></preferred><definition><formula id="_">
-         <stem type="AsciiMath">t_A</stem>
+         <term id="_"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><definition><formula id="_">
+         <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mi>A</mi></msub></math></stem>
        </formula><p id="_">This paragraph is extraneous</p></definition>
        </term>
        </terms>
@@ -160,7 +160,7 @@ r = 1 %</stem>
       NOTE: That loop does not do much
     INPUT
        #{BLANK_HDR}
-              <sections><sourcecode id="_">[1...x].each do |y|
+              <sections><sourcecode lang="ruby" id="_">[1...x].each do |y|
          puts y
        end</sourcecode>
        <note id="_">
@@ -528,7 +528,7 @@ r = 1 %</stem>
     INPUT
        #{BLANK_HDR}
        <sections><formula id="_">
-         <stem type="AsciiMath">Formula</stem>
+          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>F</mi><mtext>or</mtext><mi>μ</mi><mi>l</mi><mi>a</mi></math></stem>
        <dl id="_">
          <dt>a</dt>
          <dd>

data/spec/asciidoctor-iso/inline_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Asciidoctor::ISO do
        ‘single quote’
        super<sup>script</sup>
        sub<sub>script</sub>
-       <stem type="AsciiMath">a_90</stem>
+       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>a</mi><mn>90</mn></msub></math></stem>
        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub> <mrow> <mrow> <mi mathvariant="bold-italic">F</mi> </mrow> </mrow> <mrow> <mrow> <mi mathvariant="bold-italic">Α</mi> </mrow> </mrow> </msub> </math></stem>
        <admitted>alt</admitted>
        <deprecates>deprecated</deprecates>

data/spec/asciidoctor-iso/macros_spec.rb

@@ -88,7 +88,7 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
        #{BLANK_HDR}
        <sections>
-         <sourcecode id="_">@startuml
+         <sourcecode lang="plantuml" id="_">@startuml
 Alice -&gt; Bob: Authentication Request
 Bob --&gt; Alice: Authentication Response
 

data/spec/asciidoctor-iso/section_spec.rb

@@ -77,8 +77,8 @@ RSpec.describe Asciidoctor::ISO do
          <preferred>Term2</preferred>
        </term>
        </terms>
-       <definitions id="_"/></clause>
-       <definitions id="_"/>
+       <definitions id="_"><title>Symbols and Abbreviated Terms</title></definitions></clause>
+       <definitions id="_"><title>Symbols and Abbreviated Terms</title></definitions>
        <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>
@@ -196,8 +196,13 @@ RSpec.describe Asciidoctor::ISO do
          <preferred>Term2</preferred>
        </term>
        </clause>
-       <definitions id="_"/></terms>
-       <definitions id="_"/>
+       <definitions id="_">
+       <title>Σύμβολα και Συντομογραφίες</title>
+       </definitions>
+        </terms>
+       <definitions id="_">
+       <title>Σύμβολα και Συντομογραφίες</title>
+       </definitions>
        <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>

data/spec/asciidoctor-iso/table_spec.rb

@@ -150,7 +150,7 @@ RSpec.describe Asciidoctor::ISO do
            <tr>
              <th rowspan="2" align="left">Defect</th>
              <th colspan="4" align="center">Maximum permissible mass fraction of defects in husked rice<br/>
-       <stem type="AsciiMath">w_max</stem></th>
+       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>w</mi><mi>max</mi></msub></math></stem></th>
            </tr>
          <tr>
              <td align="left">in husked rice</td>

data/spec/assets/iso.doc

@@ -1,7 +1,7 @@
 MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----=_NextPart_ed032ac9.5869.4ef8"
+Content-Type: multipart/related; boundary="----=_NextPart_6bb606bb.f022.46c5"
 
-------=_NextPart_ed032ac9.5869.4ef8
+------=_NextPart_6bb606bb.f022.46c5
 Content-Location: file:///C:/Doc/iso.htm
 Content-Type: text/html; charset="utf-8"
 
@@ -829,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="#_Toc932671010">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<a href="#_Toc980760563">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 _Toc932671010 \h </span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc980760563 \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>
 
@@ -870,7 +870,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
 </html>
 
 
-------=_NextPart_ed032ac9.5869.4ef8
+------=_NextPart_6bb606bb.f022.46c5
 Content-Location: file:///C:/Doc/iso_files/filelist.xml
 Content-Transfer-Encoding: base64
 Content-Type: application/xml
@@ -880,7 +880,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
 bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
 L3htbD4K
 
-------=_NextPart_ed032ac9.5869.4ef8
+------=_NextPart_6bb606bb.f022.46c5
 Content-Location: file:///C:/Doc/iso_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
@@ -1073,4 +1073,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
 ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
 bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
 
-------=_NextPart_ed032ac9.5869.4ef8--
+------=_NextPart_6bb606bb.f022.46c5--

data/spec/isodoc/iso_spec.rb

@@ -249,7 +249,7 @@ end
                <h1 class="ForewordTitle">Foreword</h1>
                <table id="samplecode" 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_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE</td>
                    <td valign="top" class="example">
          <p>Hello</p>
        </td>
@@ -300,7 +300,7 @@ end
                <h1 class="ForewordTitle">Foreword</h1>
                <table id="samplecode" 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_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE  1</td>
                    <td valign="top" class="example">
          <p>Hello</p>
        </td>
@@ -308,7 +308,7 @@ end
                </table>
                <table id="samplecode2" 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_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE  2</td>
                    <td valign="top" class="example">
          <p>Hello</p>
        </td>

data/spec/isodoc/metadata_spec.rb

@@ -30,6 +30,11 @@ RSpec.describe IsoDoc::Iso::Metadata do
   <date type="created"><from>2010</from><to>2011</to></date>
   <date type="activated"><on>2013</on></date>
   <date type="obsoleted"><on>2014</on></date>
+  <edition>2</edition>
+  <version>
+  <revision-date>2016-05-01</revision-date>
+  <draft>0.4</draft>
+</version>
   <contributor>
     <role type="author"/>
     <organization>
@@ -63,14 +68,10 @@ RSpec.describe IsoDoc::Iso::Metadata do
     <workgroup number="3">Rice Group</workgroup>
     <secretariat>GB</secretariat>
   </editorialgroup>
-</bibdata><version>
-  <edition>2</edition>
-  <revision-date>2016-05-01</revision-date>
-  <draft>0.4</draft>
-</version>
+</bibdata>
 </iso-standard>
 INPUT
-       {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"ISO/PreCD3 17301-1", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Partie&nbsp;1: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Part&nbsp;1: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stage_int=>30, :stageabbr=>"PreCD3", :tc=>"TC 34", :tc_docnumber=>"17301", :unpublished=>true, :updateddate=>"XXX", :wg=>"WG 3"}
+       {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"ISO/PreCD3 17301-1", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Partie&nbsp;1: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Part&nbsp;1: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stage_int=>30, :stageabbr=>"PreCD3", :tc=>"TC 34", :tc_docnumber=>"17301", :unpublished=>true, :updateddate=>"XXX", :wg=>"WG 3"}
 OUTPUT
   end
 
@@ -140,14 +141,10 @@ OUTPUT
   </editorialgroup>
   <ics><code>1.2.3</code></ics>
   <ics><code>1.2.3</code></ics>
-</bibdata><version>
-  <edition>2</edition>
-  <revision-date>2016-05-01</revision-date>
-  <draft>12</draft>
-</version>
+</bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"ISO/IEC/CD 17301-1-3", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Partie&nbsp;1&ndash;3: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Part&nbsp;1&ndash;3: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"60", :stage_int=>60, :stageabbr=>"IS", :tc=>"ABC 34", :tc_docnumber=>"17301", :unpublished=>false, :updateddate=>"XXX", :wg=>"GHI 3"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"ISO/IEC/CD 17301-1-3", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz", :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses", :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai", :docsubtitlepart=>"Partie&nbsp;1&ndash;3: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Part&nbsp;1&ndash;3: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>nil, :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"60", :stage_int=>60, :stageabbr=>"IS", :tc=>"ABC 34", :tc_docnumber=>"17301", :unpublished=>false, :updateddate=>"XXX", :wg=>"GHI 3"}
 OUTPUT
   end
 

data/spec/isodoc/postproc_spec.rb

@@ -440,7 +440,7 @@ RSpec.describe IsoDoc do
              <div class="Section3"><a name="P" id="P"></a>
                <table 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;"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851c" id="_63112cbc-cde0-435f-9553-e0b8c4f5851c"></a>
                  <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_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE  1</td>
                    <td valign="top" class="example">
          <p class="example"><a name="_158d4efa-b1c9-4aec-b325-756de8e4c968" id="_158d4efa-b1c9-4aec-b325-756de8e4c968"></a>'1M', '01M', and '0001M' all describe the calendar month January.</p>
        </td>
@@ -448,7 +448,7 @@ RSpec.describe IsoDoc do
                </table><p style="margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0.0pt;margin-bottom:.0001pt;line-height:1.0pt;mso-line-height-rule:exactly" class="MsoNormal"><span lang="EN-GB" style="display:none;mso-hide:all" xml:lang="EN-GB">&#xA0;</span></p>
                <table 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;"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851d" id="_63112cbc-cde0-435f-9553-e0b8c4f5851d"></a>
                  <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_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE  2</td>
                    <td valign="top" class="example">
          <p class="example"><a name="_158d4efa-b1c9-4aec-b325-756de8e4c969" id="_158d4efa-b1c9-4aec-b325-756de8e4c969"></a>'2M', '02M', and '0002M' all describe the calendar month February.</p>
        </td>

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="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">
+       <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 0;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="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">
+       <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 0;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="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">
+       <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 0;margin-left:0pt">EXAMPLE</td><td valign="top" class="example">
          <ul>
          <li>A</li>
          </ul>

data/spec/isodoc/xref_spec.rb

@@ -568,7 +568,7 @@ RSpec.describe IsoDoc do
                <p class="zzSTDTitle1"/>
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
-                 <div id="N" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div>
+                 <div id="N" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</p></div>
                  <p>
                    <a href="#N">Formula (1)</a>
                  </p>
@@ -587,19 +587,19 @@ RSpec.describe IsoDoc do
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
                  <div id="widgets1"><h2>3.1. </h2>
-           <div id="note1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</div>
-           <div id="note2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</div>
+           <div id="note1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</p></div>
+           <div id="note2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</p></div>
          <p>    <a href="#note1">Formula (2)</a> <a href="#note2">Formula (3)</a> </p>
            </div>
                </div>
                <br/>
                <div id="annex1" class="Section3">
                  <div id="annex1a"><h2>A.1. </h2>
-           <div id="AN" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.1)</div>
+           <div id="AN" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.1)</p></div>
            </div>
                  <div id="annex1b"><h2>A.2. </h2>
-           <div id="Anote1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.2)</div>
-           <div id="Anote2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.3)</div>
+           <div id="Anote1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.2)</p></div>
+           <div id="Anote2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.3)</p></div>
            </div>
                </div>
              </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor