isodoc 0.8 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95d693408f9924a873e894eddf95b98fa2f3c1b689f1f2d68e0dc6be5a3ad0f
-  data.tar.gz: 1d5ecf55343cdc70c4e83238ee887446295b02d0c5dcf0d005e7e03f2260a80c
+  metadata.gz: d6d2dab4cea8fcb1ace19dc45b56bd22e2760d90e95ace97fa1baccfb9b202fa
+  data.tar.gz: be7c14b98bb593ebcf3e268f0f4b01e4537d3ffb1df91f079bca644ba9540653
 SHA512:
-  metadata.gz: bd3033cb703cf7483e99760c5a9b9baf6b13eb98f92f7218aee037b4062ce0a76e1c7f5203c3a784a3c966d54f573268337d99999b358de32146925d9c225994
-  data.tar.gz: 5b4031816ce73f837abf30b421792eb3501f24c8b09c3c59daa2884312b2402a82dffe5d445ebab00630fe75aab323e50043c32374ab9284defc4a5cc1a74e1b
+  metadata.gz: de177f5b8d07b4e34cb0c35059017bc14d15d6079893a811f6a2f6faa6fc3cb350fd3a9bdc1f93edba8466e0695081eb4da4a376c126bec52bad61934f285ed8
+  data.tar.gz: 66a28cfc65f4d953469a6676515dc532aec51c0a06d971281e9eecc1c1c7fa769b3f635e3ec657d7f07db620ba9bf32d53169b6e6de88a02c54bec629db28fd2

data/Gemfile.lock

@@ -15,7 +15,7 @@ GIT
 PATH
   remote: .
   specs:
-    isodoc (0.7.1)
+    isodoc (0.8)
       asciimath
       html2doc (>= 0.7.1)
       htmlentities (~> 4.3.4)

data/lib/isodoc/class_utils.rb

@@ -1,7 +1,5 @@
-
 module IsoDoc
   module ClassUtils
-
     def date_range(date)
       from = date.at(ns("./from"))
       to = date.at(ns("./to"))
@@ -19,6 +17,13 @@ module IsoDoc
         gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]*\])}, "[xmlns:\\1")
     end
 
+    def liquid(doc)
+      # unescape HTML escapes in doc
+      doc = doc.split(%r<(\{%|\}%)>).each_slice(4).map do |a|
+        a[2].gsub!("&lt;", "<").gsub!("&gt;", ">") if a.size > 2
+        a.join("")
+      end.join("")
+      Liquid::Template.parse(doc)
+    end
   end
-
-end
+end

data/lib/isodoc/function/references.rb

@@ -11,7 +11,7 @@ module IsoDoc::Function
       isodate = b.at(ns("./date[@type = 'published']"))
       iso_allparts = b.at(ns("./allParts"))
       reference = docid_l10n(isocode)
-      reference += ": #{date_range(isodate)}" if isodate
+      reference += ":#{date_range(isodate)}" if isodate
       reference += " (all parts)" if iso_allparts&.text == "true"
       reference
     end
@@ -169,7 +169,7 @@ module IsoDoc::Function
         return ref unless date
         on = date.at(ns("./on"))
         return ref if on&.text == "--"
-        return ref + ": #{date_range(date)}"
+        return ref + ":#{date_range(date)}"
       end
       return "[#{ref}]" if /^\d+$/.match?(ref) && !/^\[.*\]$/.match?(ref)
       ref

data/lib/isodoc/function/section.rb

@@ -125,7 +125,7 @@ module IsoDoc::Function
     end
 
     def terms_defs_title(f)
-      symbols = f.at(".//symbols-abbrevs")
+      symbols = f.at(".//definitions")
       return @termsdefsymbols_lbl if symbols
       @termsdef_lbl
     end
@@ -153,7 +153,7 @@ module IsoDoc::Function
     end
 
     def symbols_abbrevs(isoxml, out, num)
-      f = isoxml.at(ns("//sections/symbols-abbrevs")) or return num
+      f = isoxml.at(ns("//sections/definitions")) or return num
       out.div **attr_code(id: f["id"], class: "Symbols") do |div|
         num = num + 1
         clause_name("#{num}.", @symbols_lbl, div, nil)

data/lib/isodoc/function/terms.rb

@@ -64,5 +64,8 @@ module IsoDoc::Function
       set_termdomain("")
       node.children.each { |n| parse(n, out) }
     end
+
+    def termdocsource_parse(_node, _out)
+    end
   end
 end

data/lib/isodoc/function/to_word_html.rb

@@ -171,8 +171,9 @@ module IsoDoc::Function
         when "termnote" then termnote_parse(node, out)
         when "termexample" then example_parse(node, out)
         when "terms" then terms_parse(node, out)
-        when "symbols-abbrevs" then symbols_parse(node, out)
+        when "definitions" then symbols_parse(node, out)
         when "references" then bibliography_parse(node, out)
+        when "termdocsource" then termdocsource_parse(node, out)
         else
           error_parse(node, out)
         end

data/lib/isodoc/function/utils.rb

@@ -115,13 +115,26 @@ module IsoDoc::Function
       from_xhtml(h1)
     end
 
+    def liquid(doc)
+      self.class.liquid(doc)
+    end
+
+    def liquid(doc)
+      # unescape HTML escapes in doc
+      doc = doc.split(%r<(\{%|%\})>).each_slice(4).map do |a|
+        a[2] = a[2].gsub(/\&lt;/, "<").gsub(/\&gt;/, ">") if a.size > 2
+        a.join("")
+      end.join("")
+      Liquid::Template.parse(doc)
+    end
+
     def populate_template(docxml, _format)
       meta = @meta.get.merge(@labels)
       docxml = docxml.
         gsub(/\[TERMREF\]\s*/, l10n("[#{@source_lbl}: ")).
         gsub(/\s*\[\/TERMREF\]\s*/, l10n("]")).
         gsub(/\s*\[MODIFICATION\]/, l10n(", #{@modified_lbl} &mdash; "))
-      template = Liquid::Template.parse(docxml)
+      template = liquid(docxml)
       template.render(meta.map { |k, v| [k.to_s, v] }.to_h)
     end
   end

data/lib/isodoc/function/xref_sect_gen.rb

@@ -18,7 +18,7 @@ module IsoDoc::Function
         "//references[title = 'Normative References' or title = 'Normative references']")), n, 1)
       n = section_names(d.at(ns("//sections/terms | "\
                                 "//sections/clause[descendant::terms]")), n, 1)
-      n = section_names(d.at(ns("//sections/symbols-abbrevs")), n, 1)
+      n = section_names(d.at(ns("//sections/definitions")), n, 1)
       middle_section_asset_names(d)
       clause_names(d, n)
       termnote_anchor_names(d)
@@ -30,7 +30,7 @@ module IsoDoc::Function
         "//foreword | //introduction | "\
         "//references[title = 'Normative References' or title = 'Normative references'] | "\
         "//sections/terms | "\
-        "//sections/symbols-abbrevs | //clause[parent::sections]"
+        "//sections/definitions | //clause[parent::sections]"
       sequential_asset_names(d.xpath(ns(middle_sections)))
     end
 
@@ -54,7 +54,7 @@ module IsoDoc::Function
       num = num + 1
       @anchors[clause["id"]] =
         { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
-      clause.xpath(ns("./clause | ./term  | ./terms | ./symbols-abbrevs")).
+      clause.xpath(ns("./clause | ./term  | ./terms | ./definitions")).
         each_with_index do |c, i|
         section_names1(c, "#{num}.#{i + 1}", lvl + 1)
       end
@@ -65,7 +65,7 @@ module IsoDoc::Function
       @anchors[clause["id"]] =
         { label: num, level: level, xref: num }
       # subclauses are not prefixed with "Clause"
-      clause.xpath(ns("./clause | ./terms | ./term | ./symbols-abbrevs")).
+      clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
         each_with_index do |c, i|
         section_names1(c, "#{num}.#{i + 1}", level + 1)
       end

data/lib/isodoc/iso/html/header.html

@@ -66,7 +66,7 @@ normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuatio
 <div style='mso-element:header' id=eha>
 
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
 
 </div>
 
@@ -100,14 +100,14 @@ style='mso-tab-count:1'>
 <div style='mso-element:header' id=eh2>
 
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
 
 </div>
 
 <div style='mso-element:header' id=h2>
 
 <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
 
 </div>
 
@@ -179,6 +179,28 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
 
 </div>
 
+<div style='mso-element:footer' id=f4>
+
+<p class=MsoFooter><b style='mso-bidi-font-weight:normal'><span>ICS {{ ics }}<o:p></o:p></span></b></p>
+
+<p class=MsoFooter style='margin-top:0cm'><span lang=EN-AU style='font-size:
+10.0pt;mso-ansi-language:EN-AU'>Price based on </span><!--[if supportFields]><span
+lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
+style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span
+style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
+lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
+style='mso-no-proof:yes'>26</span></span><!--[if supportFields]><span
+lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
+style='mso-element:field-end'></span></span><![endif]--><span lang=EN-AU
+style='font-size:10.0pt;mso-ansi-language:EN-AU'> pages<o:p></o:p></span></p>
+
+<p class=MsoFooter><span lang=EN-AU style='font-size:10.0pt;'>©
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+
+</div>
+
+
+
 </body>
 
 </html>

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

@@ -12,6 +12,7 @@ name="CVP_Secretariat_Loca">Secretariat</a>: {{ secretariat }}</p>
 
 <div class="coverpage_docstage"><p>{{ stageabbr }} stage</p></div>
 
+{% if stage and stage_int < 60 %}
 <div class="coverpage_warning">
 
 <p>Warning for WDs
@@ -26,6 +27,7 @@ an International Standard.</p>
 of this draft are invited to submit, with their comments, notification of any
 relevant patent rights of which they are aware and to provide supporting
 documentation.</p>
+{% endif %}
 
 </div>
 

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

@@ -404,7 +404,7 @@ ul li {
     list-style: none;
   }
   
-  li p:before {
+  ul li p:before {
     content: "—";
     display: inline-block;
     width: 1em;

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

@@ -243,11 +243,11 @@ h2 p {
 }
 
   
-  li {
+  ul li {
     list-style: none;
   }
   
-  li p:before {
+  ul li p:before {
     content: "—";
     display: inline-block;
     width: 1em;

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

@@ -28,6 +28,8 @@ lang="EN-GB" style='font-size:40.0pt'>{{ stageabbr }} stage<o:p></o:p></span></p
 
 <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 %}
+
 <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;
 margin-left:4.25pt;margin-right:4.25pt'>
@@ -53,6 +55,8 @@ relevant patent rights of which they are aware and to provide supporting
 documentation.</span><span lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-size:
 11.0pt'><o:p></o:p></span></p>
 
+{% endif %}
+
 </div>
 
 

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

@@ -820,6 +820,19 @@ div.WordSection2
         mso-paper-source:0;}
 div.WordSection3
         {page:WordSection3;}
+@page WordSection4
+        {size:595.3pt 841.9pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:35.45pt;
+        mso-footer-margin:14.2pt;
+        mso-page-numbers:1;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") f4;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f4;
+        mso-paper-source:0;}
+div.colophon
+        {page:WordSection4;}
 
   /* List Definitions */
 @list l0

data/lib/isodoc/iso/word_convert.rb

@@ -32,6 +32,22 @@ module IsoDoc
         isocode = b.at(ns("./docidentifier")).text
         isocode == "IEV"
       end
+
+      def make_body(xml, docxml)
+        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
+        xml.body **body_attr do |body|
+          make_body1(body, docxml)
+          make_body2(body, docxml)
+          make_body3(body, docxml)
+          colophon(body, docxml)
+        end
+      end
+
+      def colophon(body, docxml)
+        body.br **{ clear: "all", style: "page-break-before:left;mso-break-type:section-break" }
+        body.div **{ class: "colophon" } do |div|
+        end
+      end
     end
   end
 end

data/lib/isodoc/metadata.rb

@@ -87,6 +87,9 @@ module IsoDoc
       return unless b["type"]
       t = b["type"].split(/-/).map{ |w| w.capitalize }.join(" ")
       set(:doctype, t)
+      ics = []
+      isoxml.xpath(ns("//bibdata/ics/code")).each { |i| ics << i.text }
+      set(:ics, ics.empty? ? "XXX" : ics.join(", "))
     end
 
     def iso?(org)
@@ -141,6 +144,7 @@ module IsoDoc
       docstatus = isoxml.at(ns("//status/stage"))
       if docstatus
         set(:stage, docstatus.text)
+        set(:stage_int, docstatus.text.to_i)
         abbr = stage_abbrev(docstatus.text, isoxml.at(ns("//status/iteration")),
                             isoxml.at(ns("//version/draft")))
         set(:stageabbr, abbr)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.8".freeze
+  VERSION = "0.8.1".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -55,7 +55,8 @@ module IsoDoc::WordFunction
 
     def generate_header(filename, _dir)
       return nil unless @header
-      template = Liquid::Template.parse(File.read(@header, encoding: "UTF-8"))
+      #template = Liquid::Template.parse(File.read(@header, encoding: "UTF-8"))
+      template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
       meta = @meta.get
       meta[:filename] = filename
       params = meta.map { |k, v| [k.to_s, v] }.to_h

data/spec/isodoc/i18n_spec.rb

@@ -30,19 +30,19 @@ RSpec.describe IsoDoc do
          <preferred>Term2</preferred>
        </term>
        </terms>
-       <symbols-abbrevs id="K">
+       <definitions id="K">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        </clause>
-       <symbols-abbrevs id="L">
+       <definitions id="L">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>
@@ -187,19 +187,19 @@ RSpec.describe IsoDoc do
          <preferred>Term2</preferred>
        </term>
        </terms>
-       <symbols-abbrevs id="K">
+       <definitions id="K">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        </clause>
-       <symbols-abbrevs id="L">
+       <definitions id="L">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>
@@ -344,19 +344,19 @@ RSpec.describe IsoDoc do
          <preferred>Term2</preferred>
        </term>
        </terms>
-       <symbols-abbrevs id="K">
+       <definitions id="K">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        </clause>
-       <symbols-abbrevs id="L">
+       <definitions id="L">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>
@@ -501,19 +501,19 @@ RSpec.describe IsoDoc do
          <preferred>Term2</preferred>
        </term>
        </terms>
-       <symbols-abbrevs id="K">
+       <definitions id="K">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        </clause>
-       <symbols-abbrevs id="L">
+       <definitions id="L">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>

data/spec/isodoc/iso_spec.rb

@@ -148,15 +148,15 @@ RSpec.describe IsoDoc do
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
-         <a href="#IEV">IEV: 2018</a>
-         <a href="#ISO20483">ISO 20483: 2013&#8211;2014</a>
+         <a href="#IEV">IEV:2018</a>
+         <a href="#ISO20483">ISO 20483:2013&#8211;2014</a>
          </p>
              </div>
              <p class="zzSTDTitle1"/>
              <div>
                <h1>1.&#160; Normative references</h1>
                <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
-               <p id="ISO20483" class="NormRef">ISO 20483: 2013&#8211;2014, <i> Cereals and pulses</i></p>
+               <p id="ISO20483" class="NormRef">ISO 20483:2013&#8211;2014, <i> Cereals and pulses</i></p>
              </div>
            </div>
          </body>

data/spec/isodoc/metadata_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe IsoDoc do
 </version>
 </iso-standard>
 INPUT
-       {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"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\u00E9r\u00E9ales et l\u00E9gumineuses", :docsubtitlemain=>"Sp\u00E9cification et m\u00E9thodes d'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"], :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stageabbr=>"PreCD3", :tc=>"TC 34", :updateddate=>"XXX", :wg=>"WG 3"}
+       {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"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", :updateddate=>"XXX", :wg=>"WG 3"}
 OUTPUT
   end
 
@@ -136,6 +136,8 @@ OUTPUT
     <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
     <workgroup number="3" type="GHI">Rice Group</workgroup>
   </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>
@@ -143,7 +145,7 @@ OUTPUT
 </version>
 </iso-standard>
 INPUT
-       {:accesseddate=>"XXX", :agency=>"ISO/IEC", :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"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\u00E9r\u00E9ales et l\u00E9gumineuses", :docsubtitlemain=>"Sp\u00E9cification et m\u00E9thodes d'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"], :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", :stageabbr=>"CD", :tc=>"ABC 34", :updateddate=>"XXX", :wg=>"GHI 3"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"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", :updateddate=>"XXX", :wg=>"GHI 3"}
 OUTPUT
   end
 

data/spec/isodoc/ref_spec.rb

@@ -92,8 +92,8 @@ RSpec.describe IsoDoc do
                  <h1>1.&#160; Normative references</h1>
                  <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
-                 <p id="ISO16634" class="NormRef">ISO 16634: -- (all parts)<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a>, <i> Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
-                 <p id="ISO20483" class="NormRef">ISO 20483: 2013&#8211;2014, <i> Cereals and pulses</i></p>
+                 <p id="ISO16634" class="NormRef">ISO 16634:-- (all parts)<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a>, <i> Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
+                 <p id="ISO20483" class="NormRef">ISO 20483:2013&#8211;2014, <i> Cereals and pulses</i></p>
                  <p id="ref1" class="Biblio">ICC 167, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
                </div>
                <br/>

data/spec/isodoc/section_spec.rb

@@ -27,19 +27,19 @@ RSpec.describe IsoDoc do
          <preferred>Term2</preferred>
        </term>
        </terms>
-       <symbols-abbrevs id="K">
+       <definitions id="K">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        </clause>
-       <symbols-abbrevs id="L">
+       <definitions id="L">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>
@@ -182,19 +182,19 @@ OUTPUT
          <preferred>Term2</preferred>
        </term>
        </terms>
-       <symbols-abbrevs id="K">
+       <definitions id="K">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        </clause>
-       <symbols-abbrevs id="L">
+       <definitions id="L">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>

data/spec/isodoc/xref_spec.rb

@@ -882,19 +882,19 @@ RSpec.describe IsoDoc do
          <preferred>Term2</preferred>
        </term>
        </terms>
-       <symbols-abbrevs id="K">
+       <definitions id="K">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        </terms>
-       <symbols-abbrevs id="L">
+       <definitions id="L">
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
          </dl>
-       </symbols-abbrevs>
+       </definitions>
        <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: 0.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -436,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.