isodoc 3.4.1 → 3.4.3

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)

data/lib/isodoc/presentation_function/docid.rb

@@ -28,20 +28,21 @@ module IsoDoc
 
     # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
     def bibitem_ref_code(bib)
-      id, id1, id2, id3 = bibitem_ref_code_prep(bib)
-      id || id1 || id2 || id3 and return [id, id1, id2, id3]
-      bib["suppress_identifier"] == "true" and return [nil, nil, nil, nil]
+      ret = bibitem_ref_code_prep(bib)
+      ret.all?(&:nil?) or return ret
+      bib["suppress_identifier"] == "true" and return [nil, nil, nil, nil, nil]
       # [nil, no_identifier(bib), nil, nil]
-      [nil, nil, nil, nil]
+      [nil, nil, nil, nil, nil]
     end
 
     def bibitem_ref_code_prep(bib)
-      id = bib.at(ns("./docidentifier[@type = 'metanorma']")) ||
-        bib.at(ns("./docidentifier[@type = 'title']"))
+      id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
       id1 = pref_ref_code(bib)
-      id2 = bib.at(ns("./docidentifier[#{SKIP_DOCID}]"))
+      id2 = bib.at(ns("./docidentifier[#{SERIAL_NUM_DOCID}]"))
       id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))
-      [id, id1, id2, id3]
+      id4 = bib.at(ns("./docidentifier[@type = 'title']")) ||
+        bib.at(ns("./docidentifier[@type = 'author-date']"))
+      [id, id1, id2, id3, id4]
     end
 
     def no_identifier(bib)
@@ -64,6 +65,12 @@ module IsoDoc
       num
     end
 
+    def bracket(num)
+      num.nil? and return nil
+      num = xml_to_string_skip_fn(num).sub(/^\[/, "").sub(/\]$/, "")
+      "[#{num}]"
+    end
+
     def unbracket1(ident)
       ident.nil? and return nil
       ident.is_a?(String) or ident = xml_to_string_skip_fn(ident)
@@ -78,10 +85,11 @@ module IsoDoc
     end
 
     def render_identifier(ident)
-      { metanorma: bracket_if_num(ident[0]),
+      { metanorma: bracket(ident[0]),
         sdo: unbracket(ident[1]),
         doi: unbracket(ident[2]),
-        ordinal: bracket_if_num(ident[3]) }
+        ordinal: bracket(ident[3]),
+        content: unbracket(ident[4]) }
     end
   end
 end

data/lib/isodoc/presentation_function/erefs.rb

@@ -6,12 +6,12 @@ module IsoDoc
     def citeas(xmldoc)
       xmldoc.xpath(ns("//fmt-eref | //fmt-origin | //fmt-link"))
         .each do |e|
-        sem_xml_descendant?(e) and next
-        e["bibitemid"] && e["citeas"] or next
-        a = @xrefs.anchor(e["bibitemid"], :xref, false) or next
-        e["citeas"] = citeas_cleanup(a)
-        # link generated in collection postprocessing from eref
-        e.name == "fmt-link" && e.text.empty? and e.children = e["citeas"]
+          sem_xml_descendant?(e) and next
+          e["bibitemid"] && e["citeas"] or next
+          a = @xrefs.anchor(e["bibitemid"], :xref, false) or next
+          e["citeas"] = citeas_cleanup(a)
+          # link generated in collection postprocessing from eref
+          e.name == "fmt-link" && e.text.empty? and e.children = e["citeas"]
       end
     end
 
@@ -32,19 +32,32 @@ module IsoDoc
 
     def erefstack1(elem)
       locs = elem.xpath(ns("./semx/fmt-eref")).map do |e|
-        [e["connective"], to_xml(e.parent.remove)]
+        [{ conn: e["connective"], custom: e["custom-connective"] },
+         { ref: to_xml(e.parent.remove) }]
       end.flatten
       ret = resolve_eref_connectives(locs)
-      elem.next = "<semx element='erefstack' source='#{elem['id']}'>#{l10n ret[1]}</semx>"
+      elem.next = <<~XML
+        <semx element='erefstack' source='#{elem['id']}'>#{l10n ret[1]}</semx>
+      XML
     end
 
     def resolve_eref_connectives(locs)
       locs = escape_l10n(locs)
       locs = resolve_comma_connectives(locs)
       locs = resolve_to_connectives(locs)
-      locs.size < 3 and return locs
+      locs.size < 3 and return locs.map { |x| x[:custom] || x[:conn] || x[:ref] }
+      locs = locs.each_with_object([]) do |x, m|
+        if m.empty? then m << x
+        elsif m[-1][:conn] && x[:conn]
+          m[-1][:conn] += x[:conn]
+          x[:custom] and m[-1][:custom] = x[:custom]
+        elsif  m[-1][:conn] && x[:conn]
+          m[-1][:ref] += x[:ref]
+        else  m << x
+        end
+      end
       locs = locs.each_slice(2).with_object([]) do |a, m|
-        m << { conn: a[0], label: a[1] }
+        m << { custom: a[0][:custom], conn: a[0][:conn], label: a.dig(1, :ref) }
       end
       [", ", combine_conn(locs)]
     end
@@ -53,11 +66,7 @@ module IsoDoc
 
     def escape_l10n(locs)
       locs.map do |x|
-        if XREF_CONNECTIVES.include?(x) || [", ", " ", ""].include?(x)
-          x
-        else
-          esc x
-        end
+        x[:conn] ? x : { ref: esc(x[:ref]) }
       end
     end
 
@@ -67,13 +76,13 @@ module IsoDoc
       until locs.empty?
         locs, locs1, add = resolve_comma_connectives1(locs, locs1, add)
       end
-      locs1 << add unless add.empty?
+      locs1 << { ref: add } unless add.empty?
       locs1
     end
 
     def resolve_comma_connectives1(locs, locs1, add)
-      if [", ", " ", ""].include?(locs[1])
-        add += locs[0..2].join
+      if [", ", " ", ""].include?(locs.dig(1, :conn)) && locs.size > 2
+        add += [locs[0][:ref], locs[1][:custom] || locs[1][:conn], locs[2][:ref]].join
         locs.shift(3)
       else
         locs1 << add unless add.empty?
@@ -86,11 +95,20 @@ module IsoDoc
     def resolve_to_connectives(locs)
       locs1 = []
       until locs.empty?
-        if locs[1] == "to"
-          locs1 << connectives_spans(@i18n.chain_to.sub("%1", locs[0])
-            .sub("%2", locs[2]))
+        if locs.dig(1, :conn) == "to"
+          x = @i18n.chain_to.sub("%1", locs[0][:ref])
+            .sub("%2", locs[2][:ref])
+          c = locs[1][:custom] and x = conn_sub(x, c)
+          locs1 << { ref: connectives_spans(x) }
           locs.shift(3)
-        else locs1 << locs.shift
+        else
+          if locs[0][:conn] == "from" && locs[0][:custom] # strip "from" and English
+            # TODO languages with obligatory "from"
+            locs1 << { conn: locs[0][:custom] }
+            locs.shift
+          else
+            locs1 << locs.shift
+          end
         end
       end
       locs1
@@ -100,13 +118,14 @@ module IsoDoc
       docxml.xpath(ns("//display-text")).each { |f| f.replace(f.children) }
       docxml.xpath(ns("//fmt-eref | //fmt-origin[not(.//termref)]"))
         .each do |e|
-        sem_xml_descendant?(e) and next
-        href = eref_target(e) or next
-        e.xpath(ns("./locality | ./localityStack")).each(&:remove)
-        if href[:type] == :anchor || %w(full short).include?(e["style"])
+          sem_xml_descendant?(e) and next
+          href = eref_target(e) or next
+          e.xpath(ns("./locality | ./localityStack")).each(&:remove)
+          if %w(short).include?(e["style"]) then eref2linkshort(e, href)
+          elsif href[:type] == :anchor || %w(full).include?(e["style"])
             eref2xref(e)
-        else eref2link1(e, href)
-        end
+          else eref2link1(e, href)
+          end
       end
     end
 
@@ -126,6 +145,14 @@ module IsoDoc
       node.replace(repl)
     end
 
+    def eref2linkshort(node, _href)
+      node.at(ns("./span[@class = 'fmt-first-biblio-delim']")) or
+        return eref2xref(node)
+      node.children = <<~XML
+        <fmt-xref target='#{node['bibitemid']}'>#{to_xml(node.children).sub('<span class="fmt-first-biblio-delim"/>', '</fmt-xref>')}
+      XML
+    end
+
     def suffix_url(url)
       url.nil? || %r{^https?://|^#}.match?(url) and return url
       File.extname(url).empty? or return url

data/lib/isodoc/presentation_function/erefs_locality.rb

@@ -36,12 +36,14 @@ module IsoDoc
         i == refs.size - 1 and next
         m << eref_locality_delimiter(r)
       end
-      ret.empty? ? ret : [", "] + ret
+      ret[-1] && ret[-1][:conn] == ", " and ret.pop
+      ret.empty? ? ret : [{ conn: ", " }] + ret
     end
 
     def eref_locality_delimiter(ref)
       if ref&.next_element&.name == "localityStack"
-        ref.next_element["connective"]
+        { conn: ref.next_element["connective"],
+          custom: ref.next_element["custom-connective"] }
       else locality_delimiter(ref)
       end
     end
@@ -51,23 +53,27 @@ module IsoDoc
       if ref.name == "localityStack"
         ret = eref_locality_stack1(ref, target, node, ret)
       else
-        l = eref_localities0(ref, idx, target, node) and ret << l
+        l = eref_localities0(ref, idx, target, node) and ret << { ref: l }
       end
-      ret[-1] == ", " and ret.pop
+      ret[-1] && ret[-1][:conn] == ", " and ret.pop
       ret
     end
 
     def eref_locality_stack1(ref, target, node, ret)
+      if ref["connective"] == "from" && ref["custom-connective"]
+        # TODO deal better with languages with mandatory from connective
+        ret << { conn: "from", custom: ref["custom-connective"] }
+      end
       ref.elements.each_with_index do |rr, j|
         l = eref_localities0(rr, j, target, node) or next
-        ret << l
+        ret << { ref: l }
         ret << locality_delimiter(rr) unless j == ref.elements.size - 1
       end
       ret
     end
 
     def locality_delimiter(_loc)
-      ", "
+      { conn: ", " }
     end
 
     def eref_localities0(ref, _idx, target, node)
@@ -80,6 +86,8 @@ module IsoDoc
       end
     end
 
+    # Suspended, this is an ordinal that GB asked for, not applicable
+    # for non-integers, and not desired for JIS
     def eref_localities1_zh(opt)
       ret = "第#{esc opt[:from]}" if opt[:from]
       ret += "&#x2013;#{esc opt[:upto]}" if opt[:upto]
@@ -90,11 +98,11 @@ module IsoDoc
 
     def eref_localities1(opt)
       opt[:type] == "anchor" and return nil
-      %(zh ja ko).include?(opt[:lang]) and
-        return l10n(eref_localities1_zh(opt))
+      # %(zh ja ko).include?(opt[:lang]) and
+      # return l10n(eref_localities1_zh(opt))
       ret = eref_locality_populate(opt[:type], opt[:node], opt[:number])
-      ret += " #{opt[:from]}" if opt[:from]
-      ret += "&#x2013;#{opt[:upto]}" if opt[:upto]
+      ret += " <esc>#{opt[:from]}</esc>" if opt[:from]
+      ret += "&#x2013;<esc>#{opt[:upto]}</esc>" if opt[:upto]
       l10n(ret)
     end
 

data/lib/isodoc/presentation_function/footnotes.rb

@@ -156,7 +156,8 @@ module IsoDoc
     def figure_key_insert_pt(elem)
       elem.at(ns(".//dl/name"))&.next ||
         elem.at(ns(".//dl"))&.children&.first ||
-        elem.add_child("<dl> </dl>").first.children.first
+        elem.add_child("<key><dl> </dl></key>")
+        .first.elements.first.children.first
     end
 
     def comments(docxml)

data/lib/isodoc/presentation_function/image.rb

@@ -70,9 +70,9 @@ module IsoDoc
       elem["class"] == "pseudocode" || elem["type"] == "pseudocode" and
         return sourcecode1(elem)
       figure_fn(elem)
-      figure_key(elem.at(ns("./dl")))
-      lbl = @xrefs.anchor(elem["id"], :label, false)
-      lbl and a = autonum(elem["id"], lbl)
+      figure_key(elem.at(ns("./key")))
+      lbl = @xrefs.anchor(elem["id"] || elem["original-id"], :label, false)
+      lbl and a = autonum(elem["id"] || elem["original-id"], lbl)
       figname = figure_name(elem)
       elem.at("./ancestor::xmlns:figure") && a and
         a += subfigure_delim
@@ -95,8 +95,7 @@ module IsoDoc
       dlist or return
       dlist["class"] = "formula_dl"
       dlist.at(ns("./name")) and return
-      dlist.previous =
-        "<p keep-with-next='true'><strong>#{@i18n.key}</strong></p>"
+      dlist.children.first.previous = "<name>#{@i18n.key}</name>"
     end
 
     def eps2svg(img)
@@ -184,5 +183,16 @@ module IsoDoc
       node["height"] = e["height"]
       node["width"] = e["width"]
     end
+
+    # used downstream to load svg images inline
+    def svg_load(directory, filename)
+      dir = File.join(@libdir, "html", directory)
+      filename = File.join(dir, filename)
+      File.exist?(filename) or return
+      file = File.read(filename) or return
+      file.sub(
+        '<?xml version="1.0" encoding="UTF-8"?>', ""
+      )
+    end
   end
 end

data/lib/isodoc/presentation_function/index.rb

@@ -1,15 +1,11 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def enable_indexsect
-      false
-    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"))
+      if xml.at(ns("//index"))
         i = xml.at(ns("//indexsect")) ||
           xml.root.add_child(
             "<indexsect #{add_id_text}>" \

data/lib/isodoc/presentation_function/inline.rb

@@ -68,31 +68,13 @@ module IsoDoc
       docxml.xpath(ns("//fmt-origin[not(.//termref)]")).each { |f| xref1(f) }
     end
 
-    # do not change to Presentation XML rendering
-    def sem_xml_descendant?(node)
-      ancestor_names = node.ancestors.map(&:name)
-      %w[preferred admitted deprecated related definition source]
-        .any? do |name|
-        ancestor_names.include?(name)
-      end and return true
-      %w[xref eref origin link name title].any? do |name|
-        ancestor_names.include?(name)
-      end and return true
-      ancestor_names.include?("bibitem") &&
-        %w[formattedref biblio-tag].none? do |name|
-          ancestor_names.include?(name)
-        end and return true
-      (ancestor_names & %w[requirement recommendation permission]).any? &&
-        !ancestor_names.include?("fmt-provision") and return true
-
-      false
-    end
-
     def xref1(node)
       sem_xml_descendant?(node) and return
       get_linkend(node)
     end
 
+    def link(xml); end
+
     # there should be no //variant in bibdata now
     def variant(xml)
       b = xml.xpath(ns("//bibdata//variant"))

data/lib/isodoc/presentation_function/list.rb

@@ -50,8 +50,8 @@ module IsoDoc
     end
 
     def ol_label(elem)
-      val = @xrefs.anchor(elem["id"], :label, false)
-      semx = "<semx element='autonum' source='#{elem['id']}'>#{val}</semx>"
+      val = @xrefs.anchor(elem["id"] || elem["original-id"], :label, false)
+      semx = "<semx element='autonum' source='#{elem['id'] || elem["original-id"]}'>#{val}</semx>"
       lbl = "<fmt-name>#{ol_label_format(semx, elem)}</fmt-name>"
       elem.add_first_child(lbl)
     end
@@ -83,7 +83,7 @@ module IsoDoc
 
     def ul_label(elem)
       val = ul_label_value(elem)
-      semx = "<semx element='autonum' source='#{elem['id']}'>#{val}</semx>"
+      semx = "<semx element='autonum' source='#{elem['id'] || elem["original-id"]}'>#{val}</semx>"
       lbl = "<fmt-name>#{semx}</fmt-name>"
       elem.add_first_child(lbl)
     end