isodoc 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66420421669f651f0c898afd16ed5ccdb1fbb4114531f72ed846d179ced88d9f
-  data.tar.gz: a2f42bfa3a386d66d78a360cb57a28e29cce05d70b8f18d84acdd995704b0090
+  metadata.gz: ab9b39e8179c40594c9f9665530cbbd6e5138379bd61e6b15799770a33032738
+  data.tar.gz: 6f3c2bd190862970a129ba9156c67dc4fc2610a90f1d561b8d057258c9f09420
 SHA512:
-  metadata.gz: ec7e84f1d6ab621b275c76e94781fc9b539bdd2e6656551efd617832de24a94f753aaaf1951a3a3fa7d42a983c5ced677e4fde1edf4477d029cafa0151a3185e
-  data.tar.gz: 9bb6ad10f0260df9f7994a94cfadd58a67cbc6b547ec17294ee09226e9a01997f9f9a2f1b744ae58338803947160155b15ca69d425848b35b6a88615ef5105fb
+  metadata.gz: 5d3f6c2eaaed487ae2c6921fb5ba4adcb52dd44c979e95a599532a0c3ebedf5471c25db030597cdf6dbac5f8eb1f17c0a51c1a9b608e5951226aa5098286b2d5
+  data.tar.gz: 51cc8feda89a2c3660723681bfe774cc17a926a8326be96466397c3c9efaa0185215e49e4bac84b8a0790f09e163003dbc1c9abb42838fbd3012285489ef7337

data/lib/isodoc/base_style/typography.scss

@@ -67,4 +67,9 @@
   td.header {
     font-weight: 400;
   }
+
+   table.plain, table.plain th, table.plain td {
+     border: none !important;
+     font-size: 0.95em;
+   }
 }

data/lib/isodoc/convert.rb

@@ -112,11 +112,12 @@ module IsoDoc
       docxml = Nokogiri::XML(file, &:huge)
       filename, dir = init_file(input_filename, debug)
       docxml.root.default_namespace = ""
+      docxml_var_init(docxml)
       convert_i18n_init(docxml)
       metadata_init(@lang, @script, @locale, @i18n)
       xref_init(@lang, @script, self, @i18n,
                 { locale: @locale, bibrender: @bibrender })
-      toc_init(docxml)
+      @xrefs.klass.doctype = @doctype
       [docxml, filename, dir]
     end
 

data/lib/isodoc/function/blocks.rb

@@ -118,6 +118,30 @@ module IsoDoc
         end
       end
 
+      def key_parse(node, out)
+        klass = "key #{node['class']}".strip
+        out.div **attr_code(class: klass) do |div|
+          node.children.each do |n|
+            if n.name == "name"
+              key_name_parse(n, div)
+              "<p keep-with-next='true'><strong>#{@i18n.key}</strong></p>"
+            else parse(n, div)
+            end
+          end
+        end
+      end
+
+      def key_name_parse(node, div)
+        a = keep_style(node)
+        a&.include?("page-break-after:") or
+          a = "page-break-after: avoid;#{a}"
+        div.p style: a do |p|
+          p.b do |s|
+            children_parse(node, s)
+          end
+        end
+      end
+
       def para_class(node)
         classtype = nil
         classtype = "MsoCommentText" if in_comment
@@ -137,13 +161,17 @@ module IsoDoc
 
       def para_parse(node, out)
         out.p **attr_code(para_attrs(node)) do |p|
-                    children_parse(node, p)
+          para_prefix(node, p)
+          node.children.each { |n| parse(n, p) unless n.name == "note" }
         end
+        node.xpath(ns("./note")).each { |n| parse(n, out) }
       end
 
+      def para_prefix(node, out); end
+
       def attribution_parse(node, out)
         out.div class: "QuoteAttribution" do |div|
-                    children_parse(node, div)
+          children_parse(node, div)
         end
       end
 
@@ -167,14 +195,14 @@ module IsoDoc
 
       def toc_parse(node, out)
         out.div class: "toc" do |div|
-                    children_parse(node, div)
+          children_parse(node, div)
         end
       end
 
       def source_parse(node, out)
         out.div class: "BlockSource" do |d|
           d.p do |p|
-                      children_parse(node, p)
+            children_parse(node, p)
           end
         end
       end
@@ -201,7 +229,7 @@ module IsoDoc
         tag = node.parent.name == "fmt-footnote-container" ? "aside" : "div"
         id = node["is_table"] ? node["reference"] : node["id"]
         out.send tag, id: "fn:#{id}", class: "footnote" do |div|
-                    children_parse(node, div)
+          children_parse(node, div)
         end
       end
     end

data/lib/isodoc/function/blocks_example_note.rb

@@ -4,7 +4,7 @@ module IsoDoc
       def example_label(_node, div, name)
         name.nil? and return
         div.p class: "example-title" do |_p|
-                    children_parse(name, div)
+          children_parse(name, div)
         end
       end
 
@@ -64,7 +64,9 @@ module IsoDoc
       end
 
       def starts_with_para?(node)
-        block_body_first_elem(node)&.name == "p"
+        elem = block_body_first_elem(node) or return
+        elem.name == "p" || elem.elements.first&.name == "p" ||
+          block_body_first_elem(elem)&.name == "p"
       end
 
       def note_p_class
@@ -73,7 +75,7 @@ module IsoDoc
 
       def note_p_parse(node, div)
         name = node.at(ns("./fmt-name"))
-        para = node.at(ns("./p"))
+        para = node.at(ns("./p")) || node.at(ns("./semx/p"))
         div.p **attr_code(class: note_p_class) do |p|
           name and p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }

data/lib/isodoc/function/cleanup.rb

@@ -8,8 +8,8 @@ module IsoDoc
       def passthrough_cleanup(docxml)
         docxml.split(%r{(<passthrough>|</passthrough>)}).each_slice(4)
           .map do |a|
-          a.size > 2 and a[2] = HTMLEntities.new.decode(a[2])
-          [a[0], a[2]]
+            a.size > 2 and a[2] = HTMLEntities.new.decode(a[2])
+            [a[0], a[2]]
         end.join
       end
 
@@ -112,7 +112,8 @@ module IsoDoc
       end
 
       TABLENOTE_CSS = "div[@class = 'Note' or @class = 'BlockSource' " \
-        "or @class = 'TableFootnote' or @class = 'figdl']".freeze
+        "or @class = 'TableFootnote' or @class = 'figdl' or @class = 'key']"
+        .freeze
 
       def table_note_cleanup(docxml)
         docxml.xpath("//table[dl or #{TABLENOTE_CSS}]").each do |t|
@@ -120,7 +121,7 @@ module IsoDoc
           insert_here = new_fullcolspan_row(t, tfoot)
           t.xpath("dl | p[@class = 'ListTitle'] | #{TABLENOTE_CSS}")
             .each do |d|
-            d.parent = insert_here
+              d.parent = insert_here
           end
         end
       end

data/lib/isodoc/function/references.rb

@@ -3,10 +3,17 @@ module IsoDoc
     module References
       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) }
+          children_parse(bib.at(ns("./biblio-tag")), ref)
           reference_format(bib, ref)
         end
+        bibitem_notes(list, bib, _ordinal, biblio)
+      end
+
+      def bibitem_notes(list, bib, _ordinal, biblio)
+        bib.xpath(ns("./formattedref/note")).each do |n|
+          parse(n, list)
+          list.parent.elements[-1]["class"] += biblio ? " Biblio" : " NormRef"
+        end
       end
 
       def iso_bibitem_entry_attrs(bib, biblio)
@@ -14,8 +21,8 @@ module IsoDoc
       end
 
       def reference_format(bib, out)
-        ftitle = bib.at(ns("./formattedref"))
-        ftitle&.children&.each { |n| parse(n, out) }
+        ftitle = bib.at(ns("./formattedref")) or return
+        ftitle.children.each { |n| n.name == "note" or parse(n, out) }
       end
 
       def biblio_list(refs, div, biblio)

data/lib/isodoc/function/setup.rb

@@ -42,6 +42,7 @@ module IsoDoc
 
       def info(isoxml, out)
         @meta.localdir = @localdir
+        @meta.presentation isoxml, out
         @meta.code_css isoxml, out
         @meta.title isoxml, out
         @meta.subtitle isoxml, out
@@ -58,7 +59,6 @@ module IsoDoc
         @meta.keywords isoxml, out
         @meta.note isoxml, out
         @meta.images isoxml, out
-        @meta.presentation isoxml, out
         @meta.get
       end
     end

data/lib/isodoc/function/table.rb

@@ -51,7 +51,7 @@ module IsoDoc
         c = node["class"]
         style = table_attrs_style(node, c)
         attr_code(id: node["id"],
-                  class: node["plain"] == "true" ? nil : (c || "MsoISOTable"),
+                  class: node["plain"] == "true" ? "plain" : (c || "MsoISOTable"),
                   style: style, title: node["alt"])
       end
 
@@ -93,7 +93,7 @@ module IsoDoc
       end
 
       def table_parse_tail(node, out)
-        (dl = node.at(ns("./dl"))) && parse(dl, out)
+        (dl = node.at(ns("./key"))) && parse(dl, out)
         node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
         node.xpath(ns("./note")).each { |n| parse(n, out) }
         node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))

data/lib/isodoc/function/to_word_html.rb

@@ -241,6 +241,7 @@ module IsoDoc
           when "fmt-annotation-start" then fmt_annotation_start_parse(node, out)
           when "fmt-annotation-end" then fmt_annotation_end_parse(node, out)
           when "fmt-annotation-body" then fmt_annotation_body_parse(node, out)
+          when "key" then key_parse(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/function/utils.rb

@@ -84,7 +84,7 @@ module IsoDoc
       end
 
       NOTE_CONTAINER_ANCESTOR = <<~XPATH.strip.freeze
-        .//ancestor::*[local-name() = 'annex' or local-name() = 'foreword' or local-name() = 'appendix' or local-name() = 'introduction' or local-name() = 'terms' or local-name() = 'acknowledgements' or local-name() = 'executivesummary' or local-name() = 'term' or local-name() = 'clause' or local-name() = 'references' or local-name() = 'figure' or local-name() = 'formula' or local-name() = 'table' or local-name() = 'example']/@id
+        .//ancestor::*[local-name() = 'annex' or local-name() = 'foreword' or local-name() = 'appendix' or local-name() = 'introduction' or local-name() = 'terms' or local-name() = 'acknowledgements' or local-name() = 'executivesummary' or local-name() = 'term' or local-name() = 'clause' or local-name() = 'references' or local-name() = 'figure' or local-name() = 'formula' or local-name() = 'table' or local-name() = 'example' or local-name() = 'bibitem']/@id
       XPATH
 
       # no recursion on references

data/lib/isodoc/init.rb

@@ -19,15 +19,24 @@ module IsoDoc
       @i18n.l10n(expr, lang, script, opt)
     end
 
-    def toc_init(docxml)
+    def docxml_var_init(docxml)
+      doctype_init(docxml)
+      toc_init(docxml)
+    end
+
+    def doctype_init(docxml)
       @doctype = docxml.at(ns("//bibdata/ext/doctype"))&.text
       @subdoctype = docxml.at(ns("//bibdata/ext/subdoctype"))&.text
-      @xrefs.klass.doctype = @doctype
-      x = "//metanorma-extension/presentation-metadata" \
-          "[name[text() = 'TOC Heading Levels']]/value"
-      n = docxml.at(ns(x.sub("TOC", "DOC TOC"))) and
+      @docscheme = docxml.at(ns("//metanorma-extension/presentation-metadata/"\
+        "document-scheme"))&.text
+    end
+
+    def toc_init(docxml)
+      x = "//metanorma-extension/presentation-metadata/" \
+          "toc-heading-levels"
+      n = docxml.at(ns(x.sub("toc", "doc-toc"))) and
         @wordToClevels = n.text.to_i
-      n = docxml.at(ns(x.sub("TOC", "HTML TOC"))) and
+      n = docxml.at(ns(x.sub("toc", "html-toc"))) and
         @htmlToClevels = n.text.to_i
     end
 

data/lib/isodoc/metadata.rb

@@ -52,6 +52,8 @@ module IsoDoc
     def doctype(isoxml, _out)
       b = isoxml.at(ns("//bibdata/ext/doctype#{NOLANG}")) || return
       set(:doctype, status_print(b.text))
+      ba = isoxml.at(ns("//bibdata/ext/doctype/@abbreviation")) and
+        set(:doctype_abbr, status_print(ba.text))
       b1 = isoxml.at(ns("//bibdata/ext/doctype#{currlang}")) || b
       set(:doctype_display, status_print(b1.text))
       b = isoxml.at(ns("//bibdata/ext/subdoctype#{NOLANG}")) || return
@@ -113,7 +115,7 @@ module IsoDoc
     def draftinfo(draft, revdate)
       return "" unless draft
 
-      draftinfo = " (#{@labels['draft_label']} #{draft}"
+      draftinfo = " (#{@labels['draft_label']} <esc>#{draft}</esc>"
       draftinfo += ", #{revdate}" if revdate
       draftinfo += ")"
       l10n(draftinfo, @lang, @script)
@@ -191,11 +193,10 @@ module IsoDoc
     end
 
     def presentation(xml, _out)
-      xml.xpath(ns("//metanorma-extension/presentation-metadata")).each do |p|
-        ((n = p.at(ns("./name"))) && (v = p.at(ns("./value")))) or next
-        lbl = "presentation_metadata_#{n.text}".to_sym
+      xml.xpath(ns("//metanorma-extension/presentation-metadata/*")).each do |p|
+        lbl = "presentation_metadata_#{p.name}".to_sym
         m = get[lbl] || []
-        set(lbl, m << v.text)
+        set(lbl, m << p.text)
       end
     end
 

data/lib/isodoc/metadata_contributor.rb

@@ -53,6 +53,19 @@ module IsoDoc
     def author(xml, _out)
       personal_authors(xml)
       agency(xml)
+      contributor_role(xml, "authorizer")
+      contributor_role(xml, "enabler")
+    end
+
+    def contributor_role(xml, role)
+      ret = xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = " \
+                         "'#{role}']/organization"))
+        .each_with_object([]) do |org, m|
+        name = org.at(ns("./name[@language = '#{@lang}']")) ||
+          org.at(ns("./name"))
+        m << name.text
+      end
+      ret.empty? or set(role.to_sym, ret)
     end
 
     def iso?(org)

data/lib/isodoc/presentation_function/autonum.rb

@@ -1,6 +1,7 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def prefix_name(node, delims, label, elem)
+      sem_xml_descendant?(node) and return
       label, delims = prefix_name_defaults(node, delims, label, elem)
       name, ins, ids, number = prefix_name_prep(node, elem)
       ins.next = fmt_xref_label(label, number, ids)
@@ -30,7 +31,6 @@ module IsoDoc
     end
 
     def prefix_name_labels(node)
-      #@new_ids ||= {}
       id = "_#{UUIDTools::UUID.random_create}"
       @new_ids[id] = nil
       { elem: node["id"], name: id }
@@ -78,7 +78,7 @@ module IsoDoc
     end
 
     def semx(node, label, element = "autonum")
-      id = node["id"] || node[:id] || elem['original-id']
+      id = node["id"] || node[:id] || elem["original-id"]
       /<semx element='[^']+' source='#{id}'/.match?(label) and return label
       l = stripsemx(label)
       %(<semx element='#{element}' source='#{id}'>#{l}</semx>)
@@ -113,13 +113,22 @@ module IsoDoc
 
     def prefix_container_fmt_xref_label(container, xref)
       container or return xref
-      container_container = @xrefs.anchor(container, :container, false)
+      container_container = prefix_container_container(container)
       container_label =
         prefix_container_fmt_xref_label(container_container,
                                         @xrefs.anchor(container, :xref, false))
       l10n(connectives_spans(@i18n.nested_xref
         .sub("%1", "<span class='fmt-xref-container'>#{esc container_label}</span>")
-        .sub("%2", xref)))
+        .sub("%2", xref || "[Unknown]")))
+    end
+
+    def prefix_container_container(container)
+      container_container = @xrefs.anchor(container, :container, false)
+      if @xrefs.anchor(container, :type) == "bibitem"
+        p = @bibitem_lookup[container].parent
+        p and container_container ||= p["id"]
+      end
+      container_container
     end
 
     # detect whether string which may contain XML markup is empty
@@ -160,5 +169,57 @@ module IsoDoc
       text.nil? || text.empty? and return text
       "<esc>#{text}</esc>"
     end
+
+    # do not change to Presentation XML rendering
+    # this is sensitive to ordering of Presentation XML processing:
+    # blocks > terms > inline
+    def sem_xml_descendant?(node)
+      ancestor_names = node.ancestors.map(&:name)
+      sem_xml_descendant_terms?(node, ancestor_names) and return true
+      sem_xml_descendant_inline?(node, ancestor_names) and return true
+      sem_xml_descendant_bibitem?(node, ancestor_names) and return true
+      sem_xml_descendant_provision?(node, ancestor_names) and return true
+      false
+    end
+
+    # keep Presentation XML blocks within provisions,
+    # they are processed separately
+    # into distinct Presentation XML fmt-provision later
+    def sem_xml_descendant_provision?(node, ancestor_names)
+      block?(node) and return false
+      (ancestor_names & %w[requirement recommendation permission]).any? &&
+        !ancestor_names.include?("fmt-provision")
+    end
+
+    def sem_xml_descendant_bibitem?(_node, ancestor_names)
+      ancestor_names.include?("bibitem") &&
+        %w[formattedref biblio-tag].none? do |name|
+          ancestor_names.include?(name)
+        end
+    end
+
+    def sem_xml_descendant_inline?(_node, ancestor_names)
+      %w[xref eref origin link name title newcontent]
+        .any? do |name|
+          ancestor_names.include?(name)
+      end and return true
+    end
+
+    # keep Presentation XML blocks within designations,
+    # they are processed separately
+    # into distinct Presentation XML fmt-* designations later
+    def sem_xml_descendant_terms?(node, ancestor_names)
+      block?(node) and return false
+      %w[preferred admitted deprecated related definition source]
+        .any? do |name|
+          ancestor_names.include?(name)
+      end
+    end
+
+    def block?(node)
+      %w(figure table note example termnote termexample formula sourcecode
+         admonition ul ol dl quote permission requirement recommendation)
+        .include?(node.name)
+    end
   end
 end

data/lib/isodoc/presentation_function/bibdata.rb

@@ -42,7 +42,8 @@ module IsoDoc
     def bibdata_i18n(bib)
       hash_translate(bib, @i18n.get["doctype_dict"], "./ext/doctype",
                      "//presentation-metadata/doctype-alias", @lang)
-      hash_translate(bib, @i18n.get["stage_dict"], "./status/stage", nil, @lang)
+      hash_translate(bib, @i18n.get["stage_dict"], "./status/stage",
+                     "//presentation-metadata/stage-alias", @lang)
       hash_translate(bib, @i18n.get["substage_dict"], "./status/substage", nil,
                      @lang)
       edition_translate(bib)
@@ -63,10 +64,20 @@ module IsoDoc
     # to be mixed
     def edition_translate(bibdata)
       x = bibdata.at(ns("./edition")) or return
+      if @i18n.edition_ordinal && num = edition_integer?(bibdata)
+        tag_translate(x, @lang, @i18n
+          .populate("edition_ordinal", { "var1" => num }))
+      elsif @i18n.edition_cardinal
+        tag_translate(x, @lang, @i18n
+          .populate("edition_cardinal", { "var1" => x.text }))
+      end
+    end
+
+    def edition_integer?(bibdata)
+      x = bibdata.at(ns("./edition[not(@language) or @language = '']"))
+      x or return
       /^\d+$/.match?(x.text) or return
-      @i18n.edition_ordinal or return
-      tag_translate(x, @lang, @i18n
-        .populate("edition_ordinal", { "var1" => x.text.to_i }))
+      x.text.to_i
     end
 
     def tag_translate(tag, lang, value)

data/lib/isodoc/presentation_function/block.rb

@@ -24,15 +24,17 @@ module IsoDoc
     end
 
     def formula1(elem)
-      formula_where(elem.at(ns("./dl")))
-      lbl = @xrefs.anchor(elem["id"], :label, false)
+      dl = elem.at(ns("./dl")) and dl.replace("<key>#{to_xml(dl)}</key>")
+      formula_where(elem.at(ns("./key")))
+      lbl = @xrefs.anchor(elem["id"], :label, false) ||
+        @xrefs.anchor(elem["original-id"], :label, false)
       lbl.nil? || lbl.empty? or prefix_name(elem, {}, lbl, "name")
     end
 
     def formula_where(dlist)
       dlist or return
       dlist["class"] = "formula_dl"
-      where = dlist.xpath(ns("./dt")).size > 1 ? @i18n.where : @i18n.where_one
+      where = dlist.xpath(ns(".//dt")).size > 1 ? @i18n.where : @i18n.where_one
       dlist.previous = "<p keep-with-next='true'>#{where}</p>"
     end
 
@@ -41,8 +43,9 @@ module IsoDoc
     end
 
     def example1(elem)
-      n = @xrefs.get[elem["id"]]
-      lbl = labelled_autonum(@i18n.example, elem["id"], n&.dig(:label))
+      n = @xrefs.get[elem["id"]] || @xrefs.get[elem["original-id"]]
+      lbl = labelled_autonum(@i18n.example, elem["id"] || elem["original-id"],
+                             n&.dig(:label))
       prefix_name(elem, { caption: block_delim }, lbl, "name")
     end
 
@@ -61,8 +64,9 @@ module IsoDoc
     end
 
     def note_label(elem)
-      n = @xrefs.get[elem["id"]]
-      labelled_autonum(@i18n.note, elem["id"], n&.dig(:label))
+      n = @xrefs.get[elem["id"]] || @xrefs.get[elem["original-id"]]
+      labelled_autonum(@i18n.note, elem["id"] || elem["original-id"],
+                       n&.dig(:label))
     end
 
     def admonition(docxml)
@@ -81,7 +85,9 @@ module IsoDoc
     end
 
     def admonition_numbered1(elem)
-      label = admonition_label(elem, @xrefs.anchor(elem["id"], :label, false))
+      label = admonition_label(elem,
+                               @xrefs.anchor(elem["id"] || elem["original-id"],
+                                             :label, false))
       prefix_name(elem, { caption: block_delim }, label, "name")
     end
 
@@ -89,7 +95,7 @@ module IsoDoc
       lbl = if elem["type"] == "box" then @i18n.box
             else @i18n.admonition[elem["type"]]&.upcase
             end
-      labelled_autonum(lbl, elem["id"], num)
+      labelled_autonum(lbl, elem["id"] || elem["original-id"], num)
     end
 
     def admonition_delim(_elem)
@@ -106,8 +112,9 @@ module IsoDoc
       table_css(elem)
       labelled_ancestor(elem) and return
       elem["unnumbered"] && !elem.at(ns("./name")) and return
-      n = @xrefs.anchor(elem["id"], :label, false)
-      lbl = labelled_autonum(lower2cap(@i18n.table), elem["id"], n)
+      n = @xrefs.anchor(elem["id"] || elem["original-id"], :label, false)
+      lbl = labelled_autonum(lower2cap(@i18n.table),
+                             elem["id"] || elem["original-id"], n)
       prefix_name(elem, { caption: table_delim }, lbl, "name")
     end
 
@@ -142,83 +149,34 @@ module IsoDoc
 
     def amend1(elem)
       ret = semx_fmt_dup(elem)
-      ret.xpath(ns("./locality | ./localityStack | ./autonumber | " \
-                   "./classification | ./contributor")).each(&:remove)
+      ret.xpath(ns("./locality | ./localityStack | .//autonumber | " \
+                   "./classification | ./contributor | ./fmt-name | " \
+                   "./fmt-xref-label")).each(&:remove)
+      amend_newcontent(ret)
       ret.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
       ret.xpath(ns("./description")).each { |a| a.replace(a.children) }
-      elem.xpath(ns(".//fmt-name | .//fmt-xref-label")).each(&:remove)
       elem.next = ret
     end
 
-    # TODO will go back to just one source/modification, preserving it
-    def source(docxml)
-      fmt_source(docxml)
-      docxml.xpath(ns("//fmt-source/source/modification")).each do |f|
-        source_modification(f)
-      end
-      source_types(docxml)
-      docxml.xpath(ns("//fmt-source/source")).each do |f|
-        f.replace(semx_fmt_dup(f))
-      end
-    end
-
-    def source_types(docxml)
-      docxml.xpath(ns("//table/fmt-source")).each { |f| tablesource(f) }
-      docxml.xpath(ns("//figure/fmt-source")).each { |f| figuresource(f) }
-    end
-
-    def fmt_source(docxml)
-      n = docxml.xpath(ns("//source")) - docxml.xpath(ns("//term//source")) -
-        docxml.xpath(ns("//quote/source"))
-      n.each do |s|
-        dup = s.clone
-        modification_dup_align(s, dup)
-        s.next = "<fmt-source>#{to_xml(dup)}</fmt-source>"
-      end
-    end
-
-    def tablesource(elem)
-      source1(elem, :table)
-    end
-
-    def figuresource(elem)
-      source1(elem, :figure)
-    end
-
-    def source_join_delim(_elem)
-      "; "
-    end
-
-    def source1(elem, ancestor)
-      source_elems = source1_gather(elem)
-      source_elems.each do |e|
-        e.xpath(ns(".//origin")).each do |origin|
-          origin.wrap("<esc></esc>")
+    def amend_newcontent(elem)
+      elem.xpath(ns("./newcontent")).each do |a|
+        a.name = "quote"
+        a.xpath(ns("./clause")).each do |c|
+          amend_subclause(c, 1)
+          a.next = c
         end
-        elem << "#{source_join_delim(elem)}#{to_xml(e.remove.children).strip}"
       end
-      source1_label(elem, @i18n.l10n(to_xml(elem.children).strip), ancestor)
     end
 
-    def source1_gather(elem)
-      source_elems = []
-      while elem = elem&.next_element
-        case elem.name
-        when "source"
-        when "fmt-source"
-          source_elems << elem
-        else break
-        end
+    def amend_subclause(clause, depth)
+      clause.xpath(ns("./title")).reverse_each do |t|
+        # t.name = "floating-title"
+        # t["depth"] ||= depth || "1"
+        t.name = "p"
+        t["type"] = "floating-title"
       end
-      source_elems
-    end
-
-    def source1_label(elem, sources, _ancestor)
-      elem.children = l10n("[#{@i18n.source}: #{esc sources}]")
-    end
-
-    def source_modification(mod)
-      termsource_modification(mod.parent)
+      clause.name = depth == 1 ? "quote" : "quote" # "div"
+      clause.xpath(ns("./clause")).each { |c| amend_subclause(c, depth + 1) }
     end
 
     def quote(docxml)