isodoc 1.7.2 → 1.7.5

data/lib/isodoc/function/table.rb

@@ -1,116 +1,119 @@
-module IsoDoc::Function
-  module Table
-    def table_title_parse(node, out)
-      name = node.at(ns("./name")) or return
-      out.p **{ class: "TableTitle", style: "text-align:center;" } do |p|
-        name&.children&.each { |n| parse(n, p) }
+module IsoDoc
+  module Function
+    module Table
+      def table_title_parse(node, out)
+        name = node.at(ns("./name")) or return
+        out.p **{ class: "TableTitle", style: "text-align:center;" } do |p|
+          name&.children&.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def thead_parse(node, table)
-      thead = node.at(ns("./thead"))
-      if thead
-        table.thead do |h|
-          thead.element_children.each_with_index do |n, i|
-            tr_parse(n, h, i, thead.element_children.size, true)
+      def thead_parse(node, table)
+        thead = node.at(ns("./thead"))
+        if thead
+          table.thead do |h|
+            thead.element_children.each_with_index do |n, i|
+              tr_parse(n, h, i, thead.element_children.size, true)
+            end
           end
         end
       end
-    end
 
-    def tbody_parse(node, table)
-      tbody = node.at(ns("./tbody")) || return
-      table.tbody do |h|
-        tbody.element_children.each_with_index do |n, i|
-          tr_parse(n, h, i, tbody.element_children.size, false)
+      def tbody_parse(node, table)
+        tbody = node.at(ns("./tbody")) || return
+        table.tbody do |h|
+          tbody.element_children.each_with_index do |n, i|
+            tr_parse(n, h, i, tbody.element_children.size, false)
+          end
         end
       end
-    end
 
-    def tfoot_parse(node, table)
-      tfoot = node.at(ns("./tfoot"))
-      if tfoot
-        table.tfoot do |h|
-          tfoot.element_children.each_with_index do |n, i|
-            tr_parse(n, h, i, tfoot.element_children.size, false)
+      def tfoot_parse(node, table)
+        tfoot = node.at(ns("./tfoot"))
+        if tfoot
+          table.tfoot do |h|
+            tfoot.element_children.each_with_index do |n, i|
+              tr_parse(n, h, i, tfoot.element_children.size, false)
+            end
           end
         end
       end
-    end
 
-    def table_attrs(node)
-      width = node["width"] ? "width:#{node['width']};" : nil
-      attr_code(
-        id: node["id"],
-        class: "MsoISOTable",
-        style: "border-width:1px;border-spacing:0;#{width}#{keep_style(node)}",
-        title: node["alt"],
-      )
-    end
+      def table_attrs(node)
+        width = node["width"] ? "width:#{node['width']};" : nil
+        attr_code(
+          id: node["id"],
+          class: "MsoISOTable",
+          style: "border-width:1px;border-spacing:0;"\
+                 "#{width}#{keep_style(node)}",
+          title: node["alt"],
+        )
+      end
 
-    def tcaption(node, table)
-      return unless node["summary"]
+      def tcaption(node, table)
+        return unless node["summary"]
 
-      table.caption do |c|
-        c.span **{ style: "display:none" } do |s|
-          s << node["summary"]
+        table.caption do |c|
+          c.span **{ style: "display:none" } do |s|
+            s << node["summary"]
+          end
         end
       end
-    end
 
-    def colgroup(node, table)
-      colgroup = node.at(ns("./colgroup")) or return
-      table.colgroup do |cg|
-        colgroup.xpath(ns("./col")).each do |c|
-          cg.col **{ style: "width: #{c['width']};" }
+      def colgroup(node, table)
+        colgroup = node.at(ns("./colgroup")) or return
+        table.colgroup do |cg|
+          colgroup.xpath(ns("./col")).each do |c|
+            cg.col **{ style: "width: #{c['width']};" }
+          end
         end
       end
-    end
 
-    def table_parse(node, out)
-      @in_table = true
-      table_title_parse(node, out)
-      out.table **table_attrs(node) do |t|
-        tcaption(node, t)
-        colgroup(node, t)
-        thead_parse(node, t)
-        tbody_parse(node, t)
-        tfoot_parse(node, t)
-        (dl = node.at(ns("./dl"))) && parse(dl, out)
-        node.xpath(ns("./note")).each { |n| parse(n, out) }
+      def table_parse(node, out)
+        @in_table = true
+        table_title_parse(node, out)
+        out.table **table_attrs(node) do |t|
+          tcaption(node, t)
+          colgroup(node, t)
+          thead_parse(node, t)
+          tbody_parse(node, t)
+          tfoot_parse(node, t)
+          (dl = node.at(ns("./dl"))) && parse(dl, out)
+          node.xpath(ns("./note")).each { |n| parse(n, out) }
+        end
+        @in_table = false
+        # out.p { |p| p << "&nbsp;" }
       end
-      @in_table = false
-      # out.p { |p| p << "&nbsp;" }
-    end
 
-    SW = "solid windowtext".freeze
+      SW = "solid windowtext".freeze
 
-    # def make_tr_attr(td, row, totalrows, cols, totalcols, header)
-    # border-left:#{col.zero? ? "#{SW} 1.5pt;" : "none;"}
-    # border-right:#{SW} #{col == totalcols && !header ? "1.5" : "1.0"}pt;
+      # def make_tr_attr(td, row, totalrows, cols, totalcols, header)
+      # border-left:#{col.zero? ? "#{SW} 1.5pt;" : "none;"}
+      # border-right:#{SW} #{col == totalcols && !header ? "1.5" : "1.0"}pt;
 
-    def make_tr_attr(cell, row, totalrows, header)
-      style = cell.name == "th" ? "font-weight:bold;" : ""
-      cell["align"] and style += "text-align:#{cell['align']};"
-      cell["valign"] and style += "vertical-align:#{cell['valign']};"
-      rowmax = cell["rowspan"] ? row + cell["rowspan"].to_i - 1 : row
-      style += <<~STYLE
-        border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}
-        border-bottom:#{SW} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
-      STYLE
-      header and scope = (cell["colspan"] ? "colgroup" : "col")
-      !header and cell.name == "th" and scope =
-                                          (cell["rowspan"] ? "rowgroup" : "row")
-      { rowspan: cell["rowspan"], colspan: cell["colspan"],
-        style: style.gsub(/\n/, ""), scope: scope }
-    end
+      def make_tr_attr(cell, row, totalrows, header)
+        style = cell.name == "th" ? "font-weight:bold;" : ""
+        cell["align"] and style += "text-align:#{cell['align']};"
+        cell["valign"] and style += "vertical-align:#{cell['valign']};"
+        rowmax = cell["rowspan"] ? row + cell["rowspan"].to_i - 1 : row
+        style += <<~STYLE
+          border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}
+          border-bottom:#{SW} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
+        STYLE
+        header and scope = (cell["colspan"] ? "colgroup" : "col")
+        !header && cell.name == "th" and
+          scope = (cell["rowspan"] ? "rowgroup" : "row")
+        { rowspan: cell["rowspan"], colspan: cell["colspan"],
+          style: style.gsub(/\n/, ""), scope: scope }
+      end
 
-    def tr_parse(node, out, ord, totalrows, header)
-      out.tr do |r|
-        node.elements.each do |td|
-          attrs = make_tr_attr(td, ord, totalrows - 1, header)
-          r.send td.name, **attr_code(attrs) do |entry|
-            td.children.each { |n| parse(n, entry) }
+      def tr_parse(node, out, ord, totalrows, header)
+        out.tr do |r|
+          node.elements.each do |td|
+            attrs = make_tr_attr(td, ord, totalrows - 1, header)
+            r.send td.name, **attr_code(attrs) do |entry|
+              td.children.each { |n| parse(n, entry) }
+            end
           end
         end
       end

data/lib/isodoc/function/terms.rb

@@ -1,77 +1,79 @@
-module IsoDoc::Function
-  module Terms
-    def definition_parse(node, out)
-      node.children.each { |n| parse(n, out) }
-    end
+module IsoDoc
+  module Function
+    module Terms
+      def definition_parse(node, out)
+        node.children.each { |n| parse(n, out) }
+      end
 
-    def modification_parse(node, out)
-      out << "[MODIFICATION]"
-      para = node.at(ns("./p"))
-      para.children.each { |n| parse(n, out) }
-    end
+      def modification_parse(node, out)
+        out << "[MODIFICATION]"
+        para = node.at(ns("./p"))
+        para.children.each { |n| parse(n, out) }
+      end
 
-    def deprecated_term_parse(node, out)
-      out.p **{ class: "DeprecatedTerms", style: "text-align:left;" } do |p|
-        p << l10n("#{@i18n.deprecated}: ")
-        node.children.each { |c| parse(c, p) }
+      def deprecated_term_parse(node, out)
+        out.p **{ class: "DeprecatedTerms", style: "text-align:left;" } do |p|
+          p << l10n("#{@i18n.deprecated}: ")
+          node.children.each { |c| parse(c, p) }
+        end
       end
-    end
 
-    def admitted_term_parse(node, out)
-      out.p **{ class: "AltTerms", style: "text-align:left;" } do |p|
-        node.children.each { |c| parse(c, p) }
+      def admitted_term_parse(node, out)
+        out.p **{ class: "AltTerms", style: "text-align:left;" } do |p|
+          node.children.each { |c| parse(c, p) }
+        end
       end
-    end
 
-    def term_parse(node, out)
-      out.p **{ class: "Terms", style: "text-align:left;" } do |p|
-        node.children.each { |c| parse(c, p) }
+      def term_parse(node, out)
+        out.p **{ class: "Terms", style: "text-align:left;" } do |p|
+          node.children.each { |c| parse(c, p) }
+        end
       end
-    end
 
-    def para_then_remainder(first, node, para, div)
-      if first.name == "p"
-        first.children.each { |n| parse(n, para) }
-        node.elements.drop(1).each { |n| parse(n, div) }
-      else
-        node.elements.each { |n| parse(n, div) }
+      def para_then_remainder(first, node, para, div)
+        if first.name == "p"
+          first.children.each { |n| parse(n, para) }
+          node.elements.drop(1).each { |n| parse(n, div) }
+        else
+          node.elements.each { |n| parse(n, div) }
+        end
       end
-    end
 
-    def termnote_delim
-      l10n(": ")
-    end
+      def termnote_delim
+        l10n(": ")
+      end
 
-    def termnote_parse(node, out)
-      name = node&.at(ns("./name"))&.remove
-      out.div **note_attrs(node) do |div|
-        div.p do |p|
-          if name
-            name.children.each { |n| parse(n, p) }
-            p << termnote_delim
+      def termnote_parse(node, out)
+        name = node&.at(ns("./name"))&.remove
+        out.div **note_attrs(node) do |div|
+          div.p do |p|
+            if name
+              name.children.each { |n| parse(n, p) }
+              p << termnote_delim
+            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 termref_parse(node, out)
-      out.p do |p|
-        p << "[TERMREF]"
-        node.children.each { |n| parse(n, p) }
-        p << "[/TERMREF]"
+      def termref_parse(node, out)
+        out.p do |p|
+          p << "[TERMREF]"
+          node.children.each { |n| parse(n, p) }
+          p << "[/TERMREF]"
+        end
       end
-    end
 
-    def termdef_parse(node, out)
-      name = node&.at(ns("./name"))&.remove
-      out.p **{ class: "TermNum", id: node["id"] } do |p|
-        name&.children&.each { |n| parse(n, p) }
+      def termdef_parse(node, out)
+        name = node&.at(ns("./name"))&.remove
+        out.p **{ class: "TermNum", id: node["id"] } do |p|
+          name&.children&.each { |n| parse(n, p) }
+        end
+        set_termdomain("")
+        node.children.each { |n| parse(n, out) }
       end
-      set_termdomain("")
-      node.children.each { |n| parse(n, out) }
-    end
 
-    def termdocsource_parse(_node, _out); end
+      def termdocsource_parse(_node, _out); end
+    end
   end
 end

data/lib/isodoc/function/to_word_html.rb

@@ -212,6 +212,7 @@ module IsoDoc
           when "measurement-target" then requirement_component_parse(node, out)
           when "verification" then requirement_component_parse(node, out)
           when "import" then requirement_component_parse(node, out)
+          when "component" then requirement_component_parse(node, out)
           when "index" then index_parse(node, out)
           when "index-xref" then index_xref_parse(node, out)
           when "termref" then termrefelem_parse(node, out)
@@ -232,6 +233,7 @@ module IsoDoc
           when "option" then option_parse(node, out)
           when "textarea" then textarea_parse(node, out)
           when "toc" then toc_parse(node, out)
+          when "variant-title" then variant_title(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/html_function/mathvariant_to_plain.rb

@@ -41,6 +41,7 @@ module IsoDoc
       def convert
         docxml.xpath("//m:math", MATHML).each do |elem|
           next if nothing_to_style(elem)
+
           mathml1(elem)
         end
         docxml
@@ -49,7 +50,8 @@ module IsoDoc
       private
 
       def nothing_to_style(elem)
-        !elem.at("./*[@mathvariant][not(@mathvariant = 'normal')][not(@mathvariant = 'italic')]")
+        !elem.at("./*[@mathvariant][not(@mathvariant = 'normal')]"\
+                 "[not(@mathvariant = 'italic')]")
       end
 
       def mathml1(base_elem)
@@ -58,7 +60,7 @@ module IsoDoc
           .merge(MATHVARIANT_TO_PLANE_MAPPINGS)
           .each_pair do |mathvariant_list, plain_font|
             base_elem.xpath(mathvariant_xpath(mathvariant_list)).each do |elem|
-              toPlane(elem, plain_font)
+              to_plane(elem, plain_font)
             end
           end
       end
@@ -69,7 +71,7 @@ module IsoDoc
           .join
       end
 
-      def toPlane(elem, font)
+      def to_plane(elem, font)
         elem.traverse do |n|
           next unless n.text?
 

data/lib/isodoc/presentation_function/block.rb

@@ -2,10 +2,10 @@ require "base64"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def lower2cap(s)
-      return s if /^[[:upper:]][[:upper:]]/.match?(s)
+    def lower2cap(text)
+      return text if /^[[:upper:]][[:upper:]]/.match?(text)
 
-      s.capitalize
+      text.capitalize
     end
 
     def figure(docxml)
@@ -13,8 +13,7 @@ module IsoDoc
       docxml.xpath(ns("//figure")).each { |f| figure1(f) }
       docxml.xpath(ns("//svgmap")).each do |s|
         if f = s.at(ns("./figure")) then s.replace(f)
-        else
-          s.remove
+        else s.remove
         end
       end
     end
@@ -30,26 +29,28 @@ module IsoDoc
       elem.replace(x)
     end
 
-    def figure1(f)
-      return sourcecode1(f) if f["class"] == "pseudocode" || f["type"] == "pseudocode"
-      return if labelled_ancestor(f) && f.ancestors("figure").empty?
-      return if f.at(ns("./figure")) and !f.at(ns("./name"))
+    def figure1(elem)
+      return sourcecode1(elem) if elem["class"] == "pseudocode" ||
+        elem["type"] == "pseudocode"
+      return if labelled_ancestor(elem) && elem.ancestors("figure").empty? ||
+        elem.at(ns("./figure")) && !elem.at(ns("./name"))
 
-      lbl = @xrefs.anchor(f['id'], :label, false) or return
-      prefix_name(f, "&nbsp;&mdash; ",
+      lbl = @xrefs.anchor(elem["id"], :label, false) or return
+      prefix_name(elem, "&nbsp;&mdash; ",
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
-    def prefix_name(f, delim, number, elem)
+    def prefix_name(node, delim, number, elem)
       return if number.nil? || number.empty?
 
-      unless name = f.at(ns("./#{elem}"))
-        f.children.empty? and f.add_child("<#{elem}></#{elem}>") or
-          f.children.first.previous = "<#{elem}></#{elem}>"
-          name = f.children.first
+      unless name = node.at(ns("./#{elem}"))
+        node.children.empty? and node.add_child("<#{elem}></#{elem}>") or
+          node.children.first.previous = "<#{elem}></#{elem}>"
+        name = node.children.first
+      end
+      if name.children.empty? then name.add_child(number)
+      else (name.children.first.previous = "#{number}#{delim}")
       end
-      name.children.empty? ? name.add_child(number) :
-        ( name.children.first.previous = "#{number}#{delim}" )
     end
 
     def sourcecode(docxml)
@@ -58,12 +59,13 @@ module IsoDoc
       end
     end
 
-    def sourcecode1(f)
-      return if labelled_ancestor(f)
-      return unless f.ancestors("example").empty?
+    def sourcecode1(elem)
+      return if labelled_ancestor(elem)
+      return unless elem.ancestors("example").empty?
 
-      lbl = @xrefs.anchor(f['id'], :label, false) or return
-      prefix_name(f, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
+      lbl = @xrefs.anchor(elem["id"], :label, false) or return
+      prefix_name(elem, "&nbsp;&mdash; ",
+                  l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
     def formula(docxml)
@@ -73,9 +75,9 @@ module IsoDoc
     end
 
     # introduce name element
-    def formula1(f)
-      lbl = @xrefs.anchor(f['id'], :label, false)
-      prefix_name(f, "", lbl, "name")
+    def formula1(elem)
+      lbl = @xrefs.anchor(elem["id"], :label, false)
+      prefix_name(elem, "", lbl, "name")
     end
 
     def example(docxml)
@@ -90,11 +92,14 @@ module IsoDoc
       end
     end
 
-    def example1(f)
-      n = @xrefs.get[f["id"]]
-      lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @i18n.example:
-        l10n("#{@i18n.example} #{n[:label]}")
-      prefix_name(f, "&nbsp;&mdash; ", lbl, "name")
+    def example1(elem)
+      n = @xrefs.get[elem["id"]]
+      lbl = if n.nil? || n[:label].nil? || n[:label].empty?
+              @i18n.example
+            else
+              l10n("#{@i18n.example} #{n[:label]}")
+            end
+      prefix_name(elem, "&nbsp;&mdash; ", lbl, "name")
     end
 
     def note(docxml)
@@ -104,13 +109,16 @@ module IsoDoc
     end
 
     # introduce name element
-    def note1(f)
-      return if f.parent.name == "bibitem"
+    def note1(elem)
+      return if elem.parent.name == "bibitem"
 
-      n = @xrefs.get[f["id"]]
-      lbl = (@i18n.note if n.nil? || n[:label].nil? || n[:label].empty?) ?
-        @i18n.note: l10n("#{@i18n.note} #{n[:label]}")
-      prefix_name(f, "", lbl, "name")
+      n = @xrefs.get[elem["id"]]
+      lbl = if n.nil? || n[:label].nil? || n[:label].empty?
+              @i18n.note
+            else
+              l10n("#{@i18n.note} #{n[:label]}")
+            end
+      prefix_name(elem, "", lbl, "name")
     end
 
     def termnote(docxml)
@@ -120,9 +128,27 @@ module IsoDoc
     end
 
     # introduce name element
-    def termnote1(f)
-      lbl = l10n(@xrefs.anchor(f["id"], :label) || "???")
-      prefix_name(f, "", lower2cap(lbl), "name")
+    def termnote1(elem)
+      lbl = l10n(@xrefs.anchor(elem["id"], :label) || "???")
+      prefix_name(elem, "", lower2cap(lbl), "name")
+    end
+
+    def termdefinition(docxml)
+      docxml.xpath(ns("//term[definition]")).each do |f|
+        termdefinition1(f)
+      end
+    end
+
+    def termdefinition1(elem)
+      return unless elem.xpath(ns("./definition")).size > 1
+
+      d = elem.at(ns("./definition"))
+      d = d.replace("<ol><li>#{d.children.to_xml}</li></ol>").first
+      elem.xpath(ns("./definition")).each do |f|
+        f = f.replace("<li>#{f.children.to_xml}</li>").first
+        d << f
+      end
+      d.wrap("<definition></definition>")
     end
 
     def recommendation(docxml)
@@ -144,10 +170,10 @@ module IsoDoc
     end
 
     # introduce name element
-    def recommendation1(f, type)
-      n = @xrefs.anchor(f["id"], :label, false)
+    def recommendation1(elem, type)
+      n = @xrefs.anchor(elem["id"], :label, false)
       lbl = (n.nil? ? type : l10n("#{type} #{n}"))
-      prefix_name(f, "", lbl, "name")
+      prefix_name(elem, "", lbl, "name")
     end
 
     def table(docxml)
@@ -156,12 +182,13 @@ module IsoDoc
       end
     end
 
-    def table1(f)
-      return if labelled_ancestor(f)
-      return if f["unnumbered"] && !f.at(ns("./name"))
+    def table1(elem)
+      return if labelled_ancestor(elem)
+      return if elem["unnumbered"] && !elem.at(ns("./name"))
 
-      n = @xrefs.anchor(f["id"], :label, false)
-      prefix_name(f, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.table} #{n}"), "name")
+      n = @xrefs.anchor(elem["id"], :label, false)
+      prefix_name(elem, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.table} #{n}"),
+                  "name")
     end
 
     # we use this to eliminate the semantic amend blocks from rendering
@@ -171,11 +198,11 @@ module IsoDoc
       end
     end
 
-    def amend1(f)
-      f.xpath(ns("./autonumber")).each(&:remove)
-      f.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
-      f.xpath(ns("./description")).each { |a| a.replace(a.children) }
-      f.replace(f.children)
+    def amend1(elem)
+      elem.xpath(ns("./autonumber")).each(&:remove)
+      elem.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
+      elem.xpath(ns("./description")).each { |a| a.replace(a.children) }
+      elem.replace(elem.children)
     end
   end
 end