isodoc 2.10.0 → 3.0.0

data/lib/isodoc/function/to_word_html.rb

@@ -4,10 +4,6 @@ require "pathname"
 module IsoDoc
   module Function
     module ToWordHtml
-      def set_termdomain(termdomain)
-        @termdomain = termdomain
-      end
-
       def note?
         @note
       end
@@ -153,6 +149,12 @@ module IsoDoc
         @meta.get
       end
 
+      def cross_align(isoxml, out)
+        isoxml.xpath(ns("//cross-align")).each do |c|
+          parse(c, out)
+        end
+      end
+
       def boilerplate(node, out)
         @bare and return
         boilerplate = node.at(ns("//boilerplate")) or return
@@ -186,12 +188,17 @@ module IsoDoc
           when "bookmark" then bookmark_parse(node, out)
           when "pagebreak" then pagebreak_parse(node, out)
           when "callout" then callout_parse(node, out)
-          when "stem" then stem_parse(node, out)
+          when "fmt-stem" then stem_parse(node, out)
+          when "stem" then semx_stem_parse(node, out)
           when "clause" then clause_parse(node, out)
-          when "xref" then xref_parse(node, out)
-          when "eref" then eref_parse(node, out)
-          when "origin" then origin_parse(node, out)
-          when "link" then link_parse(node, out)
+          when "xref" then semx_xref_parse(node, out)
+          when "fmt-xref" then xref_parse(node, out)
+          when "eref" then semx_eref_parse(node, out)
+          when "fmt-eref" then eref_parse(node, out)
+          when "origin" then semx_origin_parse(node, out)
+          when "fmt-origin" then origin_parse(node, out)
+          when "link" then semx_link_parse(node, out)
+          when "fmt-link" then link_parse(node, out)
           when "ul" then ul_parse(node, out)
           when "ol" then ol_parse(node, out)
           when "li" then li_parse(node, out)
@@ -213,12 +220,18 @@ module IsoDoc
           when "pre" then pre_parse(node, out)
           when "annotation" then annotation_parse(node, out)
           when "term" then termdef_parse(node, out)
-          when "preferred" then term_parse(node, out)
-          when "admitted" then admitted_term_parse(node, out)
-          when "deprecates" then deprecated_term_parse(node, out)
-          when "domain" then set_termdomain(node.text)
-          when "definition" then definition_parse(node, out)
-          when "termsource" then termref_parse(node, out)
+          when "preferred" then semx_term_parse(node, out)
+          when "fmt-preferred" then term_parse(node, out)
+          when "admitted" then semx_admitted_term_parse(node, out)
+          when "fmt-admitted" then admitted_term_parse(node, out)
+          when "deprecates" then semx_deprecated_term_parse(node, out)
+          when "fmt-deprecates" then deprecated_term_parse(node, out)
+          when "domain" then termdomain_parse(node, out)
+          when "definition" then semx_definition_parse(node, out)
+          when "fmt-definition" then definition_parse(node, out)
+          when "termsource" then semx_termref_parse(node, out)
+          when "fmt-termsource" then termref_parse(node, out)
+          when "related" then semx_related_parse(node, out)
           when "modification" then modification_parse(node, out)
           when "termnote" then termnote_parse(node, out)
           when "terms" then terms_parse(node, out)
@@ -237,7 +250,6 @@ module IsoDoc
           when "legal-statement" then legal_parse(node, out)
           when "feedback-statement" then feedback_parse(node, out)
           when "passthrough" then passthrough_parse(node, out)
-          when "amend" then amend_parse(node, out)
           when "tab" then clausedelimspace(node, out) # in Presentation XML only
           when "svg" then svg_parse(node, out) # in Presentation XML only
           when "add" then add_parse(node, out)
@@ -249,13 +261,31 @@ module IsoDoc
           when "option" then option_parse(node, out)
           when "textarea" then textarea_parse(node, out)
           when "toc" then toc_parse(node, out)
+          when "title" then freestanding_title(node, out) # not inside clause
           when "variant-title" then variant_title(node, out)
           when "span" then span_parse(node, out)
           when "location" then location_parse(node, out)
+          when "cross-align" then cross_align_parse(node, out)
           when "columnbreak" then columnbreak_parse(node, out)
+          when "attribution" then attribution_parse(node, out)
+          when "author" then author_parse(node, out)
           when "ruby" then ruby_parse(node, out)
           when "rt" then rt_parse(node, out)
           when "rb" then rb_parse(node, out)
+          when "semx" then semx_parse(node, out)
+          when "name" then name_parse(node, out)
+          when "fmt-xref-label" then xref_label_parse(node, out)
+          when "fmt-name" then fmt_name_parse(node, out)
+          when "floating-title" then floating_title_parse(node, out)
+          when "fmt-identifier" then fmt_identifier_parse(node, out)
+          when "identifier" then identifier_parse(node, out)
+          when "fmt-concept" then fmt_concept_parse(node, out)
+          when "concept" then concept_parse(node, out)
+          when "erefstack" then erefstack_parse(node, out)
+          when "svgmap" then svgmap_parse(node, out)
+          when "amend" then amend_parse(node, out)
+          when "date" then date_parse(node, out)
+          when "fmt-date" then fmt_date_parse(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/function/utils.rb

@@ -1,4 +1,5 @@
 require "metanorma-utils"
+require_relative "../../nokogiri/xml/node"
 
 module IsoDoc
   module Function
@@ -23,12 +24,12 @@ module IsoDoc
       end
 
       def insert_tab(out, count)
-        tab = %w(Hans Hant).include?(@script) ? "　" : "  "
+        tab = %w(Hans Hant Jpan Kore).include?(@script) ? "　" : "  "
         [1..count].each { out << tab }
       end
 
-      def noko(&block)
-        Metanorma::Utils::noko_html(&block)
+      def noko(&)
+        Metanorma::Utils::noko_html(&)
       end
 
       def attr_code(attributes)
@@ -40,8 +41,7 @@ module IsoDoc
       DOCTYPE_HDR = "<!DOCTYPE html SYSTEM " \
                     '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
 
-      HUGESTRICT =
-        Nokogiri::XML::ParseOptions::HUGE |
+      HUGESTRICT = Nokogiri::XML::ParseOptions::HUGE |
         Nokogiri::XML::ParseOptions::STRICT
 
       def to_xhtml(xml)
@@ -62,7 +62,7 @@ module IsoDoc
       end
 
       def to_xhtml_prep(xml)
-        xml.gsub!(/<\?xml[^>]*>/, "")
+        xml.gsub!(/<\?xml[^<>]*>/, "")
         xml.include?("<!DOCTYPE ") || (xml = DOCTYPE_HDR + xml)
         numeric_escapes(xml)
       end
@@ -130,8 +130,8 @@ module IsoDoc
 
       def header_strip(hdr)
         h1 = to_xhtml_fragment(hdr.to_s.gsub(%r{<br\s*/>}, " ")
-          .gsub(%r{</?p(\s[^>]+)?>}, "")
-          .gsub(/<\/?h[123456][^>]*>/, "").gsub(/<\/?b[^>]*>/, "").dup)
+          .gsub(%r{</?p(\s[^<>]+)?>}, "")
+          .gsub(/<\/?h[123456][^<>]*>/, "").gsub(/<\/?b[^<>]*>/, "").dup)
         h1.traverse do |x|
           if x.name == "span" && x["style"]&.include?("mso-tab-count")
             x.replace(" ")
@@ -213,10 +213,9 @@ module IsoDoc
         %w(example requirement recommendation permission
            note table figure sourcecode).freeze
 
-      def labelled_ancestor(elem)
-        #!elem.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-1]
+      def labelled_ancestor(elem, exceptions = [])
         !elem.ancestors.map(&:name)
-          .intersection(LABELLED_ANCESTOR_ELEMENTS).empty?
+          .intersection(LABELLED_ANCESTOR_ELEMENTS - exceptions).empty?
       end
 
       def emf?(type)
@@ -244,7 +243,7 @@ module IsoDoc
         win = !!((RUBY_PLATFORM =~ /(win|w)(32|64)$/) ||
                  (RUBY_PLATFORM =~ /mswin|mingw/))
         if win
-          path.gsub!(%{/}, "\\")
+          path.tr!(%{/}, "\\")
           path[/\s/] ? "\"#{path}\"" : path
         else path
         end

data/lib/isodoc/gem_tasks.rb

@@ -82,7 +82,7 @@ module IsoDoc
 
     def comment_out_liquid(text)
       text.split("\n").map do |line|
-        if line.match?(/{({|%).+(}|%)}/)
+        if line.match?(/(?<!{){({|%)(?![{%]).+(}|%)}/)
           "/* LIQUID_COMMENT#{line}LIQUID_COMMENT */"
         else
           line

data/lib/isodoc/html_function/footnotes.rb

@@ -24,6 +24,7 @@ module IsoDoc
         end
       end
 
+      # Move to Presentation XML, as <fmt-footnote>: it's a footnote body
       def make_table_footnote_text(node, fnid, fnref)
         attrs = { id: "fn:#{fnid}" }
         noko do |xml|
@@ -68,7 +69,7 @@ module IsoDoc
 
       def footnote_parse(node, out)
         return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
-          !node.ancestors.map(&:name).include?("name")
+          !node.ancestors.map(&:name).include?("fmt-name")
 
         fn = node["reference"] || UUIDTools::UUID.random_create.to_s
         attrs = { class: "FootnoteRef", href: "#fn:#{fn}" }

data/lib/isodoc/html_function/html.rb

@@ -15,10 +15,6 @@ module IsoDoc
         end.join("\n")
       end
 
-      def preprocess_xslt(docxml)
-        super
-      end
-
       def make_body1(body, _docxml)
         return if @bare
 
@@ -78,13 +74,15 @@ module IsoDoc
       end
 
       def sourcecode_parse(node, out)
-        name = node.at(ns("./name"))
+        name = node.at(ns("./fmt-name"))
         tag = node.at(ns(".//sourcecode | .//table")) ? "div" : "pre"
+        n = node.at(ns("./fmt-sourcecode"))
+        s = n || node
         attr = sourcecode_attrs(node).merge(class: "sourcecode")
         out.send tag, **attr do |div|
-          sourcecode_parse1(node, div)
+          sourcecode_parse1(s, div)
         end
-        annotation_parse(node, out)
+        annotation_parse(s, out)
         sourcecode_name_parse(node, out, name)
       end
 

data/lib/isodoc/html_function/postprocess.rb

@@ -20,15 +20,32 @@ module IsoDoc
       end
 
       def html5(doc)
-        doc.sub(%r{<!DOCTYPE html [^>]+>}, "<!DOCTYPE html>")
-          .sub(%r{<\?xml[^>]+>}, "")
+        doc.sub(%r{<!DOCTYPE html [^<>]+>}, "<!DOCTYPE html>")
+          .sub(%r{<\?xml[^<>]+>}, "")
       end
 
       def html_cleanup(html)
         html = term_header(html_footnote_filter(html_preface(htmlstyle(html))))
-        html = footnote_format(footnote_backlinks(html_toc(html)))
+        html = footnote_format(footnote_backlinks(html))
         html = mathml(html_list_clean(remove_placeholder_paras(html)))
-        sourcecode_cleanup(html)
+        html_toc(heading_anchors(sourcecode_cleanup(html)))
+      end
+
+      def heading_anchors(html)
+        html.xpath("//h1 | //h2 | //h3 | //h4 | //h5 | //h6 | //h7 | //h8 "\
+                   "//span[@class = 'inline-header']").each do |h|
+          h.at("./ancestor::div[@id='toc']") and next
+          div = h.xpath("./ancestor::div[@id]")
+          div.empty? and next
+          heading_anchor(h, div[-1]["id"])
+        end
+        html
+      end
+
+      def heading_anchor(hdr, id)
+        hdr.children = <<~HTML.strip
+          <a class='anchor' href='##{id}'/><a class='header' href='##{id}'>#{hdr.children.to_xml}</a>
+        HTML
       end
 
       def sourcecode_cleanup(html)
@@ -52,7 +69,7 @@ module IsoDoc
 
       def html_list_clean(html)
         html.xpath("//ol/div | //ul/div").each do |div|
-          li = div&.xpath("./preceding-sibling::li")&.last ||
+          li = div.xpath("./preceding-sibling::li")&.last ||
             div.at("./following-sibling::li")
           div.parent = li
         end
@@ -92,7 +109,6 @@ module IsoDoc
         type = img["mimetype"]&.sub(%r{^[^/*]+/}, "")
         matched = /\.(?<suffix>[^. \r\n\t]+)$/.match img["src"]
         type and !type.empty? and return type
-
         !matched.nil? and matched[:suffix] and return matched[:suffix]
         "png"
       end
@@ -111,6 +127,9 @@ module IsoDoc
         %w(h1 h2 h3 h4 h5 h6 h7 h8).each do |h|
           docxml.xpath("//p[@class = 'TermNum'][../#{h}]").each do |p|
             p.name = "h#{h[1].to_i + 1}"
+            id = p["id"]
+            p["id"] = "_#{UUIDTools::UUID.random_create}"
+            p.wrap("<div id='#{id}'></div>")
           end
         end
         docxml

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -6,9 +6,9 @@ module IsoDoc
   module HtmlFunction
     module Html
       def script_cdata(result)
-        result.gsub(%r{<script([^>]*)>\s*<!\[CDATA\[}m, "<script\\1>")
+        result.gsub(%r{<script([^<>]*)>\s*<!\[CDATA\[}m, "<script\\1>")
           .gsub(%r{\]\]>\s*</script>}, "</script>")
-          .gsub(%r{<!\[CDATA\[\s*<script([^>]*)>}m, "<script\\1>")
+          .gsub(%r{<!\[CDATA\[\s*<script([^<>]*)>}m, "<script\\1>")
           .gsub(%r{</script>\s*\]\]>}, "</script>")
       end
 
@@ -40,8 +40,10 @@ module IsoDoc
       end
 
       def html_preface(docxml)
-        html_cover(docxml) if @htmlcoverpage && !@bare
-        html_intro(docxml) if @htmlintropage && !@bare
+        @htmlcoverpage && !@htmlcoverpage.empty? && !@bare and
+          html_cover(docxml)
+        @htmlintropage && !@htmlintropage.empty? && !@bare and
+          html_intro(docxml)
         docxml.at("//body") << mathjax(@openmathdelim, @closemathdelim)
         html_main(docxml)
         authority_cleanup(docxml)
@@ -80,7 +82,8 @@ module IsoDoc
       def html_cover(docxml)
         doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
         d = docxml.at('//div[@class="title-section"]')
-        d.children.first.add_previous_sibling(
+        #d.children.first.add_previous_sibling(
+        d.add_first_child(
           populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
         )
       end
@@ -88,7 +91,8 @@ module IsoDoc
       def html_intro(docxml)
         doc = to_xhtml_fragment(File.read(@htmlintropage, encoding: "UTF-8"))
         d = docxml.at('//div[@class="prefatory-section"]')
-        d.children.first.add_previous_sibling(
+        #d.children.first.add_previous_sibling(
+        d.add_first_child(
           populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
         )
       end
@@ -96,7 +100,9 @@ module IsoDoc
       def html_toc_entry(level, header)
         content = header.at("./following-sibling::p" \
                             "[@class = 'variant-title-toc']") || header
-        %(<li class="#{level}"><a href="##{header['id']}">\
+        id = header.at(".//a[@class = 'anchor']/@href")&.text&.sub(/^#/, "") ||
+          header["id"]
+        %(<li class="#{level}"><a href="##{id}">\
       #{header_strip(content)}</a></li>)
       end
 

data/lib/isodoc/html_function/postprocess_footnotes.rb

@@ -1,59 +1,64 @@
-module IsoDoc::HtmlFunction
-  module Html
-    def update_footnote_filter(fn, x, i, seen)
-      if seen[fn.text]
-        x.at("./sup").content = seen[fn.text][:num].to_s
-        fn.remove unless x["href"] == seen[fn.text][:href]
-        x["href"] = seen[fn.text][:href]
-      else
-        seen[fn.text] = { num: i, href: x["href"] }
-        x.at("./sup").content = i.to_s
-        i += 1
+module IsoDoc
+  module HtmlFunction
+    module Html
+      def update_footnote_filter(fnote, xref, idx, seen)
+        if seen[fnote.text]
+          xref.at("./sup").content = seen[fnote.text][:num].to_s
+          fnote.remove unless xref["href"] == seen[fnote.text][:href]
+          xref["href"] = seen[fnote.text][:href]
+        else
+          seen[fnote.text] = { num: idx, href: xref["href"] }
+          xref.at("./sup").content = idx.to_s
+          idx += 1
+        end
+        [idx, seen]
       end
-      [i, seen]
-    end
 
-    def html_footnote_filter(docxml)
-      seen = {}
-      i = 1
-      docxml.xpath('//a[@class = "FootnoteRef"]').each do |x|
-        fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
-        i, seen = update_footnote_filter(fn, x, i, seen)
+      def html_footnote_filter(docxml)
+        seen = {}
+        i = 1
+        docxml.xpath('//a[@class = "FootnoteRef"]').each do |x|
+          fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
+          i, seen = update_footnote_filter(fn, x, i, seen)
+        end
+        docxml
       end
-      docxml
-    end
 
-    def footnote_backlinks1(x, fn)
-      xdup = x.dup
-      xdup.remove["id"]
-      if fn.elements.empty?
-        fn.children.first.previous = xdup
-      else
-        fn.elements.first.children.first.previous = xdup
+      def footnote_backlinks1(xref, footnote)
+        xdup = xref.dup
+        xdup.remove["id"]
+        if footnote.elements.empty?
+          #footnote.children.empty? and footnote << " "
+          #footnote.children.first.previous = xdup
+          footnote.add_first_child xdup
+        else
+          #footnote.elements.first.children.first.previous = xdup
+          footnote.elements.first.add_first_child xdup
+        end
       end
-    end
 
-    def footnote_backlinks(docxml)
-      seen = {}
-      docxml.xpath('//a[@class = "FootnoteRef"]').each_with_index do |x, i|
-        (seen[x["href"]] and next) or seen[x["href"]] = true
-        fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
-        footnote_backlinks1(x, fn)
-        x["id"] ||= "fnref:#{i + 1}"
-        fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
+      def footnote_backlinks(docxml)
+        seen = {}
+        docxml.xpath('//a[@class = "FootnoteRef"]').each_with_index do |x, i|
+          (seen[x["href"]] and next) or seen[x["href"]] = true
+          fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
+          footnote_backlinks1(x, fn)
+          x["id"] ||= "fnref:#{i + 1}"
+          fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
+        end
+        docxml
       end
-      docxml
-    end
 
-    def footnote_format(docxml)
-      docxml.xpath("//a[@class = 'FootnoteRef']/sup").each do |x|
-        footnote_reference_format(x)
-      end
-      docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
-                   "//span[@class = 'TableFootnoteRef']").each do |x|
-        table_footnote_reference_format(x)
+      def footnote_format(docxml)
+        docxml.xpath("//a[@class = 'FootnoteRef']/sup").each do |x|
+          footnote_reference_format(x)
+        end
+        docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
+                     "//span[@class = 'TableFootnoteRef']").each do |x|
+          table_footnote_reference_format(x)
+        end
+        docxml
       end
-      docxml
     end
   end
 end

data/lib/isodoc/init.rb

@@ -140,5 +140,36 @@ module IsoDoc
     def agency?(text)
       self.class::AGENCIES.include?(text)
     end
+
+    def docid_l10n(text)
+      text.nil? and return text
+      @i18n.all_parts and text.gsub!(/All Parts/i, @i18n.all_parts.downcase)
+      x = Nokogiri::XML::DocumentFragment.parse(text)
+      (x.xpath(".//text()") - x.xpath(".//fn//text()")).each do |n|
+        n.replace(n.text.gsub(/ /, " "))
+      end
+      to_xml(x)
+    end
+
+    def docid_prefix(prefix, docid)
+      docid = "#{prefix} #{docid}" if prefix && !omit_docid_prefix(prefix) &&
+        !/^#{prefix}\b/.match(docid)
+      docid_l10n(docid)
+    end
+
+    def omit_docid_prefix(prefix)
+      prefix.nil? || prefix.empty? and return true
+      %w(ISO IEC IEV ITU W3C BIPM csd metanorma repository metanorma-ordinal)
+        .include? prefix
+    end
+
+    def connectives_spans(text)
+      text.gsub("<conn>", "<span class='fmt-conn'>")
+        .gsub("</conn>", "</span>")
+        .gsub("<enum-comma>", "<span class='fmt-enum-comma'>")
+        .gsub("</enum-comma>", "</span>")
+        .gsub("<comma>", "<span class='fmt-comma'>")
+        .gsub("</comma>", "</span>")
+    end
   end
 end

data/lib/isodoc/metadata.rb

@@ -13,9 +13,18 @@ module IsoDoc
       @i18n.l10n(expr, lang, script, locale)
     end
 
+    def connectives_strip(text)
+      text.gsub("<conn>", "")
+        .gsub("</conn>", "")
+        .gsub("<enum-comma>", "")
+        .gsub("</enum-comma>", "")
+        .gsub("<comma>", "")
+        .gsub("</comma>", "")
+    end
+
     def initialize(lang, script, locale, i18n, fonts_options = {})
-      @metadata = { lang: lang, script: script }
-      DATETYPES.each { |w| @metadata["#{w.gsub('-', '_')}date".to_sym] = "XXX" }
+      @metadata = { lang:, script: }
+      DATETYPES.each { |w| @metadata["#{w.tr('-', '_')}date".to_sym] = "XXX" }
       @lang = lang
       @script = script
       @locale = locale
@@ -29,10 +38,6 @@ module IsoDoc
       @metadata
     end
 
-    def labels
-      @labels
-    end
-
     def set(key, value)
       @metadata[key] = value
     end
@@ -44,10 +49,12 @@ module IsoDoc
     end
 
     def doctype(isoxml, _out)
-      b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text || return
-      set(:doctype, status_print(b))
-      b1 = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}"))&.text || b
-      set(:doctype_display, status_print(b1))
+      b = isoxml.at(ns("//bibdata/ext/doctype#{NOLANG}")) || return
+      set(:doctype, status_print(b.text))
+      b1 = isoxml.at(ns("//bibdata/ext/doctype#{currlang}")) || b
+      set(:doctype_display, status_print(b1.text))
+      b = isoxml.at(ns("//bibdata/ext/subdoctype#{NOLANG}")) || return
+      set(:subdoctype, status_print(b.text))
     end
 
     def docstatus(xml, _out)
@@ -57,11 +64,11 @@ module IsoDoc
       s1 = xml.at(ns("//bibdata/status/stage#{currlang}")) || s
       set(:stage, status_print(s.text))
       s1 and set(:stage_display, status_print(s1.text))
-      (i = xml&.at(ns("//bibdata/status/substage#{NOLANG}"))&.text) and
+      (i = xml.at(ns("//bibdata/status/substage#{NOLANG}"))&.text) and
         set(:substage, i)
-      (i1 = xml&.at(ns("//bibdata/status/substage#{currlang}"))&.text || i) and
+      (i1 = xml.at(ns("//bibdata/status/substage#{currlang}"))&.text || i) and
         set(:substage_display, i1)
-      (i2 = xml&.at(ns("//bibdata/status/iteration"))&.text) and
+      (i2 = xml.at(ns("//bibdata/status/iteration"))&.text) and
         set(:iteration, i2)
       set(:unpublished, unpublished(s.text))
       unpublished(s.text) && set(:stageabbr, stage_abbr(s.text))

data/lib/isodoc/metadata_contributor.rb

@@ -67,24 +67,19 @@ module IsoDoc
       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{/$}, ""))
-      set(:publisher, @i18n.boolean_conj(publisher, "and"))
+      set(:publisher, connectives_strip(@i18n.boolean_conj(publisher, "and")))
       agency_addr(xml)
     end
 

data/lib/isodoc/metadata_date.rb

@@ -42,7 +42,7 @@ module IsoDoc
 
     def bibdate(isoxml, _out)
       isoxml.xpath(ns("//bibdata/date")).each do |d|
-        set("#{d['type'].gsub(/-/, '_')}date".to_sym, Common::date_range(d))
+        set("#{d['type'].tr('-', '_')}date".to_sym, Common::date_range(d))
       end
     end
   end