isodoc 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20de1f2b7084af74fa5e07dd9d21052070c0cb0c
-  data.tar.gz: f0a33338a94281fcd77c4c0c2c09ba075a168db9
+  metadata.gz: 7a7fb588c2cd94be127021423d9c305e31913882
+  data.tar.gz: 1f154acf56aefcdc36af96802ad9dcd7cb2d7006
 SHA512:
-  metadata.gz: b3ba4475aad7370d08dbb82125824181ce72aff52fcfabbdf04573b33de614424f3774e26e1baca1fdc8751312ed0905ca0eaff09ec53e3697c0178ef8b8614a
-  data.tar.gz: bb14792e1617a7ef072d797042c538ebbfb3a678af20966edd8b531b747b24e03d42ae65bf15498b584db9c23948b52d1b0bcde16943597da8ba90aed469aef1
+  metadata.gz: d8768dce3f8c6ea4f225365ade7db7181dfc68be9b68b4549984ea05df7e8be4cb8b930a231f0ce3f7fbf677c15dca1f32adb848e62067003c97af34aa369875
+  data.tar.gz: bc3861437b9b9b4e1db77bbd3ec2be1dded5e5f81a7a8abdab630bbef417635855a78e3e627f959dece89e0d5a18ddce166fb8479f7eabfe55bd8eb795da5858

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

@@ -47,7 +47,7 @@ a, abbr, acronym, address, big, cite, code,
 del, dfn, em, img, ins, kbd, q, s, samp,
 small, strike, strong, tt, var,
 b, u, i, center,
-dl, dt, dd, ol, ul, li,
+dl, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,

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

@@ -47,7 +47,7 @@ a, abbr, acronym, address, big, cite, code,
 del, dfn, em, img, ins, kbd, q, s, samp,
 small, strike, strong, tt, var,
 b, u, i, center,
-dl, dt, dd, ol, ul, li,
+dl, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,

data/lib/isodoc/metadata.rb

@@ -69,8 +69,10 @@ module IsoDoc
     def date_range(date)
       from = date.at(ns("./from"))
       to = date.at(ns("./to"))
-      ret = from.text
-      ret += "–#{to.text}" if to
+      on = date.at(ns("./on"))
+      return on.text if on
+      ret = "#{from.text}–"
+      ret += to.text if to
       ret
     end
 

data/lib/isodoc/references.rb

@@ -22,7 +22,13 @@ module IsoDoc
     end
 
     def iso_bibitem_entry_attrs(b, biblio)
-      { id: b["id"], class: biblio ? "Biblio" : nil }
+      { id: b["id"], class: biblio ? "Biblio" : "NormRef" }
+    end
+
+    def iso_title(b)
+      title = b.at(ns("./title[@language = '#{@language}']"))
+      title = b.at(ns("./title")) unless title
+      title.text
     end
 
     def iso_bibitem_entry(list, b, ordinal, biblio)
@@ -34,7 +40,7 @@ module IsoDoc
         ref << iso_bibitem_ref_code(b)
         date_note_process(b, ref)
         ref << ", "
-        ref.i { |i| i << " #{b.at(ns('./title')).text}" }
+        ref.i { |i| i << " #{iso_title(b)}" }
       end
     end
 
@@ -50,7 +56,8 @@ module IsoDoc
     end
 
     def reference_format(b, r)
-      title = b.at(ns("./formattedref")) || b.at(ns("./title"))
+      title = b.at(ns("./formattedref")) || 
+        b.at(ns("./title[@language = '#{@language}']")) || b.at(ns("./title"))
       title&.children&.each { |n| parse(n, r) }
     end
 
@@ -149,8 +156,8 @@ module IsoDoc
     def format_ref(ref, isopub, date)
       if isopub
         return ref unless date
-        from = date.at(ns("./from"))
-        return ref if from&.text == "--"
+        on = date.at(ns("./on"))
+        return ref if on&.text == "--"
         return ref + ": #{date_range(date)}"
       end
       return "[#{ref}]" if /^\d+$/.match?(ref) && !/^\[.*\]$/.match?(ref)
@@ -163,7 +170,6 @@ module IsoDoc
       # return ref_names(ref) unless docid
       date = ref.at(ns("./date[@type = 'published']"))
       reference = format_ref(docid_l10n(docid.text), isopub, date)
-      # reference += ": #{date_range(date)}" if date && isopub && from.text != "--"
       @anchors[ref["id"]] = { xref: reference }
     end
 

data/lib/isodoc/section.rb

@@ -103,7 +103,7 @@ module IsoDoc
       @internal_external_terms_boilerplate.gsub(/%/, sources)
     end
 
-    def term_defs_boilerplate(div, source, term)
+    def term_defs_boilerplate(div, source, term, preface)
       if source.empty? && term.nil?
         div << @no_terms_boilerplate
       else
@@ -138,7 +138,7 @@ module IsoDoc
         num = num + 1
         clause_name("#{num}.", terms_defs_title(f), div, nil)
         term_defs_boilerplate(div, isoxml.xpath(ns(".//termdocsource")),
-                              f.at(ns(".//term")))
+                              f.at(ns(".//term")), f.at(ns("./p")))
         f.elements.each do |e|
           parse(e, div) unless %w{title source}.include? e.name
         end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.6.1".freeze
+  VERSION = "0.6.2".freeze
 end

data/spec/isodoc/i18n_spec.rb

@@ -577,7 +577,7 @@ RSpec.describe IsoDoc do
                <div>
                  <h1>2.&#160; &#35268;&#33539;&#24615;&#24341;&#29992;&#25991;&#20214;</h1>
                  <p>&#19979;&#21015;&#25991;&#20214;&#23545;&#20110;&#26412;&#25991;&#20214;&#30340;&#24212;&#29992;&#26159;&#24517;&#19981;&#21487;&#23569;&#30340;&#12290; &#20961;&#26159;&#27880;&#26085;&#26399;&#30340;&#24341;&#29992;&#25991;&#20214;&#65292;&#20165;&#27880;&#26085;&#26399;&#30340;&#29256;&#26412;&#36866;&#29992;&#20110;&#26412;&#25991;&#20214;&#12290; &#20961;&#26159;&#19981;&#27880;&#26085;&#26399;&#30340;&#24341;&#29992;&#25991;&#20214;&#65292;&#20854;&#26368;&#26032;&#29256;&#26412;&#65288;&#21253;&#25324;&#25152;&#26377;&#30340;&#20462;&#25913;&#21333;&#65289;&#36866;&#29992;&#20110;&#26412;&#25991;&#20214;&#12290;</p>
-                 <p id="ISO712">ISO 712, <i> Cereals and cereal products</i></p>
+                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
                </div>
                <div id="H"><h1>3.&#160; &#26415;&#35821;&#21644;&#23450;&#20041;</h1><p>&#19979;&#21015;&#26415;&#35821;&#21644;&#23450;&#20041;&#36866;&#29992;&#20110;&#26412;&#25991;&#20214;&#12290;</p>
        <p>ISO&#21644;IEC&#29992;&#20110;&#26631;&#20934;&#21270;&#30340;&#26415;&#35821;&#25968;&#25454;&#24211;&#22320;&#22336;&#22914;&#19979;&#65306;</p>

data/spec/isodoc/inline_spec.rb

@@ -182,7 +182,7 @@ RSpec.describe IsoDoc do
                <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="ISO712">ISO 712, <i> Cereals and cereal products</i></p>
+                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
                </div>
              </div>
            </body>
@@ -245,7 +245,7 @@ RSpec.describe IsoDoc do
                <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="ISO712">ISO 712, <i> Cereals and cereal products</i></p>
+                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
                </div>
              </div>
            </body>

data/spec/isodoc/metadata_spec.rb

@@ -20,11 +20,11 @@ RSpec.describe IsoDoc do
     <project-number part="1">17301</project-number>
     <tc-document-number>17301</tc-document-number>
   </docidentifier>
-  <date type="published"><from>2011</from></date>
-  <date type="accessed"><from>2012</from></date>
+  <date type="published"><on>2011</on></date>
+  <date type="accessed"><on>2012</on></date>
   <date type="created"><from>2010</from><to>2011</to></date>
-  <date type="activated"><from>2013</from></date>
-  <date type="obsoleted"><from>2014</from></date>
+  <date type="activated"><on>2013</on></date>
+  <date type="obsoleted"><on>2014</on></date>
   <contributor>
     <role type="author"/>
     <organization>

data/spec/isodoc/ref_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe IsoDoc do
 <bibitem id="ISO16634" type="standard">
   <title format="text/plain">Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
   <docidentifier>ISO 16634:All Parts</docidentifier>
-  <date type="published"><from>--</from></date>
+  <date type="published"><on>--</on></date>
   <contributor>
     <role type="publisher"/>
     <organization>
@@ -90,9 +90,9 @@ RSpec.describe IsoDoc do
                <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="ISO712">ISO 712, <i> Cereals and cereal products</i></p>
-                 <p id="ISO16634">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">ISO 20483: 2013&#8211;2014, <i> Cereals and pulses</i></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="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

@@ -416,7 +416,7 @@ OUTPUT
                <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="ISO712">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
+                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
                </div>
                <div id="H"><h1>2.&#160; Terms and Definitions</h1><p>For the purposes of this document, the terms and definitions
          given in ISO 712 and the following apply.</p>
@@ -481,7 +481,7 @@ OUTPUT
                <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="ISO712">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
+                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
                </div>
                <div id="H"><h1>2.&#160; Terms and Definitions</h1><p>For the purposes of this document,
          the terms and definitions given in ISO 712, ISO 712 and ISO 712 apply.</p>

metadata

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