isodoc 3.4.1 → 3.4.3

data/lib/isodoc/presentation_function/metadata.rb

@@ -18,14 +18,14 @@ module IsoDoc
     def logo_expand_pres_metadata(docxml)
       docxml.xpath(ns("//metanorma-extension/presentation-metadata/*"))
         .each do |x|
-        logo_size_pres_metadata_incomplete?(x) or next
-        parts = x.name.split("-")
-        @output_formats.each_key do |f|
-          tagname = "logo-#{parts[1]}-#{f}-#{parts[2..].join('-')}"
-          x.parent.next = <<~XML
-            <presentation-metadata><#{tagname}>#{x.text}</#{tagname}></presentation-metadata>
-          XML
-        end
+          logo_size_pres_metadata_incomplete?(x) or next
+          parts = x.name.split("-")
+          @output_formats.each_key do |f|
+            tagname = "logo-#{parts[1]}-#{f}-#{parts[2..].join('-')}"
+            x.parent.next = <<~XML
+              <presentation-metadata><#{tagname}>#{x.text}</#{tagname}></presentation-metadata>
+            XML
+          end
       end
     end
 
@@ -37,10 +37,25 @@ module IsoDoc
     end
 
     def localized_strings(docxml)
-      a = docxml.at(ns("//bibdata")) or return
-      a.next =
-        "<localized-strings>#{i8n_name(trim_hash(@i18n.get), '').join}" \
-        "</localized-strings>"
+      ins, langs, i18n_cache = localized_strings_prep(docxml)
+      ins or return
+      words = langs.each_with_object([]) do |l, m|
+        @i18n = if @lang == l then i18n_cache
+                else i18n_init(l, ::Metanorma::Utils.default_script(l), nil, {})
+                end
+        m << i18n_name(trim_hash(@i18n.get), "", l).join
+      end
+      ins.next = "<localized-strings>#{words.join}</localized-strings>"
+      @i18n = i18n_cache
+    end
+
+    def localized_strings_prep(docxml)
+      ins = docxml.at(ns("//bibdata")) or return
+      langs = docxml.xpath(ns("//bibdata/title/@language")).map(&:to_s)
+      langs << @lang
+      langs.uniq!
+      i18n_cache = @i18n
+      [ins, langs, i18n_cache]
     end
 
     def attachments_extract(docxml)
@@ -81,7 +96,7 @@ module IsoDoc
       @tocfigures || @toctables || @tocrecommendations or return
       ins = extension_insert(docxml)
       @tocfigures and
-        ins << "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
+        ins.add_child "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
       @toctables and
         ins << "<toc type='table'><title>#{@i18n.toc_tables}</title></toc>"
       @tocfigures and
@@ -90,27 +105,29 @@ module IsoDoc
     end
 
     def fonts_metadata(xmldoc)
+      @fontlicenseagreement || @fontist_fonts or return
       ins = presmeta_insert_pt(xmldoc)
-      @fontist_fonts and CSV.parse_line(@fontist_fonts, col_sep: ";")
-        .map(&:strip).reverse_each do |f|
-        ins.next = presmeta("fonts", f)
-      end
       @fontlicenseagreement and
-        ins.next = presmeta("font-license-agreement", @fontlicenseagreement)
+        ins.add_child(presmeta("font-license-agreement", @fontlicenseagreement))
+      @fontist_fonts and CSV.parse_line(@fontist_fonts, col_sep: ";").compact
+        .map(&:strip).reject(&:empty?).each do |f|
+        ins.add_child(presmeta("fonts", f))
+      end
     end
 
     def presmeta_insert_pt(xmldoc)
-      xmldoc.at(ns("//presentation-metadata")) ||
-        extension_insert_pt(xmldoc).children.last
+      ins = xmldoc.at(ns("//presentation-metadata")) and return ins
+      ins = extension_insert_pt(xmldoc)
+      ins << "<presentation-metadata> </presentation-metadata>"
+      ins.elements.last
     end
 
     def presmeta(name, value)
-      "<presentation-metadata><name>#{name}</name><value>#{value}</value>" \
-        "</presentation-metadata>"
+      "<#{name}>#{value}</#{name}>"
     end
 
-    def i18n_tag(key, value)
-      "<localized-string key='#{key}' language='#{@lang}'>#{value}" \
+    def i18n_tag(key, value, lang)
+      "<localized-string key='#{key}' language='#{lang}'>#{value}" \
         "</localized-string>"
     end
 
@@ -118,28 +135,29 @@ module IsoDoc
       key.to_s.gsub(/\s|\./, "_")
     end
 
-    def i8n_name(hash, pref)
+    def i18n_name(hash, pref, lang)
       case hash
-      when Hash then i8n_name1(hash, pref)
+      when Hash then i18n_name1(hash, pref, lang)
       when Array
         hash.reject { |a| blank?(a) }.each_with_object([])
           .with_index do |(v1, g), i|
-            i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
+            i18n_name(v1, "#{i18n_safe(k)}.#{i}", lang).each { |x| g << x }
           end
-      else [i18n_tag(pref, hash)]
+      else [i18n_tag(pref, hash, lang)]
       end
     end
 
-    def i8n_name1(hash, pref)
+    def i18n_name1(hash, pref, lang)
       hash.reject { |_k, v| blank?(v) }.each_with_object([]) do |(k, v), g|
         case v
-        when Hash then i8n_name(v, i18n_safe(k)).each { |x| g << x }
+        when Hash then i18n_name(v, i18n_safe(k), lang).each { |x| g << x }
         when Array
           v.reject { |a| blank?(a) }.each_with_index do |v1, i|
-            i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
+            i18n_name(v1, "#{i18n_safe(k)}.#{i}", lang).each { |x| g << x }
           end
         else
-          g << i18n_tag("#{pref}#{pref.empty? ? '' : '.'}#{i18n_safe(k)}", v)
+          g << i18n_tag("#{pref}#{pref.empty? ? '' : '.'}#{i18n_safe(k)}", v,
+                        lang)
         end
       end
     end

data/lib/isodoc/presentation_function/refs.rb

@@ -1,59 +1,5 @@
-require_relative "docid"
-
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def references(docxml)
-      @ref_renderings = references_render(docxml)
-      docxml.xpath(ns("//references/bibitem")).each do |x|
-        bibitem(x, @ref_renderings)
-        reference_name(x)
-      end
-      bibliography_bibitem_number(docxml)
-      hidden_items(docxml)
-      move_norm_ref_to_sections(docxml)
-    end
-
-    def reference_names(docxml)
-      docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-        reference_name(ref)
-      end
-    end
-
-    def reference_name(ref)
-      ids = bibitem_ref_code(ref)
-      identifiers = render_identifier(ids)
-      reference = docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
-                    identifiers[:ordinal] || identifiers[:doi])
-      @xrefs.get[ref["id"]] = { xref: esc(reference) }
-    end
-
-    def move_norm_ref_to_sections(docxml)
-      docxml.at(ns(@xrefs.klass.norm_ref_xpath)) or return
-      s = move_norm_ref_to_sections_insert_pt(docxml) or return
-      docxml.xpath(ns(@xrefs.klass.norm_ref_xpath)).each do |r|
-        r.at("./ancestor::xmlns:bibliography") or next
-        s << r.remove
-      end
-    end
-
-    def move_norm_ref_to_sections_insert_pt(docxml)
-      s = docxml.at(ns("//sections")) and return s
-      s = docxml.at(ns("//preface")) and
-        return s.after("<sections/>").next_element
-      docxml.at(ns("//annex | //bibliography"))&.before("<sections/>")
-        &.previous_element
-    end
-
-    def hidden_items(docxml)
-      docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
-        x.at(ns("./bibitem[not(@hidden = 'true')]")) and next
-        x.elements.map(&:name).any? do |n|
-          !%w(title bibitem).include?(n)
-        end and next
-        x["hidden"] = "true"
-      end
-    end
-
     def references_render(docxml)
       d = docxml.clone
       d.remove_namespaces!
@@ -70,29 +16,58 @@ module IsoDoc
       bib["type"] ||= "standard"
     end
 
-    def bibitem(xml, renderings)
-      implicit_reference(xml) and xml["hidden"] = "true"
-      bibrender_item(xml, renderings)
+    def bibitem(bib, renderings)
+      implicit_reference(bib) and bib["hidden"] = "true"
+      notes_inside_bibitem(bib)
+      bibrender_item(bib, renderings)
+      add_id_to_display_bib_notes(bib)
+      @xrefs.bibitem_note_names(bib)
+    end
+
+    def notes_inside_bibitem(bib)
+      while (n = bib.next_element) && n.name == "note"
+        n["type"] = (n["type"] ? "display,#{n['type']}" : "display")
+        bib << n.remove
+      end
+    end
+
+    def add_id_to_display_bib_notes(bib)
+      bib.xpath(ns("./note")).each do |n|
+        t = n["type"] or next
+        t.split(",").map(&:strip).include?("display") or next
+        add_id(n)
+      end
     end
 
-    def bibrender_item(xml, renderings)
-      if (f = xml.at(ns("./formattedref"))) && xml.at(ns("./title")).nil?
-        bibrender_formattedref(f, xml)
-      else bibrender_relaton(xml, renderings)
+    def bibrender_item(bib, renderings)
+      if (f = bib.at(ns("./formattedref"))) && bib.at(ns("./title")).nil?
+        bibrender_formattedref(f, bib)
+      else bibrender_relaton(bib, renderings)
       end
+      bibitem_notes(bib)
     end
 
-    def bibrender_formattedref(formattedref, xml); end
+    def bibrender_formattedref(formattedref, bib); end
 
-    def bibrender_relaton(xml, renderings)
-      f = renderings[xml["id"]][:formattedref] or return
+    def bibrender_relaton(bib, renderings)
+      f = renderings[bib["id"]][:formattedref] or return
       f &&= "<formattedref>#{f}</formattedref>"
-      if x = xml.at(ns("./formattedref"))
+      if x = bib.at(ns("./formattedref"))
         x.replace(f)
-      elsif xml.children.empty?
-        xml << f
+      elsif bib.children.empty?
+        bib << f
       else
-        xml.children.first.previous = f
+        bib.children.first.previous = f
+      end
+    end
+
+    def bibitem_notes(bib)
+      f = bib.at(ns("./formattedref")) or return
+      bibnote_extract(bib, "display").each do |n|
+        f << <<~XML
+          <note type='display'>#{to_xml(semx_fmt_dup(n))}</note>
+        XML
+        transfer_id(n, f.elements.last)
       end
     end
 
@@ -164,31 +139,30 @@ module IsoDoc
       datefn = date_note_process(bib)
       ids = bibitem_ref_code(bib)
       idents = render_identifier(ids)
-      ret = if biblio then biblio_ref_entry_code(ordinal, idents, ids,
+      ret = if biblio then biblio_ref_entry_code(ordinal, idents,
                                                  standard, datefn, bib)
-            else norm_ref_entry_code(ordinal, idents, ids, standard, datefn,
-                                     bib)
+            else norm_ref_entry_code(ordinal, idents, standard, datefn, bib)
             end
       bib.add_first_child("<biblio-tag>#{@i18n.l10n(ret)}</biblio-tag>")
     end
 
-    def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, _bib)
-      ret = (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
-      ret = esc(ret)
-      (idents[:ordinal] || idents[:metanorma]) && idents[:sdo] and
-        ret += ", #{esc idents[:sdo]}"
+    def norm_ref_entry_code(_ordinal, ids, _standard, datefn, _bib)
+      ret = esc((ids[:ordinal] || ids[:content] || ids[:metanorma] || ids[:sdo])
+        .to_s)
+      (ids[:ordinal] || ids[:metanorma]) && ids[:sdo] and
+        ret += ", #{esc ids[:sdo]}"
       ret += datefn
       ret.empty? and return ret
-      idents[:sdo] and ret += ","
+      ids[:sdo] and ret += ","
       ret.sub(",", "").strip.empty? and return ""
       "#{ret} "
     end
 
     # if ids is just a number, only use that ([1] Non-Standard)
     # else, use both ordinal, as prefix, and ids
-    def biblio_ref_entry_code(ordinal, ids, _id, _standard, datefn, _bib)
-      # standard and id = nil
-      ret = esc(ids[:ordinal]) || esc(ids[:metanorma]) || "[#{esc ordinal.to_s}]"
+    def biblio_ref_entry_code(ordinal, ids, _standard, datefn, _bib)
+      ret = esc(ids[:ordinal]) || esc(ids[:content]) || esc(ids[:metanorma]) ||
+        "[#{esc ordinal.to_s}]"
       if ids[:sdo] && !ids[:sdo].empty?
         ret = prefix_bracketed_ref(ret)
         ret += "#{esc ids[:sdo]}#{datefn}, "
@@ -202,14 +176,23 @@ module IsoDoc
       "#{text}<tab/>"
     end
 
+    def bibnote_extract(bib, type)
+      bib.xpath(ns("./note")).each_with_object([]) do |n, m|
+        n["type"] or next
+        n["type"].split(",").map(&:strip).include?(type) and m << n
+      end
+    end
+
     # strip any fns in docidentifier before they are extracted for rendering
     def date_note_process(bib)
       ret = ident_fn(bib)
-      date_note = bib.at(ns("./note[@type = 'Unpublished-Status']"))
-      date_note.nil? and return ret
+      date_note = bibnote_extract(bib, "Unpublished-Status")
+      date_note.empty? and return ret
       id = "_#{UUIDTools::UUID.random_create}"
       @new_ids[id] = nil
-      "#{ret}<fn id='#{id}' reference='#{id}'><p>#{date_note.content}</p></fn>"
+      <<~XML
+        #{ret}<fn id='#{id}' reference='#{id}'><p>#{date_note.first.content}</p></fn>
+      XML
     end
 
     def ident_fn(bib)
@@ -223,15 +206,16 @@ module IsoDoc
       bib["hidden"] == "true"
     end
 
-    SKIP_DOCID = <<~XPATH.strip.freeze
+    # DOI, ISSN, ISBN cover term
+    SERIAL_NUM_DOCID = <<~XPATH.strip.freeze
       @type = 'DOI' or @type = 'doi' or @type = 'ISSN' or @type = 'issn' or @type = 'ISBN' or @type = 'isbn' or starts-with(@type, 'ISSN.') or starts-with(@type, 'ISBN.') or starts-with(@type, 'issn.') or starts-with(@type, 'isbn.')
     XPATH
 
     def standard?(bib)
       ret = false
       bib.xpath(ns("./docidentifier")).each do |id|
-        id["type"].nil? ||
-          id.at(".//self::*[#{SKIP_DOCID} or @type = 'metanorma']") and next
+        id["type"].nil? || id.at(".//self::*[#{SERIAL_NUM_DOCID} or "\
+          "@type = 'metanorma']") and next
         ret = true
       end
       ret

data/lib/isodoc/presentation_function/section.rb

@@ -1,6 +1,3 @@
-require_relative "refs"
-require_relative "title"
-
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def clause(docxml)

data/lib/isodoc/presentation_function/section_refs.rb

@@ -0,0 +1,55 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def references(docxml)
+      @ref_renderings = references_render(docxml)
+      docxml.xpath(ns("//references/bibitem")).each do |x|
+        bibitem(x, @ref_renderings)
+        reference_name(x)
+      end
+      bibliography_bibitem_number(docxml)
+      hidden_items(docxml)
+      move_norm_ref_to_sections(docxml)
+    end
+
+    def reference_names(docxml)
+      docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
+        reference_name(ref)
+      end
+    end
+
+    def reference_name(ref)
+      identifiers = render_identifier(bibitem_ref_code(ref))
+      reference = docid_l10n(identifiers[:content] || identifiers[:metanorma] ||
+                             identifiers[:sdo] || identifiers[:ordinal] ||
+                             identifiers[:doi])
+      @xrefs.get[ref["id"]] = { xref: esc(reference), type: "bibitem" }
+    end
+
+    def move_norm_ref_to_sections(docxml)
+      docxml.at(ns(@xrefs.klass.norm_ref_xpath)) or return
+      s = move_norm_ref_to_sections_insert_pt(docxml) or return
+      docxml.xpath(ns(@xrefs.klass.norm_ref_xpath)).each do |r|
+        r.at("./ancestor::xmlns:bibliography") or next
+        s << r.remove
+      end
+    end
+
+    def move_norm_ref_to_sections_insert_pt(docxml)
+      s = docxml.at(ns("//sections")) and return s
+      s = docxml.at(ns("//preface")) and
+        return s.after("<sections/>").next_element
+      docxml.at(ns("//annex | //bibliography"))&.before("<sections/>")
+        &.previous_element
+    end
+
+    def hidden_items(docxml)
+      docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
+        x.at(ns("./bibitem[not(@hidden = 'true')]")) and next
+        x.elements.map(&:name).any? do |n|
+          !%w(title bibitem).include?(n)
+        end and next
+        x["hidden"] = "true"
+      end
+    end
+  end
+end

data/lib/isodoc/presentation_function/source.rb

@@ -0,0 +1,73 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    # 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)
+      esc_origin(elem)
+      source_elems = source1_gather(elem)
+      source_elems.each do |e|
+        esc_origin(e)
+        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
+      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)
+    end
+  end
+end

data/lib/isodoc/presentation_function/terms.rb

@@ -148,6 +148,12 @@ module IsoDoc
       m1.replace("<modification>#{to_xml(new_m1)}</modification>")
     end
 
+    def esc_origin(element)
+      element.xpath(ns(".//origin")).each do |origin|
+        origin.wrap("<esc></esc>")
+      end
+    end
+
     # concatenate sources. localise the concatenation, escaping the docids
     # within the concatenands
     # from punctuation localisation: l10n(<esc>A</esc>, <esc>B</esc>)
@@ -158,11 +164,7 @@ module IsoDoc
       while elem.next_element&.name == "source"
         ret << semx_fmt_dup(elem.next_element.remove)
       end
-      ret.each do |element|
-        element.xpath(ns(".//origin")).each do |origin|
-          origin.wrap("<esc></esc>")
-        end
-      end
+      ret.each { |element| esc_origin(element) }
       s = ret.map { |x| to_xml(x) }.map(&:strip)
         .join(termsource_join_delim(elem))
       termsource_label(elem, @i18n.l10n(s))

data/lib/isodoc/presentation_function/xrefs.rb

@@ -15,13 +15,13 @@ module IsoDoc
 
     def prefix_container(container, linkend, node, target)
       prefix_container?(container, node) or return linkend
-      container_container = @xrefs.anchor(container, :container, false)
-      container_label =
+      container_container = prefix_container_container(container)
+      cntnr_label =
         prefix_container(container_container,
                          anchor_xref(node, container, container: true),
                          node, target)
       l10n(connectives_spans(@i18n.nested_xref
-        .sub("%1", "<span class='fmt-xref-container'>#{esc container_label}</span>")
+        .sub("%1", "<span class='fmt-xref-container'>#{esc cntnr_label}</span>")
         .sub("%2", esc(linkend))))
     end
 
@@ -135,7 +135,8 @@ module IsoDoc
     def gather_xref_locations(node)
       node.xpath(ns("./location")).each_with_object([]) do |l, m|
         type = @xrefs.anchor(l["target"], :type)
-        m << { conn: l["connective"], target: l["target"],
+        m << { conn: l["connective"], custom: l["custom-connective"],
+               target: l["target"],
                type:, node: l, elem: @xrefs.anchor(l["target"], :elem),
                container: @xrefs.anchor(l["target"], :container, false) ||
                  %w(termnote).include?(type) }
@@ -165,14 +166,24 @@ module IsoDoc
       else
         ret = loc2xref(list[0])
         list[1..].each { |l| ret = i18n_chain_boolean(ret, l) }
+        if list[0][:conn] == "from" && list[0][:custom]
+          # TODO: languages with mandatory from, include from in chain_to
+          ret = connectives_spans("<conn>#{list[0][:custom]}</conn> ") + ret
+        end
         ret
       end
     end
 
+    def conn_sub(str, conn)
+      str.sub(%r{<conn>[^<]+</conn>}, "<conn>#{conn}</conn>")
+    end
+
     def i18n_chain_boolean(value, entry)
-      connectives_spans(@i18n.send("chain_#{entry[:conn]}")
+      ret = @i18n.send("chain_#{entry[:conn]}")
         .sub("%1", value)
-        .sub("%2", loc2xref(entry)))
+        .sub("%2", loc2xref(entry))
+      c = entry[:custom] and ret = conn_sub(ret, c)
+      connectives_spans(ret)
     end
 
     def can_conflate_xref_rendering?(locs)

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,4 +1,5 @@
 require_relative "presentation_function/block"
+require_relative "presentation_function/source"
 require_relative "presentation_function/list"
 require_relative "presentation_function/reqt"
 require_relative "presentation_function/concepts"
@@ -9,6 +10,10 @@ require_relative "presentation_function/erefs"
 require_relative "presentation_function/inline"
 require_relative "presentation_function/math"
 require_relative "presentation_function/section"
+require_relative "presentation_function/section_refs"
+require_relative "presentation_function/title"
+require_relative "presentation_function/refs"
+require_relative "presentation_function/docid"
 require_relative "presentation_function/index"
 require_relative "presentation_function/bibdata"
 require_relative "presentation_function/metadata"
@@ -42,6 +47,7 @@ module IsoDoc
       @outputfile = Pathname.new(filename).basename.to_s
       docid_prefixes(docxml) # feeds @xrefs.parse citation processing
       provide_ids docxml # feeds @xrefs.parse
+      bibitem_lookup(docxml) # feeds citeas
       @xrefs.parse docxml
       @xrefs.klass.meta = @meta
       counter_init
@@ -54,7 +60,7 @@ module IsoDoc
     def bibitem_lookup(docxml)
       @bibitem_lookup ||= docxml.xpath(ns("//references/bibitem"))
         .each_with_object({}) do |b, m|
-        m[b["id"]] = b
+          m[b["id"]] = b
       end
     end
 
@@ -90,6 +96,7 @@ module IsoDoc
     end
 
     def block(docxml)
+      amend docxml # feeds all other blocks
       table docxml
       figure docxml
       sourcecode docxml
@@ -106,20 +113,19 @@ module IsoDoc
       requirement docxml
       recommendation docxml
       requirement_render docxml
-      amend docxml
     end
 
     def inline(docxml)
       document_footnotes docxml
       comments docxml
-      bibitem_lookup(docxml) # feeds citeas
       fmt_ref docxml # feeds citeas, xref, eref, origin, concept
       citeas docxml # feeds xref, eref, origin, concept
       xref docxml
       eref docxml # feeds eref2link
       origin docxml # feeds eref2link
       concept docxml
-      eref2link docxml
+      eref2link docxml # feeds link
+      link docxml
       mathml docxml
       ruby docxml
       variant docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.4.1".freeze
+  VERSION = "3.4.3".freeze
 end

data/lib/isodoc/word_function/lists.rb

@@ -62,9 +62,11 @@ module IsoDoc
       end
 
       def dl_table_attrs(node)
+        key = node.parent.name == "key" && node.parent["class"] == "formula_dl"
+        klass = key ? node.parent["class"] : nil
         { id: node["id"],
-          style: node["class"] == "formula_dl" ? "text-align:left;" : nil,
-          class: node["class"] || "dl" }
+          style: key ? "text-align:left;" : nil,
+          class: klass || node["class"] || "dl" }
       end
 
       def dl_parse_table(node, out)

data/lib/isodoc/word_function/postprocess_table.rb

@@ -44,7 +44,9 @@ module IsoDoc
 
       def word_nested_tables(docxml)
         docxml.xpath("//table").each do |t|
-          t.xpath(".//table").reverse_each do |tt|
+          nested_tables = t.xpath(".//table") - t.xpath(".//td//table") -
+            t.xpath(".//th//table")
+          nested_tables.reverse_each do |tt|
             t.next = tt.remove
           end
         end