Merge pull request #587 from metanorma/fix/publisher-multilingual

multilingual publisher processing for metadata: https://github.com/re…

lib/isodoc/metadata_contributor.rb

@@ -67,20 +67,15 @@ def agency1(xml)
       publisher = []
       xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/" \
                    "organization")).each do |org|
-        name = extract_variant(org.at(ns("./name")))
-        agency1 = org.at(ns("./abbreviation"))&.text || name
-        publisher << name if name
+        name = org.at(ns("./name[@language = '#{@lang}']")) ||
+          org.at(ns("./name"))
+        agency1 = org.at(ns("./abbreviation"))&.text || name&.text
+        publisher << name.text if name
         agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
       [agency, publisher]
     end
 
-    def extract_variant(node)
-      node.nil? and return node
-      x = node.at(ns("./variant[@language = '#{@lang}']")) and node = x
-      node.text
-    end
-
     def agency(xml)
       agency, publisher = agency1(xml)
       set(:agency, agency.sub(%r{/$}, ""))

lib/isodoc/presentation_function/inline.rb

@@ -64,6 +64,7 @@ def xref1(node)
       get_linkend(node)
     end
 
+    # there should be no //variant in bibdata now
     def variant(xml)
       b = xml.xpath(ns("//bibdata//variant"))
       (xml.xpath(ns("//variant")) - b).each { |f| variant1(f) }