metanorma-iso 1.1.5 → 1.2.0

data/spec/assets/iso.doc

@@ -1,7 +1,7 @@
 MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----=_NextPart_13bf1059.8283.40e9"
+Content-Type: multipart/related; boundary="----=_NextPart_ba7557de.8346.4bce"
 
-------=_NextPart_13bf1059.8283.40e9
+------=_NextPart_ba7557de.8346.4bce
 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="#_Toc499677114">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<a href="#_Toc881003173">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 _Toc499677114 \h </span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc881003173 \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_13bf1059.8283.40e9
+------=_NextPart_ba7557de.8346.4bce
 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_13bf1059.8283.40e9
+------=_NextPart_ba7557de.8346.4bce
 Content-Location: file:///C:/Doc/iso_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
@@ -1116,23 +1116,24 @@ LWVuZCc+PC9zcGFuPjwvc3Bhbj48L2I+PCFbZW5kaWZdLS0+PHNwYW4NCmxhbmc9RU4tR0Igc3R5
 bGU9J2ZvbnQtc2l6ZToxMC4wcHQ7bXNvLWJpZGktZm9udC1zaXplOjExLjBwdCc+PG86cD48L286
 cD48L3NwYW4+PC9wPg0KDQo8L2Rpdj4NCg0KPGRpdiBzdHlsZT0nbXNvLWVsZW1lbnQ6Zm9vdGVy
 JyBpZD1mND4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxiIHN0eWxlPSdtc28tYmlkaS1mb250LXdl
-aWdodDpub3JtYWwnPjxzcGFuPklDUyA8bzpwPjwvbzpwPjwvc3Bhbj48L2I+PC9wPg0KDQo8cCBj
-bGFzcz1Nc29Gb290ZXIgc3R5bGU9J21hcmdpbi10b3A6MGNtJz48c3BhbiBsYW5nPUVOLUFVIHN0
-eWxlPSdmb250LXNpemU6DQoxMC4wcHQ7bXNvLWFuc2ktbGFuZ3VhZ2U6RU4tQVUnPlByaWNlIGJh
-c2VkIG9uIDwvc3Bhbj48IS0tW2lmIHN1cHBvcnRGaWVsZHNdPjxzcGFuDQpsYW5nPUVOLUFVIHN0
-eWxlPSdmb250LXNpemU6MTAuMHB0O21zby1hbnNpLWxhbmd1YWdlOkVOLUFVJz48c3Bhbg0Kc3R5
-bGU9J21zby1lbGVtZW50OmZpZWxkLWJlZ2luJz48L3NwYW4+PHNwYW4gc3R5bGU9J21zby1zcGFj
-ZXJ1bjp5ZXMnPsKgPC9zcGFuPk5VTVBBR0VTPHNwYW4NCnN0eWxlPSdtc28tc3BhY2VydW46eWVz
-Jz7CoCA8L3NwYW4+XCogTUVSR0VGT1JNQVQgPHNwYW4gc3R5bGU9J21zby1lbGVtZW50OmZpZWxk
-LXNlcGFyYXRvcic+PC9zcGFuPjwvc3Bhbj48IVtlbmRpZl0tLT48c3Bhbg0KbGFuZz1FTi1BVSBz
-dHlsZT0nZm9udC1zaXplOjEwLjBwdDttc28tYW5zaS1sYW5ndWFnZTpFTi1BVSc+PHNwYW4NCnN0
-eWxlPSdtc28tbm8tcHJvb2Y6eWVzJz4yNjwvc3Bhbj48L3NwYW4+PCEtLVtpZiBzdXBwb3J0Rmll
-bGRzXT48c3Bhbg0KbGFuZz1FTi1BVSBzdHlsZT0nZm9udC1zaXplOjEwLjBwdDttc28tYW5zaS1s
-YW5ndWFnZTpFTi1BVSc+PHNwYW4NCnN0eWxlPSdtc28tZWxlbWVudDpmaWVsZC1lbmQnPjwvc3Bh
-bj48L3NwYW4+PCFbZW5kaWZdLS0+PHNwYW4gbGFuZz1FTi1BVQ0Kc3R5bGU9J2ZvbnQtc2l6ZTox
-MC4wcHQ7bXNvLWFuc2ktbGFuZ3VhZ2U6RU4tQVUnPiBwYWdlczxvOnA+PC9vOnA+PC9zcGFuPjwv
-cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
-ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
-bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
-
-------=_NextPart_13bf1059.8283.40e9--
+aWdodDpub3JtYWwnPjxzcGFuPklDUyBYWFg8bzpwPjwvbzpwPjwvc3Bhbj48L2I+PC9wPg0KDQo8
+cCBjbGFzcz1Nc29Gb290ZXIgc3R5bGU9J21hcmdpbi10b3A6MGNtJz48c3BhbiBsYW5nPUVOLUFV
+IHN0eWxlPSdmb250LXNpemU6DQoxMC4wcHQ7bXNvLWFuc2ktbGFuZ3VhZ2U6RU4tQVUnPlByaWNl
+IGJhc2VkIG9uIDwvc3Bhbj48IS0tW2lmIHN1cHBvcnRGaWVsZHNdPjxzcGFuDQpsYW5nPUVOLUFV
+IHN0eWxlPSdmb250LXNpemU6MTAuMHB0O21zby1hbnNpLWxhbmd1YWdlOkVOLUFVJz48c3Bhbg0K
+c3R5bGU9J21zby1lbGVtZW50OmZpZWxkLWJlZ2luJz48L3NwYW4+PHNwYW4gc3R5bGU9J21zby1z
+cGFjZXJ1bjp5ZXMnPsKgPC9zcGFuPk5VTVBBR0VTPHNwYW4NCnN0eWxlPSdtc28tc3BhY2VydW46
+eWVzJz7CoCA8L3NwYW4+XCogTUVSR0VGT1JNQVQgPHNwYW4gc3R5bGU9J21zby1lbGVtZW50OmZp
+ZWxkLXNlcGFyYXRvcic+PC9zcGFuPjwvc3Bhbj48IVtlbmRpZl0tLT48c3Bhbg0KbGFuZz1FTi1B
+VSBzdHlsZT0nZm9udC1zaXplOjEwLjBwdDttc28tYW5zaS1sYW5ndWFnZTpFTi1BVSc+PHNwYW4N
+CnN0eWxlPSdtc28tbm8tcHJvb2Y6eWVzJz4yNjwvc3Bhbj48L3NwYW4+PCEtLVtpZiBzdXBwb3J0
+RmllbGRzXT48c3Bhbg0KbGFuZz1FTi1BVSBzdHlsZT0nZm9udC1zaXplOjEwLjBwdDttc28tYW5z
+aS1sYW5ndWFnZTpFTi1BVSc+PHNwYW4NCnN0eWxlPSdtc28tZWxlbWVudDpmaWVsZC1lbmQnPjwv
+c3Bhbj48L3NwYW4+PCFbZW5kaWZdLS0+PHNwYW4gbGFuZz1FTi1BVQ0Kc3R5bGU9J2ZvbnQtc2l6
+ZToxMC4wcHQ7bXNvLWFuc2ktbGFuZ3VhZ2U6RU4tQVUnPiBwYWdlczxvOnA+PC9vOnA+PC9zcGFu
+PjwvcD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQt
+c2l6ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpw
+PjwvbzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
+
+
+------=_NextPart_ba7557de.8346.4bce--

data/spec/assets/iso.html

@@ -13,7 +13,7 @@
 <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)"; } 
+    if (i > 1) { text += ","; } text += "h" + i + ":not(:empty):not(.TermNum)"; } 
   return text;}
 </script>
 

data/spec/isodoc/metadata_spec.rb

@@ -9,21 +9,14 @@ RSpec.describe IsoDoc::Iso::Metadata do
     INPUT
   expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <bibdata type="international-standard">
-  <title>
-    <title-intro language="en" format="text/plain">Cereals and pulses</title-intro>
-    <title-main language="en" format="text/plain">Specifications and test methods</title-main>
-    <title-part language="en" format="text/plain">Rice</title-part>
-  </title>
-  <title>
-    <title-intro language="fr" format="text/plain">Céréales et légumineuses</title-intro>
-    <title-main language="fr" format="text/plain">Spécification et méthodes d'essai</title-main>
-    <title-part language="fr" format="text/plain">Riz</title-part>
-  </title>
+    <bibdata type="standard">
+    <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
+    <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
+    <title type="title-part" language="en" format="text/plain">Rice</title>
+    <title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
+    <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
+    <title type="title-part" language="fr" format="text/plain">Riz</title>
   <docidentifier type="iso">ISO/PreCD3 17301-1</docidentifier>
-  <docidentifier type="iso-structured">
-    <project-number part="1">ISO/PreCD3 17301</project-number>
-  </docidentifier>
   <docidentifier type="iso-tc">17301</docidentifier>
   <date type="published"><on>2011</on></date>
   <date type="accessed"><on>2012</on></date>
@@ -62,16 +55,22 @@ RSpec.describe IsoDoc::Iso::Metadata do
       </organization>
     </owner>
   </copyright>
+  <ext>
+  <doctype>international-standard</doctype>
   <editorialgroup>
     <technical-committee number="34">Food products</technical-committee>
     <subcommittee number="4">Cereals and pulses</subcommittee>
     <workgroup number="3">Rice Group</workgroup>
     <secretariat>GB</secretariat>
   </editorialgroup>
+  <structuredidentifier>
+    <project-number part="1">ISO/PreCD3 17301</project-number>
+  </structuredidentifier>
+  </ext>
 </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=>"Riz", :docsubtitlepartlabel=>"Partie&nbsp;1", :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=>"Rice", :doctitlepartlabel=>"Part&nbsp;1", :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"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :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=>"Riz", :docsubtitlepartlabel=>"Partie&nbsp;1", :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=>"Rice", :doctitlepartlabel=>"Part&nbsp;1", :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", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stage_int=>30, :stageabbr=>"PreCD3", :tc=>"TC 34", :tc_docnumber=>"17301", :unpublished=>true, :wg=>"WG 3"}
 OUTPUT
   end
 
@@ -82,21 +81,18 @@ OUTPUT
     INPUT
   expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <bibdata type="international-standard">
+    <bibdata type="standard">
   <title>
-    <title-intro language="en" format="text/plain">Cereals and pulses</title-intro>
-    <title-main language="en" format="text/plain">Specifications and test methods</title-main>
-    <title-part language="en" format="text/plain">Rice</title-part>
+    <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
+    <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
+    <title type="title-part" language="en" format="text/plain">Rice</title>
   </title>
   <title>
-    <title-intro language="fr" format="text/plain">Céréales et légumineuses</title-intro>
-    <title-main language="fr" format="text/plain">Spécification et méthodes d'essai</title-main>
-    <title-part language="fr" format="text/plain">Riz</title-part>
+    <title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
+    <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
+    <title type="title-part" language="fr" format="text/plain">Riz</title>
   </title>
   <docidentifier type="iso">ISO/IEC/CD 17301-1-3</docidentifier>
-    <docidentifier type="iso-structured">
-    <project-number part="1" subpart="3">ISO/IEC/CD 17301</project-number>
-  </docidentifier>
   <docidentifier type="iso-tc">17301</docidentifier>
   <contributor>
     <role type="author"/>
@@ -134,6 +130,8 @@ OUTPUT
     <locality type="clause"><referenceFrom>3.1</referenceFrom></locality>
     <docidentifier>IEC 8121</docidentifier>
   </relation>
+  <ext>
+  <doctype>international-standard</doctype>
   <editorialgroup>
     <technical-committee number="34" type="ABC">Food products</technical-committee>
     <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
@@ -141,10 +139,14 @@ OUTPUT
   </editorialgroup>
   <ics><code>1.2.3</code></ics>
   <ics><code>1.2.3</code></ics>
+    <structuredidentifier>
+    <project-number part="1" subpart="3">ISO/IEC/CD 17301</project-number>
+  </strucuredidentifier>
+  </ext>
 </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=>"Riz", :docsubtitlepartlabel=>"Partie&nbsp;1&ndash;3", :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=>"Rice", :doctitlepartlabel=>"Part&nbsp;1&ndash;3", :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"}
+{:agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :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=>"Riz", :docsubtitlepartlabel=>"Partie&nbsp;1&ndash;3", :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=>"Rice", :doctitlepartlabel=>"Part&nbsp;1&ndash;3", :doctype=>"International Standard", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :revdate=>nil, :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"60", :stage_int=>60, :stageabbr=>"IS", :tc=>"ABC 34", :tc_docnumber=>"17301", :unpublished=>false, :wg=>"GHI 3"}
 OUTPUT
   end
 

data/spec/isodoc/postproc_spec.rb

@@ -9,9 +9,9 @@ RSpec.describe IsoDoc do
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata>
         <title>
-            <title-intro language="en" format="text/plain">Cereals and pulses</title-intro>
-    <title-main language="en" format="text/plain">Specifications and test methods</title-main>
-    <title-part language="en" format="text/plain">Rice</title-part>
+            <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
+    <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
+    <title type="title-part" language="en" format="text/plain">Rice</title>
   </title>
   </bibdata>
     <preface><foreword>
@@ -35,9 +35,9 @@ RSpec.describe IsoDoc do
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata>
         <title>
-            <title-intro language="en" format="text/plain">Cereals and pulses</title-intro>
-    <title-main language="en" format="text/plain">Specifications and test methods</title-main>
-    <title-part language="en" format="text/plain">Rice</title-part>
+            <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
+    <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
+    <title type="title-part" language="en" format="text/plain">Rice</title>
   </title>
   </bibdata>
     <preface><foreword>
@@ -485,7 +485,7 @@ RSpec.describe IsoDoc do
          <p class="MsoNormal">Hello</p>
          <p class="MsoNormal">Key</p>
          <p class="MsoNormal"><b>Key</b></p><div class="figdl"><table class="figdl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;" class="MsoNormal"><p class="MsoNormal">A</p></p></td><td valign="top"><p class="MsoNormal">B</p></td></tr></table></div>
-       </div>
+         <p class="FigureTitle" align="center">Figure A.1</p></div>
              </div>
            </div>
            <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>

data/spec/spec_helper.rb

@@ -89,11 +89,7 @@ HDR
 BLANK_HDR = <<~"HDR"
 <?xml version="1.0" encoding="UTF-8"?>
 <iso-standard xmlns="http://riboseinc.com/isoxml">
-<bibdata type="article">
-  <title>
-  </title>
-  <title>
-  </title>
+<bibdata type="standard">
   <contributor>
     <role type="author"/>
     <organization>
@@ -123,11 +119,14 @@ BLANK_HDR = <<~"HDR"
       </organization>
     </owner>
   </copyright>
+  <ext>
+    <doctype>article</doctype>
   <editorialgroup>
     <technical-committee/>
     <subcommittee/>
     <workgroup/>
   </editorialgroup>
+  </ext>
 </bibdata>
 HDR
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,42 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
-- !ruby/object:Gem::Dependency
-  name: iev
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: iev
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: |
   metanorma-iso lets you write ISO standards in AsciiDoc syntax.
 
@@ -274,7 +274,6 @@ files:
 - docs/outputs.adoc
 - docs/quickstart.adoc
 - docs/replacing-asciidoc.adoc
-- docs/styling-output-html.adoc
 - docs/styling-output-msword.adoc
 - lib/asciidoctor/iso/base.rb
 - lib/asciidoctor/iso/biblio.rng
@@ -290,6 +289,7 @@ files:
 - lib/asciidoctor/iso/validate_requirements.rb
 - lib/asciidoctor/iso/validate_section.rb
 - lib/asciidoctor/iso/validate_style.rb
+- lib/isodoc/iso/base_convert.rb
 - lib/isodoc/iso/html/header.html
 - lib/isodoc/iso/html/html_iso_intro.html
 - lib/isodoc/iso/html/html_iso_titlepage.html
@@ -302,6 +302,9 @@ files:
 - lib/isodoc/iso/html/word_iso_titlepage.html
 - lib/isodoc/iso/html/wordstyle.scss
 - lib/isodoc/iso/html_convert.rb
+- lib/isodoc/iso/i18n-en.yaml
+- lib/isodoc/iso/i18n-fr.yaml
+- lib/isodoc/iso/i18n-zh-Hans.yaml
 - lib/isodoc/iso/metadata.rb
 - lib/isodoc/iso/word_convert.rb
 - lib/metanorma-iso.rb
@@ -372,7 +375,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/docs/styling-output-html.adoc

@@ -1,37 +0,0 @@
-= How can I style the resulting HTML output?
-
-[TIP]
-====
-* Clone the metanorma-sample gem: https://github.com/metanorma/metanorma-sample.
-* Edit the `html_sample_titlepage.html` and `html_sample_intro.html` pages to match your organisation's branding.
-** Leave the Liquid Template instructions alone (`{{`, `{%`) unless you know what you're doing with them: they are how the pages are populated with metadata.
-* Edit the `default_fonts()` method in your `IsoDoc::...::HtmlConvert` class, to match your desired fonts.
-* Edit the `default_file_locations()` method in your `IsoDoc::...::HtmlConvert` class, to match your desired stylesheets and HTML templates.
-* Edit the `htmlstyle.scss` stylesheet to match your organisation's branding. The classes already in place there are used to style existing blocks of text; refer to the sample documents included in the gem (`spec/examples`) for their use.
-====
-
-Styling of output is intended to be configurable.
-HTML stylesheets are expressed in https://sass-lang.com/guide[SCSS], with their fonts populated through the `default_fonts()` method in the `IsoDoc::...::HtmlConvert` class.
-Frontispiece content is templated, populated from the metadata parsed in the `IsoDoc::...::Metadata` class, via https://shopify.github.io/liquid/[Liquid templates].
-The default stylesheets and HTML templates themselves are nominated in the `default_file_locations()` method in the `IsoDoc::...::HtmlConvert` class.
-That means you can change the styling of output documents readily, so long as you are aware of the functionality of the stylesheet.
-
-* Styling information is stored in the `.../lib/isodoc/html` folder of the gem, and applies to both Word and HTML content. For HTML content, the relevant files are `html_..._titlepage.html` (title page HTML template), `html_..._intro.html` (introductory HTML template, typically restricted to Table of Contents), `scripts.html` (Javascript scripts), and `htmlstyle.scss` (the HTML stylesheet).
-* The styling files to be loaded in are set in the `default_file_locations()` method of `IsoDoc::...::HtmlConvert`. The files can be overridden through document variables in the Asciidoc document.
-* Additional files (e.g. logos) can be loaded in the `initialize()` method of `IsoDoc::...::HtmlConvert`; for them to be access during document generation, they need to be copied to the working directory. (They can be removed subsequently by adding them to the `@files_to_delete` array. All image files are copied into an `_html` subdirectory.)
-* The HTML templates are populated through Liquid Templates: variables in `{{` correspond to the hash keys for metadata extracted in `IsoDoc::...::Metadata`, and its superclass `IsoDoc::Metadata` in the isodoc gem.
-* The SCSS stylesheets treat fonts as variables. Those variables are set in `default_fonts()`, which generates variable assignments for SCSS. Stylesheets normally recognise three fonts: `$bodyfont` for body text, `$headerfont` for headers and captions (which may be the same font as `$bodyfont`), and `$monospacefont` for monospace text. Note that `default_fonts()` takes the options passed to initialise `HtmlConvert` as a paremeter; the document language and script can be used to make different font choices for different document scripts. (The existing gems refer to `Latn`, Latin script, and `Hans`, Simplified Chinese script.)
-* Javascript scripts are populated in `scripts.html`; the scripts already in place in any gem you modify are in live use, and you should work out what they do before removing them. The AnchorJS script, for example, is used to generate navigable anchors in the document.
-* Additional scripts and fonts may be loaded in the document head through the `html_head()` method of  `IsoDoc::...::HtmlConvert`. The existing gems use the document head to load Jquery, the Table of Contents generation script, Google Fonts, and Font Awesome.
-* The classes in the SCSS stylesheet correspond to static HTML content in the HTML templates, and dynamic HTML content in the `IsoDoc::...::HtmlConvert` class, and its superclasses `IsoDoc::HtmlConvert` and `IsoDoc::Common` in the isodoc gem.
-
-An HTML document is populated as follows:
-
-* HTML Head wrapper (in `IsoDoc::HtmlConvert`)
-** `html_head()` content
-** `@htmlstylesheet` CSS stylesheet (expected to be in SCSS, generated from SCSS in the `generate_css()` method of `Isodoc::HtmlConvert`).
-* HTML Body
-** `@htmlcoverpage` HTML template (optional, corresponds to `html_..._titlepage.html`)
-** `@htmlintropage` HTML template (optional, corresponds to `html_..._intro.html`)
-** Document proper (converted from Standoc XML)
-** `@scripts` Javascript Scripts (optional, corresponds to `scripts.html`)