isodoc 0.8.13 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dcfbcdf85aacca4db89d1d07e4ec3f6e79ac4d28b9f45a5bf492c0140140738
-  data.tar.gz: 83450383455cb7d112a2e01d511dcf67e3fccba73b83191561849d4e7160bb01
+  metadata.gz: 9a6782d0471fb7cd450a7dce15e825e76a86e4f3c8854ddc69faaa648f65974c
+  data.tar.gz: 8062dc310b20e6c1d13a41ac100489dff153be0152a543c20b1aa043093aa72c
 SHA512:
-  metadata.gz: 7dd24994b056371af1e7f6df7163681b392cf87473200036bd61036244ca97fc62c3d1ee8cd5ab23dbd3e252e6cdcc73767921cb9d19cbea4264c20ca0408d44
-  data.tar.gz: 9a56c3dc70f1139639749b11c875372447c53656705827d7450492f43476e9f4589953e7cc4a305d8e4523a80daa4be0c6bb8b6cbaa78917d2c2cf8c9ac9ee66
+  metadata.gz: fc34ddc8a06fd1632889c00b4a60641c33f983a5b6c3ac6c18c290992d7a8dee91d3074044513ce3608146488a710fa1a0099a09b2103bcc63355c7e570572be
+  data.tar.gz: f9977b4049756a609cc048e022aa138731182beb53a36be53dfb8a46b7285a48c836fa280782ea95f10d06196c05e6bf5a99a5b02dee0c50b6b190e4f2f74f83

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.8.11)
+    isodoc (0.9.0)
       asciimath
       html2doc (~> 0.8.1)
       htmlentities (~> 4.3.4)

data/lib/isodoc/function/references.rb

@@ -5,17 +5,28 @@ module IsoDoc::Function
     # references anyway; keeping here instead of in IsoDoc::Iso for now
     def docid_l10n(x)
       return x if x.nil?
-      x.gsub(/All Parts/, @all_parts_lbl.downcase)
+      x.gsub(/All Parts/i, @all_parts_lbl.downcase)
     end
 
     def iso_bibitem_ref_code(b)
       isocode = b.at(ns("./docidentifier")).text
-      isodate = b.at(ns("./date[@type = 'published']"))
-      allparts = b.at(ns("./allparts"))
+      prefix = b&.at(ns("./docidentifier/@type"))&.text
+      #isodate = b.at(ns("./date[@type = 'published']"))
+      #allparts = b.at(ns("./allparts"))
       reference = docid_l10n(isocode)
-      reference += ":#{date_range(isodate)}" if isodate
-      reference += " (#{@all_parts_lbl.downcase})" if allparts&.text == "true"
-      reference
+      #reference += ":#{date_range(isodate)}" if isodate
+      #reference += " (#{@all_parts_lbl.downcase})" if allparts&.text == "true"
+      docid_prefix(prefix, reference)
+    end
+
+    def docid_prefix(prefix, docid)
+      docid = "#{prefix} #{docid}" unless omit_docid_prefix(prefix)
+      docid
+    end
+
+    def omit_docid_prefix(prefix)
+      return true if prefix.nil? || prefix.empty?
+      return ["ISO"].include? prefix
     end
 
     def date_note_process(b, ref)
@@ -58,8 +69,9 @@ module IsoDoc::Function
       end
     end
 
-    def ref_entry_code(r, ordinal, t)
-      if /^\d+$/.match(t)
+    def ref_entry_code(r, ordinal, prefix, t)
+      t = docid_prefix(prefix, t)
+      if /^\d+$/.match(t) && !prefix
         prefix_bracketed_ref(r, t)
       else
         prefix_bracketed_ref(r, ordinal)
@@ -78,7 +90,8 @@ module IsoDoc::Function
       list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
         if bibliography
           id = docid_l10n(b.at(ns("./docidentifier")).text.gsub(/[\[\]]/, ""))
-          ref_entry_code(r, ordinal, id)
+          prefix = b&.at(ns("./docidentifier/@type"))&.text
+          ref_entry_code(r, ordinal, prefix, id)
         else
           r << "#{iso_bibitem_ref_code(b)}, "
         end
@@ -166,25 +179,28 @@ module IsoDoc::Function
       end
     end
 
-    def format_ref(ref, isopub, date, allparts)
+    def format_ref(ref, prefix, isopub, date, allparts)
       if isopub
-        if date
-          on = date.at(ns("./on"))
-          ref += on&.text == "--" ? ":--" : ":#{date_range(date)}"
-          ref += " (all parts)" if allparts
-        end
+        #if date
+          #on = date.at(ns("./on"))
+          #ref += on&.text == "--" ? ":--" : "" # ":#{date_range(date)}"
+          #ref += " (all parts)" if allparts
+         # ref = docid_prefix(prefix, ref)
+        #end
       end
-      return "[#{ref}]" if /^\d+$/.match(ref) && !/^\[.*\]$/.match(ref)
+          ref = docid_prefix(prefix, ref)
+      return "[#{ref}]" if /^\d+$/.match(ref) && !prefix && !/^\[.*\]$/.match(ref)
       ref
     end
 
     def reference_names(ref)
       isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
       docid = ref.at(ns("./docidentifier"))
+      prefix = ref.at(ns("./docidentifier/@type"))
       # return ref_names(ref) unless docid
       date = ref.at(ns("./date[@type = 'published']"))
       allparts = ref.at(ns("./allparts"))
-      reference = format_ref(docid_l10n(docid.text), isopub, date, allparts)
+      reference = format_ref(docid_l10n(docid.text), prefix&.text, isopub, date, allparts)
       @anchors[ref["id"]] = { xref: reference }
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.8.13".freeze
+  VERSION = "0.9.0".freeze
 end

data/spec/isodoc/ref_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe IsoDoc do
     <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
 <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
-  <docidentifier>ISO 712</docidentifier>
+  <docidentifier type="ISO">ISO 712</docidentifier>
   <contributor>
     <role type="publisher"/>
     <organization>
@@ -25,7 +25,7 @@ RSpec.describe IsoDoc do
 </bibitem>
 <bibitem id="ISO16634" type="standard">
   <title format="text/plain">Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
-  <docidentifier>ISO 16634</docidentifier>
+  <docidentifier type="ISO">ISO 16634:-- (all parts)</docidentifier>
   <date type="published"><on>--</on></date>
   <contributor>
     <role type="publisher"/>
@@ -38,7 +38,7 @@ RSpec.describe IsoDoc do
 </bibitem>
 <bibitem id="ISO20483" type="standard">
   <title format="text/plain">Cereals and pulses</title>
-  <docidentifier>ISO 20483</docidentifier>
+  <docidentifier type="ISO">ISO 20483:2013-2014</docidentifier>
   <date type="published"><from>2013</from><to>2014</to></date>
   <contributor>
     <role type="publisher"/>
@@ -49,14 +49,14 @@ RSpec.describe IsoDoc do
 </bibitem>
 <bibitem id="ref1">
   <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
-  <docidentifier>ICC 167</docidentifier>
+  <docidentifier type="ICC">167</docidentifier>
 </bibitem>
 
 </references><references id="_bibliography" obligation="informative">
   <title>Bibliography</title>
 <bibitem id="ISO3696" type="standard">
   <title format="text/plain">Water for analytical laboratory use</title>
-  <docidentifier>ISO 3696</docidentifier>
+  <docidentifier type="ISO">ISO 3696</docidentifier>
   <contributor>
     <role type="publisher"/>
     <organization>
@@ -70,7 +70,7 @@ RSpec.describe IsoDoc do
 </bibitem>
 <bibitem id="ref11">
   <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
-  <docidentifier>IETF RFC 10</docidentifier>
+  <docidentifier type="IETF">RFC 10</docidentifier>
 </bibitem>
 
 
@@ -95,7 +95,7 @@ RSpec.describe IsoDoc do
                  <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="ISO20483" class="NormRef">ISO 20483:2013-2014, <i> Cereals and pulses</i></p>
                  <p id="ref1" class="NormRef">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/>
@@ -103,7 +103,7 @@ RSpec.describe IsoDoc do
                  <h1 class="Section3">Bibliography</h1>
                  <p id="ISO3696" class="Biblio">[1]&#160; ISO 3696, <i> Water for analytical laboratory use</i></p>
                  <p id="ref10" class="Biblio">[10]&#160; <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>
-                 <p id="ref11" class="Biblio">[3]&#160; IETF RFC 10,<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>
+                 <p id="ref11" class="Biblio">[3]&#160; IETF RFC 10, <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>
                <aside id="fn:1" class="footnote">
          <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-02 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath