isodoc 1.7.4 → 1.7.7

data/lib/isodoc/presentation_function/inline.rb

@@ -1,16 +1,22 @@
+require "metanorma-utils"
+require_relative "./concept"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def prefix_container(container, linkend, _target)
       l10n("#{@xrefs.anchor(container, :xref)}, #{linkend}")
     end
 
+    def anchor_value(id)
+      @xrefs.anchor(id, :value) || @xrefs.anchor(id, :label) ||
+        @xrefs.anchor(id, :xref)
+    end
+
     def anchor_linkend(node, linkend)
       if node["citeas"].nil? && node["bibitemid"]
         return @xrefs.anchor(node["bibitemid"], :xref) || "???"
       elsif node["target"] && node["droploc"]
-        return @xrefs.anchor(node["target"], :value) ||
-            @xrefs.anchor(node["target"], :label) ||
-            @xrefs.anchor(node["target"], :xref) || "???"
+        return anchor_value(node["target"]) || "???"
       elsif node["target"] && !/.#./.match(node["target"])
         linkend = anchor_linkend1(node)
       end
@@ -24,14 +30,15 @@ module IsoDoc
       (container && get_note_container_id(node) != container &&
        @xrefs.get[node["target"]]) and
         linkend = prefix_container(container, linkend, node["target"])
-      capitalise_xref(node, linkend)
+      capitalise_xref(node, linkend, anchor_value(node["target"]))
     end
 
-    def capitalise_xref(node, linkend)
-      return linkend unless %w(Latn Cyrl Grek).include? @script
-      return linkend&.capitalize if node["case"] == "capital"
-      return linkend&.downcase if node["case"] == "lowercase"
-      return linkend if linkend[0, 1].match?(/\p{Upper}/)
+    def capitalise_xref(node, linkend, label)
+      linktext = linkend.gsub(/<[^>]+>/, "")
+      (label && !label.empty? && /^#{Regexp.escape(label)}/.match?(linktext) ||
+          linktext[0, 1].match?(/\p{Upper}/)) and return linkend
+      node["case"] and
+        return Common::case_with_markup(linkend, node["case"], @script)
 
       capitalise_xref1(node, linkend)
     end
@@ -40,7 +47,7 @@ module IsoDoc
       prec = nearest_block_parent(node).xpath("./descendant-or-self::text()") &
         node.xpath("./preceding::text()")
       if prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map(&:text).join)
-        linkend&.capitalize
+        Common::case_with_markup(linkend, "capital", @script)
       else linkend
       end
     end
@@ -67,7 +74,7 @@ module IsoDoc
       link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
                               link, node)
       non_locality_elems(node).each(&:remove)
-      node.add_child(link)
+      node.add_child(cleanup_entities(link))
     end
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
@@ -88,8 +95,7 @@ module IsoDoc
           ret += eref_localities0(rr, j, target, delim, node)
           delim = ","
         end
-      else
-        ret += eref_localities0(ref, idx, target, delim, node)
+      else ret += eref_localities0(ref, idx, target, delim, node)
       end
       ret
     end
@@ -130,7 +136,7 @@ module IsoDoc
       loc = @i18n.locality[type] || type.sub(/^locality:/, "")
       loc = case node["case"]
             when "lowercase" then loc.downcase
-            else loc.capitalize
+            else Metanorma::Utils.strict_capitalize_first(loc)
             end
       " #{loc}"
     end
@@ -155,41 +161,6 @@ module IsoDoc
       get_linkend(node)
     end
 
-    def concept(docxml)
-      docxml.xpath(ns("//concept")).each { |f| concept1(f) }
-    end
-
-    def concept1(node)
-      xref = node&.at(ns("./xref/@target"))&.text or
-        return concept_render(node, node["ital"] || "true",
-                              node["ref"] || "true")
-      if node.at(ns("//definitions//dt[@id = '#{xref}']"))
-        concept_render(node, node["ital"] || "false", node["ref"] || "false")
-      else concept_render(node, node["ital"] || "true", node["ref"] || "true")
-      end
-    end
-
-    def concept_render(node, ital, ref)
-      node&.at(ns("./refterm"))&.remove
-      r = node.at(ns("./renderterm"))
-      r&.next = " " if node.at(ns("./xref | ./eref | ./termref")) && ref != "false"
-      if ital == "true" then r&.name = "em"
-      else r&.replace(r&.children)
-      end
-      concept1_ref(node, ref)
-      node.replace(node.children)
-    end
-
-    def concept1_ref(node, ref)
-      r = node.at(ns("./xref | ./eref | ./termref")) or return
-      return r.remove if ref == "false"
-
-      if non_locality_elems(r).select { |c| !c.text? || /\S/.match(c) }.empty?
-        r.replace(@i18n.term_defined_in.sub(/%/, r.to_xml))
-      else r.replace("[#{r.to_xml}]")
-      end
-    end
-
     def variant(docxml)
       docxml.xpath(ns("//variant")).each { |f| variant1(f) }
       docxml.xpath(ns("//variant[@remove = 'true']")).each(&:remove)

data/lib/isodoc/presentation_xml_convert.rb

@@ -49,6 +49,7 @@ module IsoDoc
       termexample docxml
       note docxml
       termnote docxml
+      termdefinition docxml
       permission docxml
       requirement docxml
       recommendation docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.7.4".freeze
+  VERSION = "1.7.7".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -1,231 +1,233 @@
 require_relative "./table"
 require_relative "./inline"
 
-module IsoDoc::WordFunction
-  module Body
-    def define_head(head, filename, _dir)
-      head.style do |style|
-        loc = File.join(File.dirname(__FILE__), "..", "base_style",
-                        "metanorma_word.scss")
-        stylesheet = File.read(loc, encoding: "utf-8")
-        style.comment "\n#{stylesheet}\n"
-      end
-      super
-    end
-
-    def body_attr
-      { lang: "EN-US", link: "blue", vlink: "#954F72" }
-    end
+module IsoDoc
+  module WordFunction
+    module Body
+      def define_head(head, filename, _dir)
+        head.style do |style|
+          loc = File.join(File.dirname(__FILE__), "..", "base_style",
+                          "metanorma_word.scss")
+          stylesheet = File.read(loc, encoding: "utf-8")
+          style.comment "\n#{stylesheet}\n"
+        end
+        super
+      end
 
-    def make_body1(body, _docxml)
-      body.div **{ class: "WordSection1" } do |div1|
-        div1.p { |p| p << "&nbsp;" } # placeholder
+      def body_attr
+        { lang: "EN-US", link: "blue", vlink: "#954F72" }
       end
-      section_break(body)
-    end
 
-    def make_body2(body, docxml)
-      body.div **{ class: "WordSection2" } do |div2|
-        boilerplate docxml, div2
-        preface_block docxml, div2
-        abstract docxml, div2
-        foreword docxml, div2
-        introduction docxml, div2
-        preface docxml, div2
-        acknowledgements docxml, div2
-        div2.p { |p| p << "&nbsp;" } # placeholder
-      end
-      section_break(body)
-    end
+      def make_body1(body, _docxml)
+        body.div **{ class: "WordSection1" } do |div1|
+          div1.p { |p| p << "&nbsp;" } # placeholder
+        end
+        section_break(body)
+      end
+
+      def make_body2(body, docxml)
+        body.div **{ class: "WordSection2" } do |div2|
+          boilerplate docxml, div2
+          preface_block docxml, div2
+          abstract docxml, div2
+          foreword docxml, div2
+          introduction docxml, div2
+          preface docxml, div2
+          acknowledgements docxml, div2
+          div2.p { |p| p << "&nbsp;" } # placeholder
+        end
+        section_break(body)
+      end
 
-    def make_body3(body, docxml)
-      body.div **{ class: "WordSection3" } do |div3|
-        middle docxml, div3
-        footnotes div3
-        comments div3
+      def make_body3(body, docxml)
+        body.div **{ class: "WordSection3" } do |div3|
+          middle docxml, div3
+          footnotes div3
+          comments div3
+        end
       end
-    end
 
-    def insert_tab(out, count)
-      out.span **attr_code(style: "mso-tab-count:#{count}") do |span|
-        [1..count].each { span << "&#xA0; " }
+      def insert_tab(out, count)
+        out.span **attr_code(style: "mso-tab-count:#{count}") do |span|
+          [1..count].each { span << "&#xA0; " }
+        end
       end
-    end
 
-    def para_class(_node)
-      classtype = nil
-      classtype = "Note" if @note
-      classtype = "MsoCommentText" if in_comment
-      classtype = "Sourcecode" if @annotation
-      classtype
-    end
+      def para_class(_node)
+        classtype = nil
+        classtype = "Note" if @note
+        classtype = "MsoCommentText" if in_comment
+        classtype = "Sourcecode" if @annotation
+        classtype
+      end
 
-    def para_parse(node, out)
-      out.p **attr_code(para_attrs(node)) do |p|
-        unless @termdomain.empty?
-          p << "&lt;#{@termdomain}&gt; "
-          @termdomain = ""
+      def para_parse(node, out)
+        out.p **attr_code(para_attrs(node)) do |p|
+          unless @termdomain.empty?
+            p << "&lt;#{@termdomain}&gt; "
+            @termdomain = ""
+          end
+          node.children.each { |n| parse(n, p) unless n.name == "note" }
         end
-        node.children.each { |n| parse(n, p) unless n.name == "note" }
+        node.xpath(ns("./note")).each { |n| parse(n, out) }
       end
-      node.xpath(ns("./note")).each { |n| parse(n, out) }
-    end
 
-    WORD_DT_ATTRS = { class: @note ? "Note" : nil, align: "left",
-                      style: "margin-left:0pt;text-align:left;" }.freeze
+      WORD_DT_ATTRS = { class: @note ? "Note" : nil, align: "left",
+                        style: "margin-left:0pt;text-align:left;" }.freeze
 
-    def dt_parse(dt, term)
-      term.p **attr_code(WORD_DT_ATTRS) do |p|
-        if dt.elements.empty?
-          p << dt.text
-        else
-          dt.children.each { |n| parse(n, p) }
+      def dt_parse(dterm, term)
+        term.p **attr_code(WORD_DT_ATTRS) do |p|
+          if dterm.elements.empty?
+            p << dterm.text
+          else
+            dterm.children.each { |n| parse(n, p) }
+          end
         end
       end
-    end
 
-    def dl_parse(node, out)
-      out.table **{ class: "dl" } do |v|
-        node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
-          v.tr do |tr|
-            tr.td **{ valign: "top", align: "left" } do |term|
-              dt_parse(dt, term)
-            end
-            tr.td **{ valign: "top" } do |listitem|
-              dd.children.each { |n| parse(n, listitem) }
+      def dl_parse(node, out)
+        out.table **{ class: "dl" } do |v|
+          node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
+            v.tr do |tr|
+              tr.td **{ valign: "top", align: "left" } do |term|
+                dt_parse(dt, term)
+              end
+              tr.td **{ valign: "top" } do |listitem|
+                dd.children.each { |n| parse(n, listitem) }
+              end
             end
           end
+          dl_parse_notes(node, v)
         end
-        dl_parse_notes(node, v)
       end
-    end
 
-    def dl_parse_notes(node, v)
-      return if node.elements.reject { |n| dt_dd? n }.empty?
+      def dl_parse_notes(node, out)
+        return if node.elements.reject { |n| dt_dd? n }.empty?
 
-      v.tr do |tr|
-        tr.td **{ colspan: 2 } do |td|
-          node.elements.reject { |n| dt_dd? n }.each { |n| parse(n, td) }
+        out.tr do |tr|
+          tr.td **{ colspan: 2 } do |td|
+            node.elements.reject { |n| dt_dd? n }.each { |n| parse(n, td) }
+          end
         end
       end
-    end
 
-    def figure_get_or_make_dl(node)
-      dl = node.at(".//table[@class = 'dl']")
-      if dl.nil?
-        node.add_child("<p><b>#{@i18n.key}</b></p><table class='dl'></table>")
+      def figure_get_or_make_dl(node)
         dl = node.at(".//table[@class = 'dl']")
+        if dl.nil?
+          node.add_child("<p><b>#{@i18n.key}</b></p><table class='dl'></table>")
+          dl = node.at(".//table[@class = 'dl']")
+        end
+        dl
+      end
+
+      def figure_aside_process(fig, aside, key)
+        # get rid of footnote link, it is in diagram
+        fig&.at("./a[@class='TableFootnoteRef']")&.remove
+        fnref = fig.at(".//span[@class='TableFootnoteRef']/..")
+        tr = key.add_child("<tr></tr>").first
+        dt = tr.add_child("<td valign='top' align='left'></td>").first
+        dd = tr.add_child("<td valign='top'></td>").first
+        fnref.parent = dt
+        aside.xpath(".//p").each do |a|
+          a.delete("class")
+          a.parent = dd
+        end
       end
-      dl
-    end
-
-    def figure_aside_process(fig, aside, key)
-      # get rid of footnote link, it is in diagram
-      fig&.at("./a[@class='TableFootnoteRef']")&.remove
-      fnref = fig.at(".//span[@class='TableFootnoteRef']/..")
-      tr = key.add_child("<tr></tr>").first
-      dt = tr.add_child("<td valign='top' align='left'></td>").first
-      dd = tr.add_child("<td valign='top'></td>").first
-      fnref.parent = dt
-      aside.xpath(".//p").each do |a|
-        a.delete("class")
-        a.parent = dd
-      end
-    end
 
-    def note_p_parse(node, div)
-      name = node&.at(ns("./name"))&.remove
-      div.p **{ class: "Note" } do |p|
-        p.span **{ class: "note_label" } do |s|
-          name&.children&.each { |n| parse(n, s) }
+      def note_p_parse(node, div)
+        name = node&.at(ns("./name"))&.remove
+        div.p **{ class: "Note" } do |p|
+          p.span **{ class: "note_label" } do |s|
+            name&.children&.each { |n| parse(n, s) }
+          end
+          insert_tab(p, 1)
+          node.first_element_child.children.each { |n| parse(n, p) }
         end
-        insert_tab(p, 1)
-        node.first_element_child.children.each { |n| parse(n, p) }
+        node.element_children[1..-1].each { |n| parse(n, div) }
       end
-      node.element_children[1..-1].each { |n| parse(n, div) }
-    end
 
-    def note_parse1(node, div)
-      name = node&.at(ns("./name"))&.remove
-      div.p **{ class: "Note" } do |p|
-        p.span **{ class: "note_label" } do |s|
-          name&.children&.each { |n| parse(n, s) }
+      def note_parse1(node, div)
+        name = node&.at(ns("./name"))&.remove
+        div.p **{ class: "Note" } do |p|
+          p.span **{ class: "note_label" } do |s|
+            name&.children&.each { |n| parse(n, s) }
+          end
+          insert_tab(p, 1)
         end
-        insert_tab(p, 1)
+        node.children.each { |n| parse(n, div) }
       end
-      node.children.each { |n| parse(n, div) }
-    end
 
-    def termnote_parse(node, out)
-      name = node&.at(ns("./name"))&.remove
-      out.div **note_attrs(node) do |div|
-        div.p **{ class: "Note" } do |p|
-          if name
-            name.children.each { |n| parse(n, p) }
-            p << l10n(": ")
+      def termnote_parse(node, out)
+        name = node&.at(ns("./name"))&.remove
+        out.div **note_attrs(node) do |div|
+          div.p **{ class: "Note" } do |p|
+            if name
+              name.children.each { |n| parse(n, p) }
+              p << l10n(": ")
+            end
+            para_then_remainder(node.first_element_child, node, p, div)
           end
-          para_then_remainder(node.first_element_child, node, p, div)
         end
       end
-    end
 
-    def para_attrs(node)
-      attrs = { class: para_class(node), id: node["id"], style: "" }
-      unless node["align"].nil?
-        attrs[:align] = node["align"] unless node["align"] == "justify"
-        attrs[:style] += "text-align:#{node['align']};"
+      def para_attrs(node)
+        attrs = { class: para_class(node), id: node["id"], style: "" }
+        unless node["align"].nil?
+          attrs[:align] = node["align"] unless node["align"] == "justify"
+          attrs[:style] += "text-align:#{node['align']};"
+        end
+        attrs[:style] += keep_style(node).to_s
+        attrs[:style] = nil if attrs[:style].empty?
+        attrs
       end
-      attrs[:style] += keep_style(node).to_s
-      attrs[:style] = nil if attrs[:style].empty?
-      attrs
-    end
 
-    def example_table_attr(node)
-      super.merge({
-                    style: "mso-table-lspace:15.0cm;margin-left:423.0pt;"\
-                    "mso-table-rspace:15.0cm;margin-right:423.0pt;"\
-                    "mso-table-anchor-horizontal:column;"\
-                    "mso-table-overlap:never;border-collapse:collapse;"\
-                    "#{keep_style(node)}",
-                  })
-    end
+      def example_table_attr(node)
+        super.merge(
+          style: "mso-table-lspace:15.0cm;margin-left:423.0pt;"\
+                 "mso-table-rspace:15.0cm;margin-right:423.0pt;"\
+                 "mso-table-anchor-horizontal:column;"\
+                 "mso-table-overlap:never;border-collapse:collapse;"\
+                 "#{keep_style(node)}",
+        )
+      end
 
-    def formula_where(deflist, out)
-      return unless deflist
+      def formula_where(deflist, out)
+        return unless deflist
 
-      out.p { |p| p << @i18n.where }
-      parse(deflist, out)
-      out.parent.at("./table")["class"] = "formula_dl"
-    end
+        out.p { |p| p << @i18n.where }
+        parse(deflist, out)
+        out.parent.at("./table")["class"] = "formula_dl"
+      end
 
-    def formula_parse1(node, out)
-      out.div **attr_code(class: "formula") do |div|
-        div.p do |_p|
-          parse(node.at(ns("./stem")), div)
-          insert_tab(div, 1)
-          if lbl = node&.at(ns("./name"))&.text
-            div << "(#{lbl})"
+      def formula_parse1(node, out)
+        out.div **attr_code(class: "formula") do |div|
+          div.p do |_p|
+            parse(node.at(ns("./stem")), div)
+            insert_tab(div, 1)
+            if lbl = node&.at(ns("./name"))&.text
+              div << "(#{lbl})"
+            end
           end
         end
       end
-    end
 
-    def li_parse(node, out)
-      out.li **attr_code(id: node["id"]) do |li|
-        if node["uncheckedcheckbox"] == "true"
-          li << '<span class="zzMoveToFollowing">&#x2610; </span>'
-        elsif node["checkedcheckbox"] == "true"
-          li << '<span class="zzMoveToFollowing">&#x2611; </span>'
+      def li_parse(node, out)
+        out.li **attr_code(id: node["id"]) do |li|
+          if node["uncheckedcheckbox"] == "true"
+            li << '<span class="zzMoveToFollowing">&#x2610; </span>'
+          elsif node["checkedcheckbox"] == "true"
+            li << '<span class="zzMoveToFollowing">&#x2611; </span>'
+          end
+          node.children.each { |n| parse(n, li) }
         end
-        node.children.each { |n| parse(n, li) }
       end
-    end
 
-    def suffix_url(url)
-      return url if %r{^https?://}.match?(url)
-      return url unless File.extname(url).empty?
+      def suffix_url(url)
+        return url if %r{^https?://}.match?(url)
+        return url unless File.extname(url).empty?
 
-      url.sub(/#{File.extname(url)}$/, ".doc")
+        url.sub(/#{File.extname(url)}$/, ".doc")
+      end
     end
   end
 end