isodoc 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01ea09cdb8f862493ac3faba65edeed830efbea957055ca689fc61e2d878e20f
-  data.tar.gz: b523e1a7821627a7ad098a1b777dfec1c63c5c46b3d263d05a9f1c67bfdf1405
+  metadata.gz: 8ada6cf28f78a8cda7b4541696aa81bd9e0abf1f013ffd7f34b4c9e91d65d6a2
+  data.tar.gz: '0652283921a95138d5460d0bbfb8d47386cd3f1e602a2a23f3fbe626bd2646f5'
 SHA512:
-  metadata.gz: de9f3a9943ae506820164db1d009fa6541320879a8e9921c4509a94789a64b0568ce5211a1e6e9e02a861024a2bd733b34fca2fc1acca0c7ae4af34618d6878f
-  data.tar.gz: a698d0d759b6dd3b26ed9d325fdd894a244dd1130cd54a5dac1b216ff1bb0bb4f9719af8c0135f2d93f1e932eca5248a7adbad5ddb305109ed52297b0b450c47
+  metadata.gz: 6908a1a736a3a66254dfc92c72b08539a463edec1d0f3c7897e6b3c5b5d01e33eaf0f7940b848a7b138d2737aacf9d7376c8f058975f27ea731ff2a847391508
+  data.tar.gz: 26d38c9f2a4a114f6e566462a71dcf4b80eff49a0ad99e61aceb5732d6edaed967c6cdf3c5f55e30e80b829cb8d6fae12fb28855673e9bab5fb944bbbf8ae474

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.10.0)
+    isodoc (0.10.1)
       asciimath
       html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
@@ -42,7 +42,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.11)
+    html2doc (0.8.12)
       asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size
@@ -59,7 +59,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.3.11)
+    metanorma (0.3.12)
       asciidoctor
       htmlentities
     method_source (0.9.2)
@@ -90,7 +90,7 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)

data/lib/isodoc/function/references.rb

@@ -38,9 +38,11 @@ module IsoDoc::Function
     end
 
     def iso_title(b)
-      title = b.at(ns("./title[@language = '#{@language}']"))
-      title = b.at(ns("./title")) unless title
-      title.text
+      title = b.at(ns("./title[@language = '#{@lang}' and @type = 'main']")) ||
+        b.at(ns("./title[@language = '#{@lang}']")) ||
+        b.at(ns("./title[@type = 'main']")) ||
+        b.at(ns("./title"))
+      title
     end
 
     # reference not to be rendered because it is deemed implicit
@@ -61,7 +63,7 @@ module IsoDoc::Function
         ref << iso_bibitem_ref_code(b)
         date_note_process(b, ref)
         ref << ", "
-        ref.i { |i| i << " #{iso_title(b)}" }
+        ref.i { |i| i << " #{iso_title(b).text}" }
       end
     end
 
@@ -79,7 +81,7 @@ module IsoDoc::Function
       if ftitle = b.at(ns("./formattedref"))
         ftitle&.children&.each { |n| parse(n, r) }
       else
-        title = b.at(ns("./title[@language = '#{@language}']")) || b.at(ns("./title"))
+        title = iso_title(b)
         r.i do |i|
           title&.children&.each { |n| parse(n, i) }
         end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.10.0".freeze
+  VERSION = "0.10.1".freeze
 end

data/spec/isodoc/ref_spec.rb

@@ -4,6 +4,9 @@ RSpec.describe IsoDoc do
   it "processes IsoXML bibliographies" do
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata>
+    <language>en</language>
+    </bibdata>
     <preface><foreword>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
   <eref bibitemid="ISO712"/>
@@ -14,7 +17,8 @@ RSpec.describe IsoDoc do
     </foreword></preface>
     <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>
+  <title format="text/plain">Cereals or cereal products</title>
+  <title type="main" format="text/plain">Cereals and cereal products</title>
   <docidentifier type="ISO">ISO 712</docidentifier>
   <contributor>
     <role type="publisher"/>
@@ -24,7 +28,8 @@ RSpec.describe IsoDoc do
   </contributor>
 </bibitem>
 <bibitem id="ISO16634" type="standard">
-  <title format="text/plain">Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
+  <title language="x" format="text/plain">Cereals, pulses, milled cereal products, xxxx, oilseeds and animal feeding stuffs</title>
+  <title language="en" format="text/plain">Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
   <docidentifier type="ISO">ISO 16634:-- (all parts)</docidentifier>
   <date type="published"><on>--</on></date>
   <contributor>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-15 00:00:00.000000000 Z
+date: 2019-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath