isodoc 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 490b26d07e91c826370a8a6696812ef57d85a88922cc155cf9f8ca516222c8ba
-  data.tar.gz: 84e35c5302f47ed2d6df479c7294dd01b3077d6f279b5d3fd5a38e5dda414d70
+  metadata.gz: 9ae7f6c154716e6a0096058610667183d6f1b963bcc53349384bfc467266bf25
+  data.tar.gz: 0bc77874b82d3ab7212d15a3334402070e7c5d54e9f3b32a66c664535761901c
 SHA512:
-  metadata.gz: 21b930c00f572fac0367cc06e08c2c901981804e0829231d55e48917c09ee6752cd49f2950760f33d1921c1ea0ee521008fe4986023e984d45c1243c00b34c7f
-  data.tar.gz: 667364e6cb59e71c2c71188b5dd8e8cbefe1885dce1bd1f2aece10dfe7a53d830a08d326b9226f117d16afa5e58ee7cd9e81c2a93db071e44ede4b7bc9182504
+  metadata.gz: 32ff1b4b21ee64655f5c8f5fc85654322934342fe2800a99b7f3f01c4c47e259e2aa707c6ba60c2f8181bdb3a280e8652ccc841fca04d2c4b0a6794dbecfd654
+  data.tar.gz: e9a3bf1c450308324e884095aff193e92b7c77ed114d0c35790a47dcb618e70e433199031bd76ba448fbd01b4ca59076e0d29231e2d0a5c6c78738f1405e3426

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.8.10)
+    isodoc (0.8.11)
       asciimath
       html2doc (~> 0.8.1)
       htmlentities (~> 4.3.4)
@@ -41,7 +41,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.2)
+    html2doc (0.8.3)
       asciimath
       htmlentities (~> 4.3.4)
       image_size

data/lib/isodoc/function/inline.rb

@@ -25,7 +25,8 @@ module IsoDoc::Function
     def anchor_linkend(node, linkend)
       if node["citeas"].nil? && node["bibitemid"] &&
           get_anchors.has_key?(node["bibitemid"])
-        return get_anchors[node["bibitemid"]][:xref]
+        #return get_anchors[node["bibitemid"]][:xref]
+        return get_anchors.dig(node["bibitemid"] ,:xref)
       elsif node["target"] && get_anchors.has_key?(node["target"])
         linkend = get_anchors[node["target"]][:xref]
         container = get_anchors[node["target"]][:container]

data/lib/isodoc/function/references.rb

@@ -14,7 +14,7 @@ module IsoDoc::Function
       iso_allparts = b.at(ns("./allparts"))
       reference = docid_l10n(isocode)
       reference += ":#{date_range(isodate)}" if isodate
-      reference += " (all parts)" if iso_allparts&.text == "true"
+      reference += " (#{@all_parts_lbl})" if iso_allparts&.text == "true"
       reference
     end
 

data/lib/isodoc/function/section.rb

@@ -96,14 +96,15 @@ module IsoDoc::Function
     end
 
     def external_terms_boilerplate(sources)
-      @external_terms_boilerplate.gsub(/%/, sources)
+      @external_terms_boilerplate.gsub(/%/, sources || "???")
     end
 
     def internal_external_terms_boilerplate(sources)
-      @internal_external_terms_boilerplate.gsub(/%/, sources)
+      @internal_external_terms_boilerplate.gsub(/%/, sources || "??")
     end
 
     def term_defs_boilerplate(div, source, term, preface)
+      source.each { |s| @anchors[s["bibitemid"]] or warn "#{s['bibitemid']} not referenced" }
       if source.empty? && term.nil?
         div << @no_terms_boilerplate
       else
@@ -113,11 +114,10 @@ module IsoDoc::Function
     end
 
     def term_defs_boilerplate_cont(src, term)
-      sources = sentence_join(src.map { |s| @anchors[s["bibitemid"]][:xref] })
-      if src.empty?
-        @internal_terms_boilerplate
-      elsif term.nil?
-        external_terms_boilerplate(sources)
+      #sources = sentence_join(src.map { |s| @anchors[s["bibitemid"]][:xref] })
+      sources = sentence_join(src.map { |s| @anchors.dig(s["bibitemid"], :xref) })
+      if src.empty? then @internal_terms_boilerplate
+      elsif term.nil? then external_terms_boilerplate(sources)
       else
         internal_external_terms_boilerplate(sources)
       end

data/lib/isodoc/function/xref_gen.rb

@@ -14,25 +14,27 @@ module IsoDoc::Function
     end
 
     def termnote_anchor_names(docxml)
-      docxml.xpath(ns("//term[termnote]")).each do |t|
-        t.xpath(ns("./termnote")).each_with_index do |n, i|
+      docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
+        t.xpath(ns(".//termnote")).each_with_index do |n, i|
           return if n["id"].nil? || n["id"].empty?
           @anchors[n["id"]] =
             { label: termnote_label(i + 1),
-              xref: l10n("#{@anchors[t['id']][:xref]}, "\
+              #xref: l10n("#{@anchors[t['id']][:xref]}, "\
+              xref: l10n("#{@anchors.dig(t['id'], :xref)}, "\
                          "#{@note_xref_lbl} #{i + 1}") }
         end
       end
     end
 
     def termexample_anchor_names(docxml)
-      docxml.xpath(ns("//term[termexample]")).each do |t|
-        examples = t.xpath(ns("./termexample"))
+      docxml.xpath(ns("//term[descendant::termexample]")).each do |t|
+        examples = t.xpath(ns(".//termexample"))
         examples.each_with_index do |n, i|
           return if n["id"].nil? || n["id"].empty?
           idx = examples.size == 1 ? "" : (i + 1).to_s
           @anchors[n["id"]] = {
-            label: idx, xref: l10n("#{@anchors[t['id']][:xref]}, "\
+            #label: idx, xref: l10n("#{@anchors[t['id']][:xref]}, "\
+            label: idx, xref: l10n("#{@anchors.dig(t['id'], :xref)}, "\
                                    "#{@note_xref_lbl} #{i + 1}") }
         end
       end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.8.10".freeze
+  VERSION = "0.8.11".freeze
 end

data/spec/isodoc/ref_spec.rb

@@ -94,7 +94,7 @@ 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="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="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>

data/spec/isodoc/section_spec.rb

@@ -349,6 +349,22 @@ OUTPUT
     OUTPUT
   end
 
+    it "warn about external source for terms & definitions that does not point anywhere" do
+        expect{ IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true) }.to output(/not referenced/).to_stderr
+               <iso-standard xmlns="http://riboseinc.com/isoxml">
+         <termdocsource type="inline" bibitemid="ISO712"/>
+       <sections>
+       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
+         <term id="J">
+         <preferred>Term2</preferred>
+       </term>
+       </terms>
+        </sections>
+</iso-standard>
+INPUT
+end
+
+
   it "processes terms & definitions with external source" do
         expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
                <iso-standard xmlns="http://riboseinc.com/isoxml">

metadata

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