isodoc 2.12.6 → 2.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48457f7d76baef2d4d349f569e3ee43049253bc9955d50f5c6584d9e8fa2367b
-  data.tar.gz: d87899d14231920e9f2709f2ed5101049e3f0132e2f43f76a67e704c82b91309
+  metadata.gz: d46387b5edc802722718eee916f95086aaf651066ca34ff37b440ddcd98ea600
+  data.tar.gz: ec777b74ccacf348dc787500b6e40c1a310c60ba248562fb4534837531e9e690
 SHA512:
-  metadata.gz: c9f54cf72607cca29215845a2f36ca6de3a74d91a97f002157cf8c09a5baeaf37b2b71dddf2eb91eef3b1ea1c4677ebfc3f3cbfc4fee7bc97cc5d1537b43f925
-  data.tar.gz: f0923719cd684e18c2879de8d1477c17b05fb5b3c5e2597a8189371db49aa59c531a863f96808dcc546b5bd709f3799b3dedac6dc3cf9b96ce5aeef25dda4c19
+  metadata.gz: 34a90598b6fb6c91a2650761a105bce1d2509895106566ae0296235031f768b0330fb419a247b29670d1f6e56df1911b2cbf099c040101a3bc0ce8352ece2391
+  data.tar.gz: c9491f85801636ee19d61e1185211e407e0dbbf58ffa5a8cfa41d5e7f0b3a8e2a84d262ced72fcf70c9bfa71bea29308d6e2757dc39a0a17eab9b841e78a1619

data/isodoc.gemspec

@@ -34,10 +34,10 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
   # spec.add_dependency "relaton-cli"
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
-  spec.add_dependency "mn2pdf", ">= 2.08"
+  spec.add_dependency "mn2pdf", ">= 2.13"
   spec.add_dependency "mn-requirements", "~> 0.4.0"
 
-  spec.add_dependency "relaton-render", "~> 0.8.0"
+  spec.add_dependency "relaton-render", "~> 0.9.0"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   spec.add_dependency "thread_safe"

data/lib/isodoc/function/inline.rb

@@ -21,7 +21,7 @@ module IsoDoc
       SPAN_UNWRAP_CLASSES =
         %w[fmt-caption-label fmt-label-delim fmt-caption-delim fmt-autonum-delim
            fmt-element-name fmt-conn fmt-comma fmt-enum-comma fmt-obligation
-           fmt-xref-container].freeze
+           fmt-xref-container fmt-designation-field].freeze
 
       def span_parse(node, out)
         klass = node["style"] || node["class"]
@@ -203,6 +203,7 @@ module IsoDoc
       def xref_label_parse(node, out); end
 
       def name_parse(node, out); end
+      def semx_definition_parse(node, out); end
 
       def floating_title_parse(node, out); end
 

data/lib/isodoc/function/terms.rb

@@ -10,21 +10,44 @@ module IsoDoc
         para.children.each { |n| parse(n, out) }
       end
 
+      def semx_deprecated_term_parse(node, out); end
+
       def deprecated_term_parse(node, out)
-        out.p class: "DeprecatedTerms", style: "text-align:left;" do |p|
-          node.children.each { |c| parse(c, p) }
+        node.children.each do |c|
+          if c.name == "p"
+            out.p class: "DeprecatedTerms", style: "text-align:left;" do |p|
+              c.children.each { |c1| parse(c1, p) }
+            end
+          else parse(c, out)
+          end
         end
       end
 
+      def semx_admitted_term_parse(node, out); end
+
       def admitted_term_parse(node, out)
-        out.p class: "AltTerms", style: "text-align:left;" do |p|
-          node.children.each { |c| parse(c, p) }
+                node.children.each do |c|
+          if c.name == "p"
+            out.p class: "AltTerms", style: "text-align:left;" do |p|
+              c.children.each { |c1| parse(c1, p) }
+            end
+          else parse(c, out)
+          end
         end
       end
 
+      def semx_term_parse(node, out); end
+
+      def semx_related_parse(node, out); end
+
       def term_parse(node, out)
-        out.p class: "Terms", style: "text-align:left;" do |p|
-          node.children.each { |c| parse(c, p) }
+        node.children.each do |c|
+          if c.name == "p"
+            out.p class: "Terms", style: "text-align:left;" do |p|
+              c.children.each { |c1| parse(c1, p) }
+            end
+          else parse(c, out)
+          end
         end
       end
 
@@ -51,16 +74,15 @@ module IsoDoc
         para&.name != "p" and parse(para, div)
       end
 
+      def semx_termref_parse(node, out); end
+
       def termref_parse(node, out)
         out.p do |p|
           node.children.each { |n| parse(n, p) }
         end
       end
 
-      def termdomain_parse(node, out)
-        node["hidden"] == "true" and return
-        node.children.each { |n| parse(n, out) }
-      end
+      def termdomain_parse(node, out); end
 
       def termdef_parse(node, out)
         name = node.at(ns("./fmt-name"))&.remove

data/lib/isodoc/function/to_word_html.rb

@@ -215,12 +215,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 "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 definition_parse(node, out)
-          when "termsource" then termref_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)

data/lib/isodoc/presentation_function/autonum.rb

@@ -44,14 +44,23 @@ module IsoDoc
       old.delete("id")
     end
 
+    def semx_fmt_dup(elem)
+      elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
+      new = Nokogiri::XML(<<~XML).root
+        <semx xmlns='#{elem.namespace.href}' element='#{elem.name}' source='#{elem['original-id'] || elem['id']}'>#{to_xml(elem.children)}</semx>
+      XML
+      strip_duplicate_ids(nil, elem, new)
+      new
+    end
+
     def gather_all_ids(elem)
       elem.xpath(".//*[@id]").each_with_object([]) do |i, m|
         m << i["id"]
       end
     end
 
-    # remove ids duplicated between title and fmt-title
-    # index terms are assumed transferred to fmt-title from title
+    # remove ids duplicated between sem_title and pres_title
+    # index terms are assumed transferred to pres_title from sem_title
     def strip_duplicate_ids(_node, sem_title, pres_title)
       sem_title && pres_title or return
       ids = gather_all_ids(pres_title)
@@ -75,6 +84,11 @@ module IsoDoc
       "<semx element='autonum' source='#{id}'>#{num}</semx>"
     end
 
+    def semx_orig(node, orig = nil)
+      orig ||= node.parent.parent
+      orig.at(".//*[@id = '#{node['source']}']")
+    end
+
     def labelled_autonum(label, id, num)
       elem = "<span class='fmt-element-name'>#{label}</span>"
       num.blank? and return elem

data/lib/isodoc/presentation_function/concepts.rb

@@ -7,6 +7,7 @@ module IsoDoc
     end
 
     def concept1(node)
+      node.ancestors("definition, termsource, related").empty? or return
       xref = node&.at(ns("./xref/@target"))&.text or
         return concept_render(node, ital: "true", ref: "true", bold: "false",
                                     linkref: "true", linkmention: "false")
@@ -71,20 +72,160 @@ module IsoDoc
     end
 
     def related(docxml)
-      docxml.xpath(ns("//related")).each { |f| related1(f) }
+      docxml.xpath(ns("//fmt-related/semx")).each { |f| related1(f) }
     end
 
     def related1(node)
-      p = node.at(ns("./preferred"))
-      ref = node.at(ns("./xref | ./eref | ./termref"))
-      label = @i18n.relatedterms[node["type"]].upcase
+      p, ref, orig = related1_prep(node)
+      label = @i18n.relatedterms[orig["type"]].upcase
       if p && ref
-        node.replace(l10n("<p><strong>#{label}:</strong> " \
+        node.children =(l10n("<p><strong>#{label}:</strong> " \
                           "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})</p>"))
       else
-        node.replace(l10n("<p><strong>#{label}:</strong> " \
+        node.children = (l10n("<p><strong>#{label}:</strong> " \
                           "<strong>**RELATED TERM NOT FOUND**</strong></p>"))
       end
     end
+
+    def related1_prep(node)
+      p = node.at(ns("./fmt-preferred"))&.children
+      ref = node.at(ns("./xref | ./eref | ./termref"))
+      orig = semx_orig(node)
+      [p, ref, orig]
+    end
+
+    def related_designation1(desgn)
+      out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
+      d1 = semx_fmt_dup(desgn)
+      %w(preferred admitted deprecates).each do |w|
+        d = d1.at(ns("./#{w}[last()]")) and d.after("<fmt-#{w}/>")
+      end
+      out << d1
+    end
+
+    def designation(docxml)
+      docxml.xpath(ns("//related")).each { |p| related_designation1(p) }
+      docxml.xpath(ns("//preferred | //admitted | //deprecates"))
+        .each { |p| designation1(p) }
+      docxml.xpath(ns("//fmt-preferred | //fmt-admitted | //fmt-deprecates"))
+        .each { |t| merge_second_preferred(t) }
+      docxml.xpath(ns("//fmt-deprecates")).each { |d| deprecates(d) }
+      docxml.xpath(ns("//fmt-admitted")).each { |d| admits(d) }
+    end
+
+    def deprecates(elem)
+      elem.xpath(ns(".//semx[@element = 'deprecates']")).each do |t|
+        t.previous = @i18n.l10n("#{@i18n.deprecated}: ")
+      end
+    end
+
+    def admits(elem); end
+
+    def merge_second_preferred(term)
+      pref = nil
+      out = term.xpath(ns("./semx")).each_with_index
+        .with_object([]) do |(p, i), m|
+        if (i.zero? && (pref = p)) || merge_preferred_eligible?(pref, p)
+          m << p
+        else
+          p.wrap("<p></p>")
+        end
+      end
+      pref&.replace(merge_second_preferred1(out, term))
+    end
+
+    def merge_second_preferred1(desgns, term)
+      desgns[1..].each(&:remove)
+      ret = l10n(desgns.map { |x| to_xml(x) }.join("; "))
+      term.ancestors("fmt-related").empty? and ret = "<p>#{ret}</p>"
+      ret
+    end
+
+    def merge_preferred_eligible?(first, second)
+      orig_first, orig_second, firstex, secondex =
+        merge_preferred_eligible_prep(first, second)
+      orig_first["geographic-area"] == orig_second["geographic-area"] &&
+        firstex["language"] == secondex["language"] &&
+        !orig_first.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
+        !orig_second.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
+        orig_first.name == "preferred" && orig_second.name == "preferred"
+    end
+
+    def merge_preferred_eligible_prep(first, second)
+      orig_first = semx_orig(first)
+      orig_second = semx_orig(second)
+      firstex = orig_first.at(ns("./expression")) || {}
+      secondex = orig_second.at(ns("./expression")) || {}
+      [orig_first, orig_second, firstex, secondex]
+    end
+
+    def designation1(desgn)
+      desgn.parent.name == "related" and return
+      out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
+      d1 = semx_fmt_dup(desgn)
+      s = d1.at(ns("./termsource"))
+      name = d1.at(ns("./expression/name | ./letter-symbol/name | " \
+                         "./graphical-symbol")) or return
+      designation_annotate(d1, name, desgn)
+      out << d1
+      s and out << s.wrap("<fmt-termsource></fmt-termsource>").parent
+    end
+
+    def designation_annotate(desgn, name, orig)
+      designation_boldface(desgn)
+      designation_field(desgn, name, orig)
+      #g = desgn.at(ns("./expression/grammar")) and
+        #name << ", #{designation_grammar(g).join(', ')}"
+      designation_grammar(desgn, name)
+      designation_localization(desgn, name, orig)
+      designation_pronunciation(desgn, name)
+      designation_bookmarks(desgn, name)
+      desgn.children = name.children
+    end
+
+    def designation_boldface(desgn)
+      desgn["element"] == "preferred" or return
+      name = desgn.at(ns("./expression/name | ./letter-symbol/name")) or return
+      name.children = "<strong>#{name.children}</strong>"
+    end
+
+    def designation_field(desgn, name, orig)
+      f = orig.xpath(ns("./field-of-application | ./usage-info"))
+        &.map { |u| to_xml(semx_fmt_dup(u)) }&.join(", ")
+      f&.empty? and return nil
+      name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>"
+    end
+
+    def designation_grammar(desgn, name)
+      g = desgn.at(ns("./expression/grammar")) or return
+      ret = []
+      g.xpath(ns("./gender | ./number")).each do |x|
+        ret << @i18n.grammar_abbrevs[x.text]
+      end
+      %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun)
+        .each do |x|
+        g.at(ns("./#{x}[text() = 'true']")) and ret << @i18n.grammar_abbrevs[x]
+      end
+      name << ", #{ret.join(', ')}"
+    end
+
+    def designation_localization(desgn, name, orig_desgn)
+      loc = [desgn.at(ns("./expression/@language"))&.text,
+             desgn.at(ns("./expression/@script"))&.text,
+             orig_desgn.at("./@geographic-area")&.text].compact
+      loc.empty? and return
+      name << ", #{loc.join(' ')}"
+    end
+
+    def designation_pronunciation(desgn, name)
+      f = desgn.at(ns("./expression/pronunciation")) or return
+      name << ", /#{to_xml(f.children)}/"
+    end
+
+    def designation_bookmarks(desgn, name)
+      desgn.xpath(ns(".//bookmark")).each do |b|
+        name << b.remove
+      end
+    end
   end
 end

data/lib/isodoc/presentation_function/docid.rb

@@ -9,7 +9,7 @@ module IsoDoc
     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.empty? or return ret.map { |x| to_xml(x.children) }
       ret = pref_ref_code_parse(bib) or return nil
       ins = bib.at(ns("./docidentifier[last()]"))
       ret.reverse_each do |r|
@@ -50,14 +50,14 @@ module IsoDoc
 
     def bracket_if_num(num)
       num.nil? and return nil
-      num = num.text.sub(/^\[/, "").sub(/\]$/, "")
+      num = to_xml(num.children).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.is_a?(String) or ident = to_xml(ident.children)
       ident.sub(/^\[/, "").sub(/\]$/, "")
     end
 

data/lib/isodoc/presentation_function/erefs.rb

@@ -3,11 +3,23 @@ require "metanorma-utils"
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def citeas(xmldoc)
-      xmldoc.xpath(ns("//eref | //origin | //quote//source")).each do |e|
+      xmldoc.xpath(ns("//eref | //origin | //quote//source | //link"))
+        .each do |e|
         e["bibitemid"] && e["citeas"] or next
-        a = @xrefs.anchor(e["bibitemid"], :xref, false) and
-          e["citeas"] = a.gsub(%r{</?[^>]+>}, "")
+        a = @xrefs.anchor(e["bibitemid"], :xref, false) or next
+        e["citeas"] = citeas_cleanup(a)
+        # link generated in collection postprocessing from eref
+        e.name == "link" && e.text.empty? and e.children = e["citeas"]
+      end
+    end
+
+    def citeas_cleanup(ref)
+      if /</.match?(ref)
+        xml = Nokogiri::XML("<root>#{ref}</root>")
+        xml.xpath("//semx").each { |x| x.replace(x.children) }
+        ref = to_xml(xml.at("//root").children)
       end
+      ref
     end
 
     def expand_citeas(text)

data/lib/isodoc/presentation_function/index.rb

@@ -0,0 +1,180 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def enable_indexsect
+      false
+    end
+
+    def add_id
+      %(id="_#{UUIDTools::UUID.random_create}")
+    end
+
+    def strip_index(docxml)
+      docxml.xpath(ns("//index | //index-xref | //indexsect")).each(&:remove)
+    end
+
+    def index(xml)
+      if enable_indexsect && xml.at(ns("//index"))
+        i = xml.at(ns("//indexsect")) ||
+          xml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}" \
+                             "</title></indexsect>").first
+        index = sort_indexterms(xml.xpath(ns("//index")),
+                                xml.xpath(ns("//index-xref[@also = 'false']")),
+                                xml.xpath(ns("//index-xref[@also = 'true']")))
+        index1(xml, i, index)
+      else strip_index(xml)
+      end
+    end
+
+    def index1(docxml, indexsect, index)
+      c = indexsect.add_child("<ul></ul>").first
+      index.keys.sort.each do |k|
+        words = index[k].keys.each_with_object({}) do |w, v|
+          v[sortable(w).downcase] = w
+        end
+        words.keys.localize(@lang.to_sym).sort.to_a.each do |w|
+          c.add_child index_entries(words, index[k], w)
+        end
+      end
+      index1_cleanup(docxml)
+    end
+
+    def index1_cleanup(docxml)
+      docxml.xpath(ns("//indexsect//xref")).each do |x|
+        x.children.remove
+      end
+      @xrefs.bookmark_anchor_names(docxml)
+    end
+
+    def sortable(str)
+      str or return " "
+      HTMLEntities.new.decode(Nokogiri::XML.fragment(str).text)
+    end
+
+    def index_entries_opt
+      { xref_lbl: ", ", see_lbl: ", #{see_lbl}", also_lbl: ", #{also_lbl}" }
+    end
+
+    def index_entries(words, index, primary)
+      ret = index_entries_head(words[primary],
+                               index.dig(words[primary], nil, nil),
+                               index_entries_opt)
+      words2 = index[words[primary]]&.keys&.compact
+        &.each_with_object({}) { |w, v| v[w.downcase] = w }
+      unless words2.empty?
+        ret += "<ul>"
+        words2.keys.localize(@lang.to_sym).sort.to_a.each do |w|
+          ret += index_entries2(words2, index[words[primary]], w)
+        end
+        ret += "</ul>"
+      end
+      "#{ret}</li>"
+    end
+
+    def index_entries2(words, index, secondary)
+      ret = index_entries_head(words[secondary],
+                               index.dig(words[secondary], nil),
+                               index_entries_opt)
+      words3 = index[words[secondary]]&.keys&.compact
+        &.each_with_object({}) { |w, v| v[w.downcase] = w }
+      unless words3.empty?
+        ret += "<ul>"
+        words3.keys.localize(@lang.to_sym).sort.to_a.each do |w|
+          ret += (index_entries_head(words3[w],
+                                     index[words[secondary]][words3[w]],
+                                     index_entries_opt) + "</li>")
+        end
+        ret += "</ul>"
+      end
+      "#{ret}</li>"
+    end
+
+    def index_entries_head(head, entries, opt)
+      ret = "<li>#{head}"
+      xref = entries&.dig(:xref)&.join(", ")
+      see = index_entries_see(entries, :see)
+      also = index_entries_see(entries, :also)
+      ret += "#{opt[:xref_lbl]} #{xref}" if xref
+      ret += "#{opt[:see_lbl]} #{see}" if see
+      ret += "#{opt[:also_lbl]} #{also}" if also
+      ret
+    end
+
+    def index_entries_see(entries, label)
+      see_sort = entries&.dig(label) or return nil
+      x = see_sort.each_with_object({}) do |w, v|
+        v[sortable(w).downcase] = w
+      end
+      x.keys.localize(@lang.to_sym).sort.to_a.map do |k|
+        # see_sort[k]
+        x[k]
+      end.join(", ")
+    end
+
+    def see_lbl
+      @lang == "en" ? @i18n.see : "<em>#{@i18n.see}</em>"
+    end
+
+    def also_lbl
+      @lang == "en" ? @i18n.see_also : "<em>#{@i18n.see_also}</em>"
+    end
+
+    def sort_indexterms(terms, see, also)
+      index = extract_indexterms(terms)
+      index = extract_indexsee(index, see, :see)
+      index = extract_indexsee(index, also, :also)
+      index.keys.sort.each_with_object({}) do |k, v|
+        v[sortable(k)[0].upcase.transliterate] ||= {}
+        v[sortable(k)[0].upcase.transliterate][k] = index[k]
+      end
+    end
+
+    def extract_indexsee(val, terms, label)
+      terms.each_with_object(val) do |t, v|
+        term, term2, term3 = extract_indexterms_init(t)
+        term_hash_init(v, term, term2, term3, label)
+        v[term][term2][term3][label] << to_xml(t.at(ns("./target"))&.children)
+        t.remove
+      end
+    end
+
+    def xml_encode_attr(str)
+      HTMLEntities.new.encode(str, :basic, :hexadecimal)
+        .gsub(/&#x([^;]+);/) do |_x|
+        "&#x#{$1.upcase};"
+      end
+    end
+
+    # attributes are decoded into UTF-8,
+    # elements in extract_indexsee are still in entities
+    def extract_indexterms(terms)
+      terms.each_with_object({}) do |t, v|
+        term, term2, term3 = extract_indexterms_init(t)
+        to = t["to"] ? "to='#{t['to']}' " : ""
+        index2bookmark(t)
+        term_hash_init(v, term, term2, term3, :xref)
+        v[term][term2][term3][:xref] << "<xref target='#{t['id']}' " \
+                                        "#{to}pagenumber='true'/>"
+      end
+    end
+
+    def extract_indexterms_init(term)
+      %w(primary secondary tertiary).each_with_object([]) do |x, m|
+        m << to_xml(term.at(ns("./#{x}"))&.children)
+      end
+    end
+
+    def term_hash_init(hash, term, term2, term3, label)
+      hash[term] ||= {}
+      hash[term][term2] ||= {}
+      hash[term][term2][term3] ||= {}
+      hash[term][term2][term3][label] ||= []
+    end
+
+    def index2bookmark(node)
+      node.name = "bookmark"
+      node.children.each(&:remove)
+      node["id"] = "_#{UUIDTools::UUID.random_create}"
+      node.delete("to")
+    end
+  end
+end

data/lib/isodoc/presentation_function/inline.rb

@@ -61,6 +61,8 @@ module IsoDoc
     end
 
     def xref1(node)
+      # Semantic XML
+      node.ancestors("related, definition, termsource").empty? or return
       get_linkend(node)
     end
 

data/lib/isodoc/presentation_function/refs.rb

@@ -100,24 +100,27 @@ module IsoDoc
       implicit_reference(bibitem) ||
         bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) ||
         bibitem.at(ns(".//docidentifier[@type = 'metanorma-ordinal']")) ||
+        bibitem["suppress_identifier"] == "true" ||
         bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
     end
 
     def bibliography_bibitem_number(docxml)
       i = 0
-      docxml.xpath(ns("//references[@normative = 'false']/bibitem")).each do |b|
-        i = bibliography_bibitem_number1(b, i)
+      docxml.xpath(ns("//references")).each do |r|
+        r.xpath(ns("./bibitem")).each do |b|
+          i = bibliography_bibitem_number1(b, i, r["normative"] == "true")
+        end
       end
       reference_names docxml
       bibliography_bibitem_tag(docxml)
     end
 
-    def bibliography_bibitem_number1(bibitem, idx)
+    def bibliography_bibitem_number1(bibitem, idx, normative)
       ins = bibliography_bibitem_number_insert_pt(bibitem)
       mn = bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) and
-        /^\[?\d+\]?$/.match?(mn.text) and
-        mn.remove # ignore numbers already inserted
-      unless bibliography_bibitem_number_skip(bibitem)
+        /^\[?\d+\]?$/.match?(mn.text) and mn.remove # ignore numbers already inserted
+      if !bibliography_bibitem_number_skip(bibitem) && (!normative || mn)
+        # respect numeric ids in normative only if already inserted
         idx += 1
         ins.next =
           "<docidentifier type='metanorma-ordinal'>[#{idx}]</docidentifier>"
@@ -126,10 +129,10 @@ module IsoDoc
     end
 
     def bibliography_bibitem_number_insert_pt(bibitem)
+      bibitem.children.empty? and bibitem.add_child(" ")
       unless d = bibitem.at(ns(".//docidentifier"))
         d = bibitem.children.first
-        d.previous = " "
-        return d.previous
+        d.previous = " " and return d.previous
       end
       unless ins = d.previous_element
         d.previous = " "
@@ -150,6 +153,7 @@ module IsoDoc
     def bibliography_bibitem_tag1(ref, idx, norm)
       ref.xpath(ns("./bibitem")).each do |b|
         implicit_reference(b) and next
+        b["suppress_identifier"] == "true" and next
         idx += 1 unless b["hidden"]
         insert_biblio_tag(b, idx, !norm, standard?(b))
       end

data/lib/isodoc/presentation_function/section.rb

@@ -29,7 +29,7 @@ module IsoDoc
     def clause1(elem)
       level = @xrefs.anchor(elem["id"], :level, false) ||
         (elem.ancestors("clause, annex").size + 1)
-      lbl = @xrefs.anchor(elem["id"], :label, elem.parent.name != "sections")
+      lbl = @xrefs.anchor(elem["id"], :label, !unnumbered_clause?(elem))
       if unnumbered_clause?(elem) || !lbl
         prefix_name(elem, {}, nil, "title")
       else
@@ -49,7 +49,7 @@ module IsoDoc
     end
 
     def annex1(elem)
-      lbl = @xrefs.anchor(elem["id"], :label)
+      lbl = @xrefs.anchor(elem["id"], :label, false)
       # TODO: do not alter title, alter semx/@element = title
       t = elem.at(ns("./title")) and
         t.children = "<strong>#{to_xml(t.children)}</strong>"
@@ -81,10 +81,6 @@ module IsoDoc
         end
     end
 
-    def index(docxml)
-      docxml.xpath(ns("//index | //index-xref | //indexsect")).each(&:remove)
-    end
-
     def skip_display_order?(node)
       node.name == "floating-title"
     end

data/lib/isodoc/presentation_function/terms.rb

@@ -1,103 +1,25 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def designation(docxml)
-      docxml.xpath(ns("//term")).each { |t| merge_second_preferred(t) }
-      docxml.xpath(ns("//preferred | //admitted | //deprecates"))
-        .each { |p| designation1(p) }
-      docxml.xpath(ns("//deprecates")).each { |d| deprecates(d) }
-      docxml.xpath(ns("//admitted")).each { |d| admits(d) }
-    end
-
-    def deprecates(elem)
-      elem.add_first_child @i18n.l10n("#{@i18n.deprecated}: ")
-    end
-
-    def admits(elem); end
-
-    def merge_second_preferred(term)
-      pref = nil
-      term.xpath(ns("./preferred[expression/name]")).each_with_index do |p, i|
-        (i.zero? and pref = p) or merge_second_preferred1(pref, p)
-      end
-    end
-
-    def merge_second_preferred1(pref, second)
-      merge_preferred_eligible?(pref, second) or return
-      n1 = pref.at(ns("./expression/name"))
-      n2 = second.remove.at(ns("./expression/name"))
-      n1.children = l10n("#{to_xml(n1.children)}; #{Common::to_xml(n2.children)}")
-    end
-
-    def merge_preferred_eligible?(first, second)
-      firstex = first.at(ns("./expression")) || {}
-      secondex = second.at(ns("./expression")) || {}
-      first["geographic-area"] == second["geographic-area"] &&
-        firstex["language"] == secondex["language"] &&
-        !first.at(ns("./pronunciation | ./grammar")) &&
-        !second.at(ns("./pronunciation | ./grammar"))
-    end
-
-    def designation1(desgn)
-      s = desgn.at(ns("./termsource"))
-      name = desgn.at(ns("./expression/name | ./letter-symbol/name | " \
-                         "./graphical-symbol")) or return
-      designation_annotate(desgn, name)
-      s and desgn.next = s
-    end
-
-    def designation_annotate(desgn, name)
-      designation_boldface(desgn)
-      designation_field(desgn, name)
-      g = desgn.at(ns("./expression/grammar")) and
-        name << ", #{designation_grammar(g).join(', ')}"
-      designation_localization(desgn, name)
-      designation_pronunciation(desgn, name)
-      designation_bookmarks(desgn, name)
-      desgn.children = name.children
-    end
-
-    def designation_boldface(desgn)
-      desgn.name == "preferred" or return
-      name = desgn.at(ns("./expression/name | ./letter-symbol/name")) or return
-      name.children = "<strong>#{name.children}</strong>"
-    end
-
-    def designation_field(desgn, name)
-      f = desgn.xpath(ns("./field-of-application | ./usage-info"))
-        &.map { |u| to_xml(u.children) }&.join(", ")
-      f&.empty? and return nil
-      name << ", &#x3c;#{f}&#x3e;"
-    end
-
-    def designation_grammar(grammar)
-      ret = []
-      grammar.xpath(ns("./gender | ./number")).each do |x|
-        ret << @i18n.grammar_abbrevs[x.text]
+    def termcontainers(docxml)
+      docxml.xpath(ns("//term")).each do |t|
+        %w(preferred admitted deprecates related definition termsource)
+          .each do |w|
+          d = t.at(ns("./#{w}[last()]")) and d.after("<fmt-#{w}/>")
+        end
       end
-      %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun)
-        .each do |x|
-        grammar.at(ns("./#{x}[text() = 'true']")) and
-          ret << @i18n.grammar_abbrevs[x]
+      docxml.xpath(ns("//termsource")).each do |s|
+        s["id"] ||= "_#{UUIDTools::UUID.random_create}"
       end
-      ret
     end
 
-    def designation_localization(desgn, name)
-      loc = [desgn&.at(ns("./expression/@language"))&.text,
-             desgn&.at(ns("./expression/@script"))&.text,
-             desgn&.at(ns("./@geographic-area"))&.text].compact
-      loc.empty? and return
-      name << ", #{loc.join(' ')}"
-    end
-
-    def designation_pronunciation(desgn, name)
-      f = desgn.at(ns("./expression/pronunciation")) or return
-      name << ", /#{to_xml(f.children)}/"
-    end
-
-    def designation_bookmarks(desgn, name)
-      desgn.xpath(ns(".//bookmark")).each do |b|
-        name << b.remove
+    def termcleanup(docxml)
+      docxml.xpath(ns("//term")).each do |t|
+        %w(preferred admitted deprecates related definition termsource)
+          .each do |w|
+          t.xpath(ns("./#{w}//fmt-name | ./#{w}//fmt-xref-label")).each(&:remove)
+          f = t.at(ns(".//fmt-#{w}"))
+          f&.children&.empty? and f.remove
+        end
       end
     end
 
@@ -123,29 +45,32 @@ module IsoDoc
     end
 
     def termdefinition(docxml)
-      docxml.xpath(ns("//term[definition]")).each do |f|
-        termdefinition1(f)
-      end
+      docxml.xpath(ns("//term[definition]")).each { |f| termdefinition1(f) }
     end
 
     def termdefinition1(elem)
-      unwrap_definition(elem)
-      multidef(elem) if elem.xpath(ns("./definition")).size > 1
-      termdomain(elem)
+      d = elem.xpath(ns("./definition"))
+      d1 = elem.at(ns("./fmt-definition"))
+      if d.size > 1 then multidef(elem, d, d1)
+      else singledef(elem, d, d1)
+      end
+      unwrap_definition(elem, d1)
+      termdomain(elem, d1)
     end
 
-    def multidef(elem)
-      d = elem.at(ns("./definition"))
-      d = d.replace("<ol><li>#{to_xml(d.children)}</li></ol>").first
-      elem.xpath(ns("./definition")).each do |f|
-        f = f.replace("<li>#{to_xml(f.children)}</li>").first
-        d << f
+    def multidef(_elem, defn, fmt_defn)
+      ret = defn.each_with_object([]) do |f, m|
+        m << "<li>#{to_xml(semx_fmt_dup(f))}</li>"
       end
-      d.wrap("<definition></definition>")
+      fmt_defn << "<ol>#{ret.join("\n")}</ol>"
     end
 
-    def unwrap_definition(elem)
-      elem.xpath(ns("./definition")).each do |d|
+    def singledef(_elem, defn, fmt_defn)
+      fmt_defn << semx_fmt_dup(defn.first)
+    end
+
+    def unwrap_definition(_elem, fmt_defn)
+      fmt_defn.xpath(ns(".//semx[@element = 'definition']")).each do |d|
         %w(verbal-definition non-verbal-representation).each do |e|
           v = d&.at(ns("./#{e}"))
           v&.replace(v.children)
@@ -153,26 +78,62 @@ module IsoDoc
       end
     end
 
-    def termdomain(elem)
+    def termdomain(elem, fmt_defn)
       d = elem.at(ns(".//domain")) or return
-      p = elem.at(ns(".//definition//p")) or return
-      p.add_first_child "&lt;#{d.to_xml}&gt;  "
-      d["hidden"] = true
+      p = fmt_defn.at(ns(".//p")) or return
+      d1 = semx_fmt_dup(d)
+      p.add_first_child "&lt;#{to_xml(d1)}&gt;  "
     end
 
     def termsource(docxml)
-      docxml.xpath(ns("//termsource")).each { |f| termsource_modification(f) }
-      docxml.xpath(ns("//termsource")).each { |f| termsource1(f) }
+      copy_baselevel_termsource(docxml)
+      # TODO should I wrap fmt-definition//termsource in fmt-termsource, in order to preserve termsource attributes?
+      docxml.xpath(ns("//fmt-termsource/termsource | //fmt-definition//termsource | //fmt-preferred//termsource | //fmt-admitted//termsource | //fmt-deprecates//termsource"))
+        .each do |f|
+        termsource_modification(f)
+      end
+      docxml.xpath(ns("//fmt-preferred//fmt-termsource | //fmt-admitted//fmt-termsource | //fmt-deprecates//fmt-termsource"))
+        .each do |f|
+          termsource_designation(f)
+        end
+      docxml.xpath(ns("//fmt-termsource/termsource | //fmt-definition//termsource | //fmt-preferred//termsource | //fmt-admitted//termsource | //fmt-deprecates//termsource"))
+        .each do |f|
+        f.parent and termsource1(f)
+      end
+    end
+
+    def termsource_designation(fmtsource)
+      p = fmtsource.previous_element
+          p&.name == "p" or return
+          p << " "
+          p << fmtsource.children
+    end
+
+    def copy_baselevel_termsource(docxml)
+      docxml.xpath(ns("//term[termsource]")).each do |x|
+        s = x.xpath(ns("./termsource"))
+        s1 = x.at(ns("./fmt-termsource"))
+        s.each { |ss| s1 << ss.clone }
+        strip_duplicate_ids(nil, s, s1)
+        %w(status type).each { |a| s[0][a] and s1[a] = s[0][a] }
+      end
     end
 
     def termsource1(elem)
+      ret = [semx_fmt_dup(elem)]
       while elem&.next_element&.name == "termsource"
-        elem << "; #{to_xml(elem.next_element.remove.children)}"
+        ret << semx_fmt_dup(elem.next_element.remove)
       end
-      elem.children = l10n("[#{@i18n.source}: #{to_xml(elem.children).strip}]")
+      s = ret.map { |x| to_xml(x) }.map(&:strip).join("; ")
+      termsource_label(elem, s)
+    end
+
+    def termsource_label(elem, sources)
+      elem.replace(l10n("[#{@i18n.source}: #{sources}]"))
     end
 
     def termsource_modification(elem)
+      elem.xpath(".//text()[normalize-space() = '']").each(&:remove)
       origin = elem.at(ns("./origin"))
       s = termsource_status(elem["status"]) and origin.next = l10n(", #{s}")
       termsource_add_modification_text(elem.at(ns("./modification")))
@@ -180,10 +141,13 @@ module IsoDoc
 
     def termsource_add_modification_text(mod)
       mod or return
-      mod.text.strip.empty? or mod.previous = " &#x2014; "
-      mod.elements.size == 1 and
-        mod.elements[0].replace(mod.elements[0].children)
-      mod.replace(mod.children)
+      if mod.text.strip.empty?
+        mod.remove
+        return
+      end
+      mod.previous = " &#x2014; "
+      mod.elements.size == 1 and mod.children = to_xml(mod.elements[0].children)
+      mod.replace(semx_fmt_dup(mod))
     end
 
     def termsource_status(status)

data/lib/isodoc/presentation_function/xrefs.rb

@@ -21,7 +21,7 @@ module IsoDoc
       node["style"] == "id" and
         return anchor_id_postproc(node)
       node["citeas"].nil? && node["bibitemid"] and
-        return @xrefs.anchor(node["bibitemid"], :xref) || "???"
+        return citeas_cleanup(@xrefs.anchor(node["bibitemid"], :xref)) || "???"
       node.at(ns("./location")) and
         return combine_xref_locations(node) || "???"
       node["target"] && node["droploc"] and

data/lib/isodoc/presentation_xml_convert.rb

@@ -7,6 +7,7 @@ require_relative "presentation_function/erefs"
 require_relative "presentation_function/inline"
 require_relative "presentation_function/math"
 require_relative "presentation_function/section"
+require_relative "presentation_function/index"
 require_relative "presentation_function/bibdata"
 require_relative "presentation_function/metadata"
 
@@ -107,6 +108,7 @@ module IsoDoc
     end
 
     def terms(docxml)
+      termcontainers docxml
       termexample docxml
       termnote docxml
       termdefinition docxml
@@ -114,6 +116,7 @@ module IsoDoc
       termsource docxml
       concept docxml
       related docxml
+      termcleanup docxml
     end
 
     def semantic_xml_insert(xml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.12.6".freeze
+  VERSION = "2.12.8".freeze
 end

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -15,6 +15,9 @@ termsdefsymbols: المصطلحات والتعريفات والرموز
 termsdefabbrev: المصطلحات والتعريفات والاختصارات
 normref: المراجع المعيارية
 bibliography: بيبليوغرافيا
+index: الفهرس
+see: انظر
+see_also: انظر أيضًا
 clause: فقرة
 annex: ملحق
 appendix: تذييل

data/lib/isodoc-yaml/i18n-de.yaml

@@ -15,6 +15,9 @@ termsdefsymbols: Begriffe, Definitionen und Symbole
 termsdefabbrev: Begriffe, Definitionen und abgekürzte Begriffe
 normref: Normative Verweise
 bibliography: Bibliographie
+index: Index
+see: schau
+see_also: siehe auch
 clause: Klausel
 annex: Anhang
 appendix: Appendix

data/lib/isodoc-yaml/i18n-en.yaml

@@ -14,6 +14,9 @@ termsdefsymbols: Terms, definitions and symbols
 termsdefabbrev: Terms, definitions and abbreviated terms
 normref: Normative references
 bibliography: Bibliography
+index: Index
+see: see
+see_also: see also
 preface: Preface
 section: Section
 clause: Clause

data/lib/isodoc-yaml/i18n-es.yaml

@@ -14,6 +14,9 @@ termsdefsymbols: Términos, definiciones y símbolos
 termsdefabbrev: Términos, definiciones y términos abreviados
 normref: Referencias normativas
 bibliography: Bibliografía
+index: Índice
+see: ver
+see_also: ver también
 section: Sección
 clause: Cláusula
 annex: Anexo

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -14,6 +14,9 @@ termsdefsymbols: Termes, définitions et symboles
 termsdefabbrev: Termes, définitions et termes abrégés
 normref: Références normatives
 bibliography: Bibliographie
+index: Index
+see: voir
+see_also: voir aussi
 preface: Préface
 section: Section
 clause: Article

data/lib/isodoc-yaml/i18n-ja.yaml

@@ -14,6 +14,9 @@ termsdefsymbols: 用語及び定義並びに記号
 termsdefabbrev: 用語及び定義並びに略語
 normref: 引用規格
 bibliography: 参考文献
+index: 索引
+see: 参照
+see_also: 追加参照
 preface: 序文
 section: セクション
 clause: 箇条

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -14,6 +14,9 @@ termsdefsymbols: Термины, определения и символы
 termsdefabbrev: Термины, определения и сокращенные термины
 normref: Нормативные ссылки
 bibliography: Библиография
+index: Алфавитный указатель
+see: см.
+see_also: см. также
 section: Раздел
 clause: Пункт
 annex: Дополнение

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -14,6 +14,9 @@ termsdefsymbols: 术语、定义、符号和代号
 termsdefabbrev: 术语、定义、符号和缩略语
 normref: 规范性引用文件
 bibliography: 参考文献
+index: 索引
+see: 见
+see_also: 另见
 preface: 序言
 section: 条
 clause: 条

data/lib/relaton/render-isodoc/config.yml

@@ -1,4 +1,4 @@
 template:
   # skip authoritative identifier, it is inserted in front of formattedref within metanorma
-  standard: "{% if creatornames %}{{ creatornames }} ({{ role}}){%else%}{{publisher}}{%endif%} . <em>{{ title }}</em> . {{ labels['in'] | capitalize }}:_{{ series_title }}. {{ medium | capitalize }}. {{ edition | capitalize_first }}. {{date}}. {{place}}: {%if  creatornames %}{{publisher}}{% endif %} . {{size}}. {{ extent }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  standard: "{% if creatornames %}{{ creatornames }} ({{ role}}){%else%}{{publisher}}{%endif%} . <em>{{ title }}</em> . {{ medium | capitalize }}. {{ edition | capitalize_first }}. {{date}}. {{place}}: {%if  creatornames %}{{publisher}}{% endif %} . {{size}}. {{ extent }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.12.6
+  version: 2.12.8
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.08'
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.08'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: mn-requirements
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -439,6 +439,7 @@ files:
 - lib/isodoc/presentation_function/docid.rb
 - lib/isodoc/presentation_function/erefs.rb
 - lib/isodoc/presentation_function/image.rb
+- lib/isodoc/presentation_function/index.rb
 - lib/isodoc/presentation_function/inline.rb
 - lib/isodoc/presentation_function/math.rb
 - lib/isodoc/presentation_function/metadata.rb
@@ -485,7 +486,7 @@ homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -501,7 +502,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.
 test_files: []