isodoc 2.12.7 → 2.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f9a52529adbedd3c9bfc375db556ea9402a7fcd7e384ccff66c70a2aeb2c964
-  data.tar.gz: 11533489300d99ed35875d79d7327e9acf918ffb4b7bd48552e870b303ce9be5
+  metadata.gz: 07e9e5bf21e51fd8f43a9a7173a75fef2b5763953c2ea308b3d0860ed1fedb66
+  data.tar.gz: 8a8195a4271689359e8149bf037d05f440d7ca0a3363242c68616f053c9bd177
 SHA512:
-  metadata.gz: 1fce7b6367b473390f95f062965d6c456c684e5eb5b3ad65622e3cb880e7aa3230f33ea11f7dd4d471c6125843747831e03742b2e17abc220ea9ed0995ee5c14
-  data.tar.gz: a3d34d1c3e98b88451073fe6cd585bbcec1e7c40964bd31cba17494934c864460269ca2c77db9803461448405019800ce731fbff7fef8c560bdb05196c35cc97
+  metadata.gz: 58941c30a9af219ae12a7154009286107fec41b38615a757a87ba974a23c9cedda4b0fbe7af2b1a674993ef77ba565bab378a1a4a30c19f929c70d7fd66e6f97
+  data.tar.gz: cfbaae3c97005709624a8bb4f1e6015fd834dd98805223e20ec3b8e3560daaaa702d6e533e8c7a02e452dc0b9dab7c4b0d232ba9c34c849ff59f8a05d9ed5245

data/isodoc.gemspec

@@ -34,7 +34,7 @@ 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.9.0"

data/lib/isodoc/base_style/scripts.html

@@ -6,21 +6,34 @@
   </script>
 
   <script>
-  //TOC toggle animation
-$('#toggle').on('click', function(){
-    if( $('nav').is(':visible') ) {
-        $('nav').animate({ 'left': '-353px' }, 'slow', function(){
-            $('nav').hide();
+    //TOC toggle animation
+    (function() {
+      const jqNav = $('nav');
+      const jqBody = $('body');
+      const jqToggle = $('#toggle');
+      const animationSpeed = 'slow';
+
+      jqToggle.on('click', function() {
+        const isNavVisible = jqNav.is(':visible');
+        const fullNavWidth = jqNav.outerWidth();
+        const navLeft = isNavVisible ? '-' + fullNavWidth + 'px' : '0px';
+        const bodyMarginLeft = isNavVisible ? '0px' : fullNavWidth + 'px';
+
+        // Stop current animations
+        jqNav.stop(true, true);
+        jqBody.stop(true, true);
+
+        if(!isNavVisible) {
+            jqNav.show();
+        }
+        jqNav.animate({'left': navLeft}, animationSpeed, function() {
+          if(isNavVisible) {jqNav.hide()}
         });
-        $('body').animate({ 'padding-left': '30px' }, 'slow');
-    }
-    else {
-        $('nav').show();
-        $('nav').animate({ 'left': '0px' }, 'slow');
-        $('body').animate({ 'padding-left': '360px' }, 'slow');
-    }
-});
-</script>
+        jqBody.animate({'marginLeft': bodyMarginLeft}, animationSpeed);
+
+      });
+    })();
+  </script>
 
 <script>
     // Scroll to top button

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/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

@@ -107,7 +107,7 @@ module IsoDoc
     def bibliography_bibitem_number(docxml)
       i = 0
       docxml.xpath(ns("//references")).each do |r|
-        r.xpath(ns(".//bibitem")).each do |b|
+        r.xpath(ns("./bibitem")).each do |b|
           i = bibliography_bibitem_number1(b, i, r["normative"] == "true")
         end
       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_xml_convert.rb

@@ -39,7 +39,7 @@ module IsoDoc
     end
 
     def conversions(docxml)
-      semantic_xml_insert(docxml)
+      #semantic_xml_insert(docxml)
       metadata docxml
       bibdata docxml
       @xrefs.parse docxml
@@ -108,6 +108,7 @@ module IsoDoc
     end
 
     def terms(docxml)
+      termcontainers docxml
       termexample docxml
       termnote docxml
       termdefinition docxml
@@ -115,8 +116,10 @@ module IsoDoc
       termsource docxml
       concept docxml
       related docxml
+      termcleanup docxml
     end
 
+    # KILL
     def semantic_xml_insert(xml)
       @semantic_xml_insert or return
       embed = embedable_semantic_xml(xml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.12.7".freeze
+  VERSION = "2.12.9".freeze
 end

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -184,7 +184,7 @@ container: false)
           @anchors[elem["id"]][:semx] = @anchors[elem.parent["id"]][:semx] + x
           @anchors[elem["id"]][:label] =
             "<span class='fmt-element-name'>#{label}</span> #{@anchors[elem["id"]][:semx]}"
-          @anchors[elem["id"]][:xref] =  "<span class='fmt-element-name'>#{label}</span> #{@anchors[elem["id"]][:semx]}"
+          @anchors[elem["id"]][:xref] = "<span class='fmt-element-name'>#{label}</span> #{@anchors[elem["id"]][:semx]}"
         end
         model.permission_parts(elem, id, label, klass).each do |n|
           @anchors[n[:id]] = anchor_struct(n[:number], n[:elem], n[:label],
@@ -309,34 +309,6 @@ container: false)
         end
        end
       end
-
-      # TODO remove
-      def hierarchical_permission_children(block, lbl)
-        c = ReqCounter.new
-        block.xpath(ns(REQ_CHILDREN)).noblank.each do |t|
-          m = @reqt_models.model(t["model"])
-          klass, label = reqt2class_nested_label(t, m)
-          id = "#{lbl}#{subreqt_separator}#{c.increment(label, t).print}"
-          sequential_permission_body(c.print, lbl, t, label, klass, m)
-          hierarchical_permission_children(t, id)
-        end
-      end
-
-      # TODO remove
-      def hierarchical_permission_body(id, parent_id, elem, label, klass, model)
-        @anchors[elem["id"]] = model.postprocess_anchor_struct(
-          elem, anchor_struct(id, elem,
-                              label, klass, { unnumb: elem["unnumbered"], container: false })
-        )
-        x = "#{subreqt_separator(markup: true)}#{semx(elem, id)}"
-        @anchors[elem["id"]][:label] = "#{semx(elem.parent, parent_id)}#{x}"
-        @anchors[elem["id"]][:xref] = @anchors[elem.parent["id"]][:xref] + x
-        model.permission_parts(elem, id, label, klass).each do |n|
-          # we don't have an n["id"], so we allow n[:id] in anchor_struct
-          @anchors[n[:id]] = anchor_struct(n[:number], n, n[:label],
-                                           n[:klass], { unnumb: false, container: false })
-        end
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.12.7
+  version: 2.12.9
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-23 00:00:00.000000000 Z
+date: 2025-02-03 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
@@ -486,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
@@ -502,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: []