metanorma-unece 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57ec6b1ffe41604dea3328e8505de9814849ecf913324e30c5e8f1ae4821fc4
-  data.tar.gz: 9cef0ef017720fd8b7e121fe364cbee2d43fcfb051ffa2f52d04a78e37e0d476
+  metadata.gz: 6bc96f4c10497c4a82ea01cfbf023ca98d296e9a0e7e4f3e82900328a6a96e27
+  data.tar.gz: 1057969d7adf07d6b81db802a3735d92c9d9ed9db922bbfd0fc28d448eb6e84b
 SHA512:
-  metadata.gz: be0195806b5f0c4b981aadb4b8b7069adebd76147d94aa16908583f9450feac754505d9ca64c8c63c545641669f5210472d01957b8268ef489d278bae4fc63be
-  data.tar.gz: fd9ce24b37a37692142aafb21ee974b1c1f6ba06967bc35595107a7e895367025b504a7578451ba1fd1b1a5c0fce3aa0a75359d0f4d20b1df62e98758ba4db99
+  metadata.gz: e3d249786ac6967b7fe394e170f7ea66129cdc216577ad07056bfebf3bf7eab04e3316eb2ce20d74c351b358a828021d35b1c64eb5183b02a6f04c438afe699b
+  data.tar.gz: c5a9c7fd022a2193d6fec8ebec13676cc71ae59635cc46122ada39ebbd66a1c023dd88c33aa65f6e43ed9553b29086e9459bfb5f2b68e168215140c0b5f08953

data/lib/asciidoctor/unece/converter.rb

@@ -45,10 +45,11 @@ module Asciidoctor
 
       def title(node, xml)
         ["en"].each do |lang|
-          xml.title **{ language: lang, format: "text/plain" } do |t|
+          xml.title **{ type: "main", language: lang, format: "text/plain" } do |t|
             t << asciidoc_sub(node.attr("title"))
           end
-          xml.subtitle **{ language: lang, format: "text/plain" } do |t|
+          node.attr("subtitle") and
+            xml.title **{ type: "subtitle", language: lang, format: "text/plain" } do |t|
             t << asciidoc_sub(node.attr("subtitle"))
           end
         end
@@ -81,7 +82,7 @@ module Asciidoctor
       end
 
       def metadata_distribution(node, xml)
-          xml.distribution node.attr("distribution") if node.attr("distribution")
+        xml.distribution node.attr("distribution") if node.attr("distribution")
       end
 
       def metadata_session(node, xml)

data/lib/isodoc/unece/metadata.rb

@@ -12,12 +12,12 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
+        main = isoxml&.at(ns("//bibdata/title[@language='en' and @type='main']"))&.text
         set(:doctitle, main)
       end
 
       def subtitle(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/subtitle[@language='en']"))&.text
+        main = isoxml&.at(ns("//bibdata/title[@language='en' and @type='subtitle']"))&.text
         set(:docsubtitle, main)
       end
 

data/lib/metanorma/unece/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Unece
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-unece
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor