metanorma-iso 1.0.1 → 1.0.2

data/docs/guidance.adoc

@@ -204,13 +204,14 @@ NOTE: The starch of waxy rice consists almost entirely of amylopectin. The kerne
 and Note 1 to entry is not included here
 --
 
-The requirement that the source of a term be given in a citation also applies when the source is a term bank, such as http://www.electropedia.org[IEV]. By ISO convention, IEV references are not included in the bibliography, but for consistency and validation purposes, the IEV should be cited as a normal reference, with the term given as a clause, and the source should be named as IEV in the bibliography. The XML encoding of the document will include the IEV reference, substituting a canonical form of the reference in the bibliography; the output rendering of the document will drop the reference from the bibliography. For example:
+The requirement that the source of a term be given in a citation also applies when the source is a term bank, such as http://www.electropedia.org[IEV]. Formally, IEV references should be cited as `IEC 60050-nnn:2011`, where `n` is the top-level clause; e.g. `IEC 60050-113:2011, 113-01-07. For convenience, this gem requires all Electropedia references to be to a single reference, named IEV in the normative references. In rendering the Asciidoctor into ISO XML, this reference will be replaced by the various required IEC 60050-nnn:2001 references.
 
 [source,asciidoc]
 --
 [.source]
 <<ievtermbank,clause="103-01-02">>
-....
+
+...
 
 [bibliography]
 * [[[ievtermbank,IEV]]], _IEV: Electropedia_
@@ -434,3 +435,26 @@ It includes:
 --
 
 * https://asciidoctor.org/docs/user-manual/#using-attributes-set-assign-and-reference[Attribute references] can be used as template variables in a document: if your document contains the text `{foo}`, you can assign the value to be populated in `{foo}` by setting it as a document attribute in the Asciidoctor header: `:foo: this is the text to replace "foo"`. In the Rice Model document example, document attributes are used to provide the Subcommittee and Technical Committee names, which are populated as template entries in the document foreword.
+
+* List items can contain other blocks in Asciidoctor, through concatenating blocks; e.g.
++
+[source.asciidoc]
+--
+* List
++
+|===
+| Contains | A table
+
+|===
+--
++
+However, downstream renderers may not be able to cope with embedding blocks within list items. In particular, Word will force a carriage return between a list item, and a list or table contained in the item. So output like the following, with the list number flush with the embedded block, is not possible in Word (though it is in HTML):
+
+....
+a)  1. Text
+b)  |-------|------ |
+    | table | table |
+    |---------------|
+c)  Definition Term   Definition
+    Definition Term   Definition
+....

data/docs/quickstart.adoc

@@ -321,7 +321,7 @@ NOTE: The starch of waxy rice consists almost entirely of amylopectin. The kerne
 and Note 1 to entry is not included here
 --
 
-Term banks such as the http://www.electropedia.org[IEV] must be treated like any other document, with terms treated as clauses; e.g. `<<IEV,clause 103-01-01>>`. The IEV by ISO convention will be left out of the output rendering of ISO standards.
+Term banks such as the http://www.electropedia.org[IEV] must be treated like any other document, with terms treated as clauses; e.g. `<<IEV,clause "103-01-01">>`. The IEV must be explictly referenced with that label; when the XML is generated, it will be replaced by the official references to `IEC 60050-nnn:2001` standards documents.
 
 === References (Normative, Informative)
 

data/lib/asciidoctor/iso/isodoc.rng

@@ -956,6 +956,11 @@
   </define>
   <define name="li">
     <element name="li">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="paragraph-with-footnote"/>
       </oneOrMore>
@@ -999,7 +1004,9 @@
   </define>
   <define name="dt">
     <element name="dt">
-      <ref name="TextElement"/>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="dd">

data/lib/asciidoctor/iso/isostandard.rng

@@ -548,10 +548,17 @@
     </define>
     <define name="li">
       <element name="li">
-        <oneOrMore>
-          <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
-          <ref name="BasicBlock"/>
-        </oneOrMore>
+        <group>
+          <optional>
+            <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
+            <attribute name="id">
+              <data type="ID"/>
+            </attribute>
+          </optional>
+          <oneOrMore>
+            <ref name="BasicBlock"/>
+          </oneOrMore>
+        </group>
         <!-- exclude figures? -->
       </element>
     </define>

data/lib/asciidoctor/iso/section.rb

@@ -8,11 +8,7 @@ module Asciidoctor
         a = { id: Standoc::Utils::anchor_or_uuid(node) }
         noko do |xml|
           case sectiontype(node)
-          when "introduction" then
-            if node.level == 1 then introduction_parse(a, xml, node)
-            else
-              clause_parse(a, xml, node)
-            end
+          when "introduction" then introduction_parse(a, xml, node)
           when "patent notice" then patent_notice_parse(xml, node)
           when "scope" then scope_parse(a, xml, node)
           when "normative references" then norm_ref_parse(a, xml, node)

data/lib/asciidoctor/iso/validate.rb

@@ -146,7 +146,7 @@ module Asciidoctor
 
   def locality_erefs_validate(root)
     root.xpath("//eref[locality]").each do |t|
-      unless /:[ ]?\d+{4}$/.match t["citeas"]
+      unless /^IEV$|:[ ]?(\d+{4}|--)$/.match t["citeas"]
         warn "ISO: undated reference #{t['citeas']} should not contain "\
           "specific elements"
       end

data/lib/asciidoctor/iso/validate_section.rb

@@ -181,7 +181,7 @@ module Asciidoctor
         root.xpath("//figure[image][not(title)]").each do |node|
           style_warning(node, "Figure should have title", nil)
         end
-        root.xpath("//table[not(title)]").each do |node|
+        root.xpath("//table[not(name)]").each do |node|
           style_warning(node, "Table should have title", nil)
         end
       end

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "1.0.1".freeze
+    VERSION = "1.0.2".freeze
   end
 end

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

@@ -1,14 +1,11 @@
 <p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:
-normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</span></b><b
+normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</span></b><b
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
 
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
-style='mso-no-proof:yes'>{{ agency }}&nbsp;</span><span lang="EN-GB"><span
-style='mso-no-proof:yes'>{{ editorialgroup | join: "/" }}</span></p>
+style='mso-no-proof:yes'>{{ agency }}&nbsp;{{ editorialgroup | join: "/" }}</span></p>
 
-<p class="MsoNormal" align="right" style='margin-bottom:100.0pt;text-align:right'><a
-name="CVP_Secretariat_Loca"><span lang="EN-GB">Secretariat</span></a><span
-lang="EN-GB">: <span style='mso-no-proof:yes'>{{ secretariat }}</span></span></p>
+<p class="MsoNormal" align="right" style='margin-bottom:100.0pt;text-align:right'><span lang="EN-GB">Secretariat: <span style='mso-no-proof:yes'>{{ secretariat }}</span></span></p>
 
 <p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt'><b
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:16.0pt'>{{ doctitle }}

data/lib/isodoc/iso/html_convert.rb

@@ -113,6 +113,26 @@ module IsoDoc
           annex_names1(c, "#{num}.#{i + 1}", level + 1)
         end
       end
+
+      def eref_localities1_zh(target, type, from, to)
+        subsection = from&.text&.match(/\./)
+        ret = ", 第#{from.text}" if from
+        ret += "–#{to}" if to
+        loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
+        ret += " #{loc}" unless subsection && type == "clause" || target.match(/^IEV$/)
+        ret
+      end
+
+      def eref_localities1(target, type, from, to, lang = "en")
+        subsection = from&.text&.match(/\./)
+        return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
+        ret = ","
+        loc = @locality[type] || type.sub(/^locality:/, "").capitalize
+        ret += " #{loc}" unless subsection && type == "clause" || target.match(/^IEV$/)
+        ret += " #{from.text}" if from
+        ret += "–#{to.text}" if to
+        l10n(ret)
+      end
     end
   end
 end

data/lib/isodoc/iso/metadata.rb

@@ -38,12 +38,12 @@ module IsoDoc
       end
 
       def docid(isoxml, _out)
-        dn = docnumber(isoxml)
+        dn = docnumber(isoxml) # e.g. ISO 8601, ISO/IEC DIR 2
         docstatus = get[:stage]
         if docstatus
           abbr = get[:stageabbr]
           docstatus = get[:stage]
-          (docstatus.to_i < 60) && dn = abbr + " " + dn
+          (docstatus.to_i < 60) && dn = dn.sub(/ /, " #{abbr} ")
         end
         set(:docnumber, dn)
       end

data/lib/isodoc/iso/word_convert.rb

@@ -136,6 +136,26 @@ module IsoDoc
           annex_names1(c, "#{num}.#{i + 1}", level + 1)
         end
       end
+
+      def eref_localities1_zh(target, type, from, to)
+        subsection = from&.text&.match(/\./)
+        ret = ", 第#{from.text}" if from
+        ret += "–#{to}" if to
+        loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
+        ret += " #{loc}" unless subsection && type == "clause" || target.match(/^IEV$/)
+        ret
+      end
+
+      def eref_localities1(target, type, from, to, lang = "en")
+        subsection = from&.text&.match(/\./)
+        return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
+        ret = ","
+        loc = @locality[type] || type.sub(/^locality:/, "").capitalize
+        ret += " #{loc}" unless subsection && type == "clause" || target.match(/^IEV$/)
+        ret += " #{from.text}" if from
+        ret += "–#{to.text}" if to
+        l10n(ret)
+      end
     end
   end
 end

data/metanorma-iso.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 0.8.8"
+  spec.add_dependency "isodoc", "~> 0.8.9"
   spec.add_dependency "iev", "~> 0.2.0"
   spec.add_dependency "relaton", "~> 0.1.3"
   spec.add_dependency "metanorma-standoc", "~> 1.0.0"

data/spec/asciidoctor-iso/base_spec.rb

@@ -5,15 +5,13 @@ RSpec.describe Asciidoctor::ISO do
     expect(Asciidoctor::ISO::VERSION).not_to be nil
   end
 
-=begin
   it "generates output for the Rice document" do
-    system "cd spec/examples; rm -f rice.xml; rm -f rice.doc; rm -f rice.html; rm -f rice_alt.html; asciidoctor --trace -b iso -r 'asciidoctor-iso' rice.adoc; cd ../.."
+    system "cd spec/examples; rm -f rice.xml; rm -f rice.doc; rm -f rice.html; rm -f rice_alt.html; asciidoctor --trace -b iso -r 'metanorma-iso' rice.adoc; 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
-=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/section_spec.rb

@@ -12,8 +12,6 @@ RSpec.describe Asciidoctor::ISO do
 
       === Introduction Subsection
 
-      === Patent Notice
-
       == Scope
 
       Text
@@ -40,6 +38,8 @@ RSpec.describe Asciidoctor::ISO do
 
       === Clause 4.2
 
+      == Terms and Definitions
+
       [appendix]
       == Annex
 
@@ -85,6 +85,10 @@ RSpec.describe Asciidoctor::ISO do
        <clause id="_" inline-header="false" obligation="normative">
          <title>Clause 4.2</title>
        </clause></clause>
+       <clause id="_" inline-header="false" obligation="normative">
+          <title>Terms and Definitions</title>
+       </clause>
+
 
        </sections><annex id="_" inline-header="false" obligation="normative">
          <title>Annex</title>
@@ -118,8 +122,6 @@ RSpec.describe Asciidoctor::ISO do
 
       === Introduction Subsection
 
-      === Patent Notice
-
       [heading=scope]
       == Σκοπός
 

data/spec/asciidoctor-iso/validate_spec.rb

@@ -136,6 +136,32 @@ it "warns that undated reference has locality" do
   INPUT
 end
 
+it "do not warn that undated IEV reference has locality" do
+  expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.not_to output(/undated reference IEV should not contain specific elements/).to_stderr
+  #{VALIDATING_BLANK_HDR}
+
+  == Scope
+  <<iev,clause=1>>
+
+  [bibliography]
+  == Normative References
+  * [[[iev,IEV]]] _Standard_
+  INPUT
+end
+
+it "do not warn that in print has locality" do
+  expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.not_to output(/undated reference ISO 123 should not contain specific elements/).to_stderr
+  #{VALIDATING_BLANK_HDR}
+
+  == Scope
+  <<iev,clause=1>>
+
+  [bibliography]
+  == Normative References
+  * [[[iev,ISO 123:--]]] _Standard_
+  INPUT
+end
+
 it "warns of Non-reference in bibliography" do
   expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/no anchor on reference/).to_stderr
   #{VALIDATING_BLANK_HDR}

data/spec/assets/iso.doc

@@ -1,7 +1,7 @@
 MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----=_NextPart_9c41a86f.50f8.4c65"
+Content-Type: multipart/related; boundary="----=_NextPart_f1bb7f88.630f.42d2"
 
-------=_NextPart_9c41a86f.50f8.4c65
+------=_NextPart_f1bb7f88.630f.42d2
 Content-Location: file:///C:/Doc/spec/assets/iso.htm
 Content-Type: text/html; charset="utf-8"
 
@@ -756,7 +756,7 @@ span.note_label, span.example_label, td.example_label, td.note_label {
   <body lang="EN-US" link="blue" vlink="#954F72" xml:lang="EN-US">
     <div class="WordSection1"><p class="MsoNormal" align="right" style="text-align:right">
   <b style="mso-bidi-font-weight:&#10;normal">
-    <span lang="EN-GB" style="font-size:14.0pt;mso-no-proof:yes" xml:lang="EN-GB">&#xA0;:(E) </span>
+    <span lang="EN-GB" style="font-size:14.0pt;mso-no-proof:yes" xml:lang="EN-GB">:(E) </span>
   </b>
   <b style="mso-bidi-font-weight:normal">
     <span lang="EN-GB" style="font-size:14.0pt" xml:lang="EN-GB">
@@ -767,16 +767,10 @@ span.note_label, span.example_label, td.example_label, td.note_label {
 
 <p class="MsoNormal" align="right" style="text-align:right">
   <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">&#xA0;</span>
-  <span lang="EN-GB" xml:lang="EN-GB">
-    <span style="mso-no-proof:yes"></span>
-  </span>
 </p>
 
 <p class="MsoNormal" align="right" style="margin-bottom:100.0pt;text-align:right">
-  <a name="CVP_Secretariat_Loca" id="CVP_Secretariat_Loca">
-    <span lang="EN-GB" xml:lang="EN-GB">Secretariat</span>
-  </a>
-  <span lang="EN-GB" xml:lang="EN-GB">: <span style="mso-no-proof:yes">XXXX</span></span>
+  <span lang="EN-GB" xml:lang="EN-GB">Secretariat: <span style="mso-no-proof:yes">XXXX</span></span>
 </p>
 
 <p class="MsoNormal" align="left" style="text-align:left;line-height:18.0pt;margin-bottom:0.0pt">
@@ -850,11 +844,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="#_Toc349261152">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<a href="#_Toc663335066">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 _Toc349261152 \h </span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc663335066 \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>
 
@@ -887,7 +881,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
 </html>
 
 
-------=_NextPart_9c41a86f.50f8.4c65
+------=_NextPart_f1bb7f88.630f.42d2
 Content-Location: file:///C:/Doc/spec/assets/iso_files/filelist.xml
 Content-Transfer-Encoding: base64
 Content-Type: application/xml
@@ -897,7 +891,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
 bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
 L3htbD4K
 
-------=_NextPart_9c41a86f.50f8.4c65
+------=_NextPart_f1bb7f88.630f.42d2
 Content-Location: file:///C:/Doc/spec/assets/iso_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
@@ -1090,4 +1084,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
 ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
 bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
 
-------=_NextPart_9c41a86f.50f8.4c65--
+------=_NextPart_f1bb7f88.630f.42d2--

data/spec/examples/rice.adoc

@@ -75,8 +75,6 @@ Rice is a permanent host to a considerable microflora; most of these microorgani
 Storage losses have been estimated as being an average of 5 %, and as much as 30 %, especially in countries with climates favourable to the rapid development of agents of deterioration and where storage techniques are poorly developed, such as developing countries in the damp tropics. The magnitude of these figures highlights the need to promote throughout the world a rapid improvement in techniques of conservation. 
 
 
-=== Patent Notice
-
 The International Organization for Standardization (ISO) draws attention to the fact that it is claimed that compliance with this document may involve the use of a patent concerning sample dividers given in <<AnnexA>> and shown in <<figureA-1>>. 
 
 ISO takes no position concerning the evidence, validity and scope of this patent right. 

data/spec/examples/rice.preview.html

@@ -439,11 +439,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="toc" class="toc">
 <div id="toctitle">Table of Contents</div>
 <ul class="sectlevel1">
-<li><a href="#_introduction">Introduction</a>
-<ul class="sectlevel2">
-<li><a href="#_patent_notice">Patent Notice</a></li>
-</ul>
-</li>
+<li><a href="#_introduction">Introduction</a></li>
 <li><a href="#_scope">1. Scope</a></li>
 <li><a href="#_normative_references">Normative References</a></li>
 <li><a href="#_terms_and_definitions">2. Terms and Definitions</a>
@@ -583,8 +579,6 @@ is a worldwide federation of national standards bodies (ISO member bodies). The
 <div class="paragraph">
 <p>Storage losses have been estimated as being an average of 5 %, and as much as 30 %, especially in countries with climates favourable to the rapid development of agents of deterioration and where storage techniques are poorly developed, such as developing countries in the damp tropics. The magnitude of these figures highlights the need to promote throughout the world a rapid improvement in techniques of conservation.</p>
 </div>
-<div class="sect2">
-<h3 id="_patent_notice">Patent Notice</h3>
 <div class="paragraph">
 <p>The International Organization for Standardization (ISO) draws attention to the fact that it is claimed that compliance with this document may involve the use of a patent concerning sample dividers given in <a href="#AnnexA">Annex A</a> and shown in <a href="#figureA-1">Figure 1</a>.</p>
 </div>
@@ -605,7 +599,6 @@ World<br>
 </div>
 </div>
 </div>
-</div>
 <div class="sect1">
 <h2 id="_scope">1. Scope</h2>
 <div class="sectionbody">
@@ -1854,7 +1847,7 @@ end</code></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2018-06-27 19:39:11 AEST
+Last updated 2018-08-19 19:05:52 AEST
 </div>
 </div>
 <script type="text/x-mathjax-config">