metanorma-iso 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2241f70d9971c46ab77a6eafd9dc9569111b88b2a949961f5a4e8450f93c273a
-  data.tar.gz: dcbe613d07eb914598794c66d3291391fc01820c85ee9332d74f20ed892e3ae7
+  metadata.gz: 291654144418257ce85f6e706e00aef3bf5b3f94c756d1dab58a4ab367778324
+  data.tar.gz: 55b5b74fab210b29de23d0fbbaec7c686186cfdc4fe69bb30a5e9eff820dbe31
 SHA512:
-  metadata.gz: ca150d0a8b852937ef4acdd684dd5ea341143d5e2696491324b22f1222b8e51a53e2ff12e4d087e7a2d00aab53b97b2cfd3f49e8e5c028ad5b5fb35ee55f61bf
-  data.tar.gz: 02a38f34015a38879c103316bcd28a6742b6eee4560bff7a19bacfbbf556bc4ee615e2a3d45a944c73f646ebefb829885fc24c06d0b67fa80862dd359c5bec9d
+  metadata.gz: 458f173ae5efb03bcde539daea3939f493d7e3cef5f0bd1bc9d8ddb6f9812172341c45666d8c55a203a5095f55eec3e55b10536d746632cd12256fda08e80e7e
+  data.tar.gz: bd7dcbc1efa5949bbc42bb0933ff913128e2a101862846e076f8adf9ba50371924e028505fee8e15384deba48e03f484850cce6e83575ddbc314f07f3dc61a83

data/README.adoc

@@ -160,6 +160,7 @@ For automated bibliography integration, see the https://github.com/riboseinc/met
 
 The gem uses the document attributes defined for metanorma-standoc (see
 the https://github.com/riboseinc/metanorma-model-standoc/blob/master/README.adoc[metanorma-standoc README]).
+
 The following document attributes are specific to ISO:
 
 `:tc-docnumber:`:: The document number assigned by the Technical committee

data/lib/asciidoctor/iso/isostandard.rng

@@ -744,6 +744,9 @@
     </define>
     <define name="preface">
       <element name="preface">
+        <optional>
+          <ref name="preface_abstract"/>
+        </optional>
         <ref name="foreword"/>
         <optional>
           <ref name="introduction"/>
@@ -811,6 +814,11 @@
       </optional>
     </element>
   </define>
+  <define name="preface_abstract">
+    <element name="abstract">
+      <ref name="Basic-Section"/>
+    </element>
+  </define>
   <define name="foreword">
     <element name="foreword">
       <ref name="Basic-Section"/>

data/lib/asciidoctor/iso/validate_section.rb

@@ -160,16 +160,6 @@ module Asciidoctor
         scope.nil? || style_warning(scope, SCOPE_WARN, nil)
       end
 
-      def sourcecode_style(root)
-        root.xpath("//sourcecode").each do |x|
-          callouts = x.elements.select { |e| e.name == "callout" }
-          annotations = x.elements.select { |e| e.name == "annotation" }
-          if callouts.size != annotations.size
-            warn "#{x['id']}: mismatch of callouts and annotations"
-          end
-        end
-      end
-
       ASSETS_TO_STYLE =
         "//termsource | //formula | //termnote | //p | //li[not(p)] | "\
         "//dt | //dd[not(p)] | //td[not(p)] | //th[not(p)]".freeze
@@ -177,15 +167,6 @@ module Asciidoctor
       NORM_BIBITEMS =
         "//references[title = 'Normative References']/bibitem".freeze
 
-      def asset_title_style(root)
-        root.xpath("//figure[image][not(name)]").each do |node|
-          style_warning(node, "Figure should have title", nil)
-        end
-        root.xpath("//table[not(name)]").each do |node|
-          style_warning(node, "Table should have title", nil)
-        end
-      end
-
       def norm_bibitem_style(root)
         root.xpath(NORM_BIBITEMS).each do |b|
           if b.at(Standoc::Converter::ISO_PUBLISHER_XPATH).nil?

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -22,9 +22,13 @@ name="CVP_Secretariat_Loca">Secretariat</a>: {{ secretariat }}</p>
 
 <div class="doctitle-fr"><span class="title">{{ docsubtitleintro }}</span> <span class="subtitle">{{ docsubtitlemain }}</span> <span class="part">{{ docsubtitlepart }}</span></div>
 
-<div class="coverpage_docstage"><p>{{ stageabbr }} stage</p></div>
+<div class="coverpage_docstage">
+  {% if unpublished %}
+  <p>{{ stageabbr }} stage</p>
+  {% endif %}
+</div>
 
-{% if stage and stage_int < 60 %}
+{% if unpublished %}
 <div class="coverpage_warning">
 
 <p>Warning for WDs

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

@@ -18,7 +18,6 @@
         return $heading[0].tagName.toLowerCase();
       }
       });
-      
   </script>
 
   <script>

data/lib/isodoc/iso/html/word_iso_titlepage.html

@@ -33,13 +33,13 @@ margin-left:4.25pt;margin-right:4.25pt'>
 
 <p class="MsoNormal" align="center" style='text-align:center;border:none;
 mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-lang="EN-GB" style='font-size:40.0pt'>{{ stageabbr }} stage<o:p></o:p></span></p>
+lang="EN-GB" style='font-size:40.0pt'>{% if unpublished %}{{ stageabbr }} stage{% endif %}<o:p></o:p></span></p>
 
 </div>
 
 <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
 
-{% if stage and stage_int < 60 %}
+{% if unpublished %}
 
 <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
 mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;

data/lib/isodoc/iso/metadata.rb

@@ -29,9 +29,11 @@ module IsoDoc
 
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))
+        set(:unpublished, false)
         if docstatus
           set(:stage, docstatus.text)
           set(:stage_int, docstatus.text.to_i)
+          set(:unpublished, docstatus.text.to_i > 0 && docstatus.text.to_i < 60)
           abbr = stage_abbrev(docstatus.text, isoxml&.at(ns("//bibdata/status/iteration"))&.text,
                               isoxml&.at(ns("//version/draft"))&.text)
           set(:stageabbr, abbr)

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.0.10".freeze
+    VERSION = "1.0.11".freeze
   end
 end

data/spec/assets/iso.doc

@@ -1,7 +1,7 @@
 MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----=_NextPart_0e69eebe.33ff.4624"
+Content-Type: multipart/related; boundary="----=_NextPart_0262872e.6d12.4917"
 
-------=_NextPart_0e69eebe.33ff.4624
+------=_NextPart_0262872e.6d12.4917
 Content-Location: file:///C:/Doc/iso.htm
 Content-Type: text/html; charset="utf-8"
 
@@ -780,7 +780,7 @@ span.note_label, span.example_label, td.example_label, td.note_label {
 
 <div style="mso-element:para-border-div;border:solid windowtext 1.0pt;&#10;mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;&#10;margin-left:4.25pt;margin-right:4.25pt">
 
-<p class="MsoNormal" align="center" style="text-align:center;border:none;&#10;mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt"><span lang="EN-GB" style="font-size:40.0pt" xml:lang="EN-GB"> stage<p class="MsoNormal"></p></span></p>
+<p class="MsoNormal" align="center" style="text-align:center;border:none;&#10;mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt"><span lang="EN-GB" style="font-size:40.0pt" xml:lang="EN-GB"><p class="MsoNormal"></p></span></p>
 
 </div>
 
@@ -834,11 +834,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="#_Toc365979697">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<a href="#_Toc987694138">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 _Toc365979697 \h </span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc987694138 \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>
 
@@ -871,7 +871,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
 </html>
 
 
-------=_NextPart_0e69eebe.33ff.4624
+------=_NextPart_0262872e.6d12.4917
 Content-Location: file:///C:/Doc/iso_files/filelist.xml
 Content-Transfer-Encoding: base64
 Content-Type: application/xml
@@ -881,7 +881,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
 bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
 L3htbD4K
 
-------=_NextPart_0e69eebe.33ff.4624
+------=_NextPart_0262872e.6d12.4917
 Content-Location: file:///C:/Doc/iso_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
@@ -1074,4 +1074,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
 ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
 bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
 
-------=_NextPart_0e69eebe.33ff.4624--
+------=_NextPart_0262872e.6d12.4917--

data/spec/assets/iso.html

@@ -38,7 +38,7 @@
 <div class="doctitle-fr"><span class="title"></span> <span class="subtitle"></span> <span class="part"></span></div>
 
 <div class="coverpage_docstage">
-  <p> stage</p>
+  
 </div>
 
 
@@ -126,7 +126,6 @@ at the address below or ISO&#x2019;s member body in the country of the requester
         return $heading[0].tagName.toLowerCase();
       }
       });
-      
   </script>
 
   <script>

data/spec/examples/rice.adoc

@@ -14,7 +14,7 @@
 :title-main-fr: Spécification et méthodes d'essai
 :title-part-fr: Riz
 :doctype: international-standard
-:docstage: 60
+:docstage: 30
 :docsubstage: 92
 :draft: 
 :technical-committee-number: 34

data/spec/examples/rice.preview.html

@@ -1847,7 +1847,7 @@ end</code></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2018-09-22 20:44:36 +1000
+Last updated 2018-11-26 22:27:17 +1100
 </div>
 </div>
 <script type="text/x-mathjax-config">

data/spec/isodoc/metadata_spec.rb

@@ -70,7 +70,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
 </version>
 </iso-standard>
 INPUT
-       {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :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", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stage_int=>30, :stageabbr=>"PreCD3", :tc=>"TC 34", :tc_docnumber=>"17301", :updateddate=>"XXX", :wg=>"WG 3"}
+       {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :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"}
 OUTPUT
   end
 
@@ -118,7 +118,7 @@ OUTPUT
   <language>en</language>
   <script>Latn</script>
   <status>
-    <stage>30</stage>
+    <stage>60</stage>
     <substage>92</substage>
   </status>
   <copyright>
@@ -147,7 +147,7 @@ OUTPUT
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :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", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"30", :stage_int=>30, :stageabbr=>"CD", :tc=>"ABC 34", :tc_docnumber=>"17301", :updateddate=>"XXX", :wg=>"GHI 3"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :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"}
 OUTPUT
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor