isodoc 2.12.0 → 2.12.2

data/lib/isodoc/function/references.rb

@@ -1,16 +1,7 @@
 module IsoDoc
   module Function
     module References
-      # This is highly specific to ISO, but it's not a bad precedent for
-      # references anyway; keeping here instead of in IsoDoc::Iso for now
-      def docid_l10n(text)
-        text.nil? and return text
-        @i18n.all_parts and text.gsub!(/All Parts/i, @i18n.all_parts.downcase)
-        text.size < 20 and text.gsub!(/ /, "&#xa0;")
-        text
-      end
-
-      def nonstd_bibitem(list, bib, _ordinal, biblio)
+      def bibitem_entry(list, bib, _ordinal, biblio)
         list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
           tag = bib.at(ns("./biblio-tag"))
           tag&.children&.each { |n| parse(n, ref) }
@@ -18,139 +9,24 @@ module IsoDoc
         end
       end
 
-      def std_bibitem_entry(list, bib, _ordinal, biblio)
-        list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
-          tag = bib.at(ns("./biblio-tag"))
-          tag&.children&.each { |n| parse(n, ref) }
-          reference_format(bib, ref)
-        end
-      end
-
-      SKIP_DOCID = <<~XPATH.strip.freeze
-        @type = 'DOI' or @type = 'doi' or @type = 'ISSN' or @type = 'issn' or @type = 'ISBN' or @type = 'isbn' or starts-with(@type, 'ISSN.') or starts-with(@type, 'ISBN.') or starts-with(@type, 'issn.') or starts-with(@type, 'isbn.')
-      XPATH
-
-      def pref_ref_code(bib)
-        bib["suppress_identifier"] == "true" and return nil
-        ret = bib.xpath(ns("./docidentifier[@scope = 'biblio-tag']"))
-        ret.empty? or return ret.map(&:text)
-        ret = pref_ref_code_parse(bib) or return nil
-        ins = bib.at(ns("./docidentifier[last()]"))
-        ret.reverse.each do |r|
-          ins.next = "<docidentifier scope='biblio-tag'>#{docid_l10n(r)}</docidentifier>"
-        end
-        ret
-      end
-
-      def pref_ref_code_parse(bib)
-        data, = @bibrender.parse(bib)
-        ret = data[:authoritative_identifier] or return nil
-        ret.empty? and return nil
-        ret
-      end
-
-      # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
-      def bibitem_ref_code(bib)
-        id, id1, id2, id3 = bibitem_ref_code_prep(bib)
-        id || id1 || id2 || id3 and return [id, id1, id2, id3]
-        bib["suppress_identifier"] == "true" and return [nil, nil, nil, nil]
-        [nil, no_identifier(bib), nil, nil]
-      end
-
-      def bibitem_ref_code_prep(bib)
-        id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
-        id1 = pref_ref_code(bib)
-        id2 = bib.at(ns("./docidentifier[#{SKIP_DOCID}]"))
-        id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))
-        [id, id1, id2, id3]
-      end
-
-      def no_identifier(bib)
-        @i18n.no_identifier or return nil
-        id = Nokogiri::XML::Node.new("docidentifier", bib.document)
-        id << @i18n.no_identifier
-        id
-      end
-
-      def bracket_if_num(num)
-        num.nil? and return nil
-        num = num.text.sub(/^\[/, "").sub(/\]$/, "")
-        /^\d+$/.match?(num) and return "[#{num}]"
-        num
-      end
-
-      def unbracket1(ident)
-        ident.nil? and return nil
-        ident.is_a?(String) or ident = ident.text
-        ident.sub(/^\[/, "").sub(/\]$/, "")
-      end
-
-      def unbracket(ident)
-        if ident.respond_to?(:size)
-          ident.map { |x| unbracket1(x) }.join("&#xA0;/ ")
-        else
-          unbracket1(ident)
-        end
-      end
-
-      def render_identifier(ident)
-        { metanorma: bracket_if_num(ident[0]),
-          sdo: unbracket(ident[1]),
-          doi: unbracket(ident[2]),
-          ordinal: bracket_if_num(ident[3]) }
-      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)
-        return true if prefix.nil? || prefix.empty?
-
-        %w(ISO IEC IEV ITU W3C BIPM csd metanorma repository metanorma-ordinal)
-          .include? prefix
-      end
-
       def iso_bibitem_entry_attrs(bib, biblio)
         { id: bib["id"], class: biblio ? "Biblio" : "NormRef" }
       end
 
-      # reference not to be rendered because it is deemed implicit
-      # in the standards environment
-      def implicit_reference(bib)
-        bib["hidden"] == "true"
-      end
-
       def reference_format(bib, out)
         ftitle = bib.at(ns("./formattedref"))
         ftitle&.children&.each { |n| parse(n, out) }
       end
 
-      def standard?(bib)
-        ret = false
-        bib.xpath(ns("./docidentifier")).each do |id|
-          next if id["type"].nil? ||
-            id.at(".//self::*[#{SKIP_DOCID} or @type = 'metanorma']")
-
-          ret = true
-        end
-        ret
-      end
-
       def biblio_list(refs, div, biblio)
         i = 0
         refs.children.each do |b|
           if b.name == "bibitem"
-            next if implicit_reference(b)
-
-            i += 1 unless b["hidden"]
-            if standard?(b) then std_bibitem_entry(div, b, i, biblio)
-            else nonstd_bibitem(div, b, i, biblio)
-            end
+            b["hidden"] == "true" and next
+            i += 1
+            bibitem_entry(div, b, i, biblio)
           else
-            parse(b, div) unless %w(title).include? b.name
+            parse(b, div) unless %w(fmt-title).include? b.name
           end
         end
       end
@@ -165,9 +41,9 @@ module IsoDoc
       def norm_ref(node, out)
         node["hidden"] != "true" or return
         out.div do |div|
-          clause_name(node, node.at(ns("./title")), div, nil)
+          clause_name(node, node.at(ns("./fmt-title")), div, nil)
           if node.name == "clause"
-            node.elements.each { |e| parse(e, div) unless e.name == "title" }
+            node.elements.each { |e| parse(e, div) unless e.name == "fmt-title" }
           else biblio_list(node, div, false)
           end
         end
@@ -184,7 +60,7 @@ module IsoDoc
         page_break(out)
         out.div do |div|
           div.h1 class: "Section3" do |h1|
-            node.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
+            node.at(ns("./fmt-title"))&.children&.each { |c2| parse(c2, h1) }
           end
           biblio_list(node, div, true)
         end
@@ -193,7 +69,7 @@ module IsoDoc
       def bibliography_parse(node, out)
         node["hidden"] != true or return
         out.div do |div|
-          clause_parse_title(node, div, node.at(ns("./title")), out,
+          clause_parse_title(node, div, node.at(ns("./fmt-title")), out,
                              { class: "Section3" })
           biblio_list(node, div, true)
         end

data/lib/isodoc/function/reqt.rb

@@ -20,9 +20,9 @@ module IsoDoc
       end
 
       def recommendation_parse1(node, out)
-        recommendation_name(node.at(ns("./name")), out)
+        recommendation_name(node.at(ns("./fmt-name")), out)
         node.children.each do |n|
-          parse(n, out) unless n.name == "name"
+          parse(n, out) unless n.name == "fmt-name"
         end
       end
 

data/lib/isodoc/function/section.rb

@@ -10,8 +10,8 @@ module IsoDoc
       # used for subclauses
       def clause_parse(node, out)
         out.div **attr_code(clause_attrs(node)) do |div|
-          clause_parse_title(node, div, node.at(ns("./title")), out)
-          node.children.reject { |c1| c1.name == "title" }.each do |c1|
+          clause_parse_title(node, div, node.at(ns("./fmt-title")), out)
+          node.children.reject { |c1| c1.name == "fmt-title" }.each do |c1|
             parse(c1, div)
           end
         end
@@ -19,8 +19,8 @@ module IsoDoc
 
       def clause(node, out)
         out.div **attr_code(clause_attrs(node)) do |s|
-          clause_name(node, node.at(ns("./title")), s, nil)
-          node.elements.reject { |c1| c1.name == "title" }.each do |c1|
+          clause_name(node, node.at(ns("./fmt-title")), s, nil)
+          node.elements.reject { |c1| c1.name == "fmt-title" }.each do |c1|
             parse(c1, s)
           end
         end
@@ -34,7 +34,7 @@ module IsoDoc
         page_break(out)
         out.div **attr_code(annex_attrs(node)) do |s|
           node.elements.each do |c1|
-            if c1.name == "title" then annex_name(node, c1, s)
+            if c1.name == "fmt-title" then annex_name(node, c1, s)
             else parse(c1, s)
             end
           end
@@ -47,9 +47,9 @@ module IsoDoc
 
       def scope(node, out)
         out.div **attr_code(id: node["id"]) do |div|
-          clause_name(node, node.at(ns("./title")), div, nil)
+          clause_name(node, node.at(ns("./fmt-title")), div, nil)
           node.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end
@@ -59,9 +59,9 @@ module IsoDoc
 
       def terms_defs(node, out)
         out.div **attr_code(id: node["id"]) do |div|
-          clause_name(node, node.at(ns("./title")), div, nil)
+          clause_name(node, node.at(ns("./fmt-title")), div, nil)
           node.elements.each do |e|
-            parse(e, div) unless %w{title source}.include? e.name
+            parse(e, div) unless %w{fmt-title source}.include? e.name
           end
         end
       end
@@ -73,28 +73,25 @@ module IsoDoc
 
       def symbols_abbrevs(node, out)
         out.div **attr_code(id: node["id"], class: "Symbols") do |div|
-          clause_name(node, node.at(ns("./title")), div, nil)
+          clause_name(node, node.at(ns("./fmt-title")), div, nil)
           node.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end
 
       # subclause
       def symbols_parse(isoxml, out)
-        isoxml.at(ns("./title")) or
-          #isoxml.children.first.previous = "<title>#{@i18n.symbols}</title>"
-          isoxml.add_first_child "<title>#{@i18n.symbols}</title>"
         clause_parse(isoxml, out)
       end
 
       def introduction(clause, out)
         page_break(out)
         out.div class: "Section3", id: clause["id"] do |div|
-          clause_name(clause, clause.at(ns("./title")), div,
+          clause_name(clause, clause.at(ns("./fmt-title")), div,
                       { class: "IntroTitle" })
           clause.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end
@@ -102,9 +99,9 @@ module IsoDoc
       def foreword(clause, out)
         page_break(out)
         out.div **attr_code(id: clause["id"]) do |s|
-          clause_name(clause, clause.at(ns("./title")) || @i18n.foreword, s,
+          clause_name(clause, clause.at(ns("./fmt-title")), s,
                       { class: "ForewordTitle" })
-          clause.elements.each { |e| parse(e, s) unless e.name == "title" }
+          clause.elements.each { |e| parse(e, s) unless e.name == "fmt-title" }
         end
       end
 
@@ -112,9 +109,9 @@ module IsoDoc
         title_attr = { class: "IntroTitle" }
         page_break(out)
         out.div class: "Section3", id: clause["id"] do |div|
-          clause_name(clause, clause.at(ns("./title")), div, title_attr)
+          clause_name(clause, clause.at(ns("./fmt-title")), div, title_attr)
           clause.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end
@@ -122,9 +119,9 @@ module IsoDoc
       def abstract(clause, out)
         page_break(out)
         out.div **attr_code(id: clause["id"]) do |s|
-          clause_name(clause, clause.at(ns("./title")), s,
+          clause_name(clause, clause.at(ns("./fmt-title")), s,
                       { class: "AbstractTitle" })
-          clause.elements.each { |e| parse(e, s) unless e.name == "title" }
+          clause.elements.each { |e| parse(e, s) unless e.name == "fmt-title" }
         end
       end
 
@@ -144,10 +141,10 @@ module IsoDoc
       def preface_normal(clause, out)
         page_break(out)
         out.div **attr_code(preface_attrs(clause)) do |div|
-          clause_name(clause, clause.at(ns("./title")), div,
+          clause_name(clause, clause.at(ns("./fmt-title")), div,
                       { class: "IntroTitle" })
           clause.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end
@@ -156,10 +153,10 @@ module IsoDoc
         @bare and return
         page_break(out)
         out.div **attr_code(preface_attrs(clause)) do |div|
-          clause_name(clause, clause.at(ns("./title")), div,
+          clause_name(clause, clause.at(ns("./fmt-title")), div,
                       { class: "IntroTitle" })
           clause.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end
@@ -168,10 +165,10 @@ module IsoDoc
         @seen_colophon or page_break(out)
         @seen_colophon = true
         out.div class: "Section3", id: node["id"] do |div|
-          clause_name(node, node.at(ns("./title")), div,
+          clause_name(node, node.at(ns("./fmt-title")), div,
                       { class: "IntroTitle" })
           node.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end

data/lib/isodoc/function/section_titles.rb

@@ -18,18 +18,24 @@ module IsoDoc
         end
       end
 
+      def sections_names
+        %w[clause annex terms references definitions
+           acknowledgements introduction abstract foreword appendix]
+      end
+
       def freestanding_title(node, out)
-        parents = node.ancestors("clause, annex, terms, references, " \
-                               "definitions, acknowledgements, introduction, " \
-                               "foreword")
+        # node.parent.at(ns("./fmt-title[@source = '#{node['id']}']")) and
+        # return # this title is already being rendered as fmt-title
+        # For testing convenience, let's just go by parent
+        sections_names.include?(node.parent.name) and return
+        parents = node.ancestors(sections_names.join(", "))
         clause_parse_title(parents.empty? ? node : parents.first,
                            out, node, out)
       end
 
       # used for subclauses
       def clause_parse_title(node, div, title, out, header_class = {})
-        return if title.nil?
-
+        title.nil? and return
         if node["inline-header"] == "true"
           inline_header_title(out, node, title)
         else
@@ -46,9 +52,7 @@ module IsoDoc
       end
 
       def clause_title_depth(node, title)
-        depth = node.ancestors("clause, annex, terms, references, " \
-                               "definitions, acknowledgements, introduction, " \
-                               "foreword").size + 1
+        depth = node.ancestors(sections_names.join(", ")).size + 1
         depth = title["depth"] if title && title["depth"]
         depth
       end
@@ -63,12 +67,12 @@ module IsoDoc
       end
 
       # top level clause names
-      def clause_name(node, title, div, header_class)
+      def clause_name(_node, title, div, header_class)
         header_class = {} if header_class.nil?
         div.h1 **attr_code(header_class) do |h1|
           if title.is_a?(String) then h1 << title
-          else
-            title&.children&.each { |c2| parse(c2, h1) }
+          elsif title
+            children_parse(title, h1)
             clause_parse_subtitle(title, h1)
           end
         end
@@ -76,8 +80,7 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        return if name.nil?
-
+        name.nil? and return
         div.h1 class: "Annex" do |t|
           name.children.each { |c2| parse(c2, t) }
           clause_parse_subtitle(name, t)

data/lib/isodoc/function/table.rb

@@ -2,7 +2,7 @@ module IsoDoc
   module Function
     module Table
       def table_title_parse(node, out)
-        name = node.at(ns("./name")) or return
+        name = node.at(ns("./fmt-name")) or return
         out.p class: "TableTitle", style: "text-align:center;" do |p|
           name&.children&.each { |n| parse(n, p) }
         end
@@ -112,12 +112,12 @@ module IsoDoc
         !header && cell.name == "th" and
           scope = (cell["rowspan"] ? "rowgroup" : "row")
         { rowspan: cell["rowspan"], colspan: cell["colspan"],
-          style: style.gsub(/\n/, ""), scope: scope, class: cell["class"] }
+          style: style.delete("\n"), scope: scope, class: cell["class"] }
       end
 
       def make_tr_attr_style(row, rowmax, totalrows, _header, bordered)
         bordered or return ""
-        <<~STYLE.gsub(/\n/, "")
+        <<~STYLE.delete("\n")
           border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}
           border-bottom:#{SW} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;
         STYLE

data/lib/isodoc/function/terms.rb

@@ -28,30 +28,27 @@ module IsoDoc
         end
       end
 
-      def para_then_remainder(first, node, para, div)
-        if first.name == "p"
-          first.children.each { |n| parse(n, para) }
-          node.elements.drop(1).each { |n| parse(n, div) }
-        else
-          node.elements.each { |n| parse(n, div) }
-        end
-      end
-
-      def termnote_delim
-        l10n(": ")
+      def termnote_p_class
+        nil
       end
 
       def termnote_parse(node, out)
-        name = node&.at(ns("./name"))&.remove
+        para = block_body_first_elem(node)
         out.div **note_attrs(node) do |div|
-          div.p do |p|
-            if name
-              name.children.each { |n| parse(n, p) }
-              p << termnote_delim
+          termnote_parse1(node, para, div)
+          para&.xpath("./following-sibling::*")&.each { |n| parse(n, div) }
+        end
+      end
+
+      def termnote_parse1(node, para, div)
+        div.p **attr_code(class: termnote_p_class) do |p|
+          name = node.at(ns("./fmt-name")) and
+            p.span class: "termnote_label" do |s|
+              children_parse(name, s)
             end
-            para_then_remainder(node.first_element_child, node, p, div)
-          end
+          para&.name == "p" and children_parse(para, p)
         end
+        para&.name != "p" and parse(para, div)
       end
 
       def termref_parse(node, out)
@@ -60,12 +57,16 @@ module IsoDoc
         end
       end
 
+      def termdomain_parse(node, out)
+        node["hidden"] == "true" and return
+        node.children.each { |n| parse(n, out) }
+      end
+
       def termdef_parse(node, out)
-        name = node&.at(ns("./name"))&.remove
+        name = node.at(ns("./fmt-name"))&.remove
         out.p class: "TermNum", id: node["id"] do |p|
           name&.children&.each { |n| parse(n, p) }
         end
-        set_termdomain("")
         node.children.each { |n| parse(n, out) }
       end
 

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
@@ -222,7 +218,7 @@ module IsoDoc
           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 "domain" then termdomain_parse(node, out)
           when "definition" then definition_parse(node, out)
           when "termsource" then termref_parse(node, out)
           when "modification" then modification_parse(node, out)
@@ -261,9 +257,16 @@ module IsoDoc
           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)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/function/utils.rb

@@ -24,7 +24,7 @@ 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
 

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,7 +74,7 @@ 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"
         attr = sourcecode_attrs(node).merge(class: "sourcecode")
         out.send tag, **attr do |div|

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,6 +13,15 @@ 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:, script: }
       DATETYPES.each { |w| @metadata["#{w.tr('-', '_')}date".to_sym] = "XXX" }

data/lib/isodoc/metadata_contributor.rb

@@ -79,7 +79,7 @@ module IsoDoc
     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