isodoc 2.10.0 → 3.0.0

data/lib/isodoc/function/blocks.rb

@@ -3,8 +3,6 @@ require_relative "blocks_example_note"
 module IsoDoc
   module Function
     module Blocks
-      @annotation = false
-
       def figure_name_parse(_node, div, name)
         name.nil? and return
         div.p class: "FigureTitle", style: "text-align:center;" do |p|
@@ -12,20 +10,13 @@ module IsoDoc
         end
       end
 
-      def figure_key(out)
-        out.p style: "page-break-after:avoid;" do |p|
-          p.b { |b| b << @i18n.key }
-        end
-      end
-
       def figure_attrs(node)
         attr_code(id: node["id"], class: "figure", style: keep_style(node))
       end
 
       def figure_parse(node, out)
-        return pseudocode_parse(node, out) if node["class"] == "pseudocode" ||
-          node["type"] == "pseudocode"
-
+        node["class"] == "pseudocode" || node["type"] == "pseudocode" and
+          return pseudocode_parse(node, out)
         @in_figure = true
         figure_parse1(node, out)
         @in_figure = false
@@ -34,10 +25,9 @@ module IsoDoc
       def figure_parse1(node, out)
         out.div **figure_attrs(node) do |div|
           node.children.each do |n|
-            figure_key(out) if n.name == "dl"
-            parse(n, div) unless n.name == "name"
+            parse(n, div) unless n.name == "fmt-name"
           end
-          figure_name_parse(node, div, node.at(ns("./name")))
+          figure_name_parse(node, div, node.at(ns("./fmt-name")))
         end
       end
 
@@ -47,17 +37,17 @@ module IsoDoc
 
       def pseudocode_parse(node, out)
         @in_figure = true
-        name = node.at(ns("./name"))
+        name = node.at(ns("./fmt-name"))
+        s = node.at(ns("./fmt-figure")) || node
         out.div **pseudocode_attrs(node) do |div|
-          node.children.each { |n| parse(n, div) unless n.name == "name" }
+          s.children.each { |n| parse(n, div) unless n.name == "fmt-name" }
           sourcecode_name_parse(node, div, name)
         end
         @in_figure = false
       end
 
       def sourcecode_name_parse(_node, div, name)
-        return if name.nil?
-
+        name.nil? and return
         div.p class: "SourceTitle", style: "text-align:center;" do |p|
           name.children.each { |n| parse(n, p) }
         end
@@ -68,11 +58,13 @@ module IsoDoc
       end
 
       def sourcecode_parse(node, out)
-        name = node.at(ns("./name"))
+        name = node.at(ns("./fmt-name"))
+        n = node.at(ns("./fmt-sourcecode"))
+        s = n || node
         out.p **sourcecode_attrs(node) do |div|
-          sourcecode_parse1(node, div)
+          sourcecode_parse1(s, div)
         end
-        annotation_parse(node, out)
+        annotation_parse(s, out)
         sourcecode_name_parse(node, out, name)
       end
 
@@ -82,7 +74,7 @@ module IsoDoc
           node.at("./ancestor::xmlns:table[@class = 'rouge-line-table']") and
           @sourcecode = "table"
         node.children.each do |n|
-          %w(name dl).include?(n.name) and next
+          %w(fmt-name dl).include?(n.name) and next
           parse(n, div)
         end
         @sourcecode = false
@@ -95,20 +87,18 @@ module IsoDoc
       def annotation_parse(node, out)
         dl = node.at(ns("./dl")) or return
         @sourcecode = false
-        # @annotation = true
         out.div class: "annotation" do |div|
           parse(dl, div)
-          # @annotation = false
         end
       end
 
       def formula_parse1(node, out)
         out.div **attr_code(class: "formula") do |div|
           div.p do |_p|
-            parse(node.at(ns("./stem")), div)
-            if lbl = node&.at(ns("./name"))&.text
+            parse(node.at(ns("./fmt-stem")), div)
+            if lbl = node&.at(ns("./fmt-name"))&.text
               insert_tab(div, 1)
-              div << "(#{lbl})"
+              div << lbl
             end
           end
         end
@@ -122,8 +112,7 @@ module IsoDoc
         out.div **formula_attrs(node) do |div|
           formula_parse1(node, div)
           node.children.each do |n|
-            next if %w(stem name).include? n.name
-
+            %w(stem fmt-name fmt-stem).include? n.name and next
             parse(n, div)
           end
         end
@@ -132,10 +121,8 @@ module IsoDoc
       def para_class(node)
         classtype = nil
         classtype = "MsoCommentText" if in_comment
-        classtype = "Sourcecode" if @annotation
-        if node["type"] == "floating-title"
+        node["type"] == "floating-title" and
           classtype = "h#{node['depth']}"
-        end
         classtype ||= node["class"]
         classtype
       end
@@ -150,23 +137,13 @@ module IsoDoc
 
       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) }
         end
       end
 
-      def quote_attribution(node, out)
-        author = node.at(ns("./author"))
-        source = node.at(ns("./source"))
-        return if author.nil? && source.nil?
-
-        out.p class: "QuoteAttribution" do |p|
-          p << "&#x2014; #{author.text}" if author
-          p << ", " if author && source
-          eref_parse(source, p) if source
+      def attribution_parse(node, out)
+        out.div class: "QuoteAttribution" do |d|
+          node.children.each { |n| parse(n, d) }
         end
       end
 
@@ -174,17 +151,13 @@ module IsoDoc
         attrs = para_attrs(node)
         attrs[:class] = "Quote"
         out.div **attr_code(attrs) do |p|
-          node.children.each do |n|
-            parse(n, p) unless %w(author source).include? n.name
-          end
-          quote_attribution(node, out)
+          node.children.each { |n| parse(n, p) unless n.name == "source" }
         end
       end
 
       def passthrough_parse(node, out)
-        return if node["format"] &&
-          !(node["format"].split(",").include? @format.to_s)
-
+        node["formats"] &&
+          !(node["formats"].split(" ").include? @format.to_s) and return
         out.passthrough node.text
       end
 
@@ -206,6 +179,18 @@ module IsoDoc
         end
       end
 
+      def cross_align_parse(node, out)
+        out.table do |t|
+          t.tbody do |b|
+            node.xpath(ns("./align-cell")).each do |c|
+              b.td do |td|
+                c.children.each { |n| parse(n, td) }
+              end
+            end
+          end
+        end
+      end
+
       def columnbreak_parse(node, out); end
     end
   end

data/lib/isodoc/function/blocks_example_note.rb

@@ -2,8 +2,7 @@ module IsoDoc
   module Function
     module Blocks
       def example_label(_node, div, name)
-        return if name.nil?
-
+        name.nil? and return
         div.p class: "example-title" do |_p|
           name.children.each { |n| parse(n, div) }
         end
@@ -20,9 +19,9 @@ module IsoDoc
       # used if we are boxing examples
       def example_div_parse(node, out)
         out.div **example_div_attr(node) do |div|
-          example_label(node, div, node.at(ns("./name")))
+          example_label(node, div, node.at(ns("./fmt-name")))
           node.children.each do |n|
-            parse(n, div) unless n.name == "name"
+            parse(n, div) unless n.name == "fmt-name"
           end
         end
       end
@@ -40,10 +39,12 @@ module IsoDoc
         out.table **example_table_attr(node) do |t|
           t.tr do |tr|
             tr.td **EXAMPLE_TBL_ATTR do |td|
-              example_label(node, td, node.at(ns("./name")))
+              example_label(node, td, node.at(ns("./fmt-name")))
             end
             tr.td **EXAMPLE_TD_ATTR do |td|
-              node.children.each { |n| parse(n, td) unless n.name == "name" }
+              node.children.each do |n|
+                parse(n, td) unless n.name == "fmt-name"
+              end
             end
           end
         end
@@ -53,32 +54,45 @@ module IsoDoc
         example_div_parse(node, out)
       end
 
-      def note_delim
-        ""
+      def block_body_first_elem(node)
+        node.elements.each do |n|
+          %w(title fmt-title fmt-xref-label fmt-name name)
+            .include?(n.name) and next
+          return n
+        end
+        nil
+      end
+
+      def starts_with_para?(node)
+        block_body_first_elem(node)&.name == "p"
+      end
+
+      def note_p_class
+        nil
       end
 
       def note_p_parse(node, div)
-        name = node.at(ns("./name"))&.remove
-        div.p do |p|
+        name = node.at(ns("./fmt-name"))
+        para = node.at(ns("./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) }
-            s << note_delim
           end
-          insert_tab(p, 1)
-          node.first_element_child.children.each { |n| parse(n, p) }
+          #insert_tab(p, 1) # TODO to Presentation XML
+          children_parse(para, p)
         end
-        node.element_children[1..-1].each { |n| parse(n, div) }
+        para.xpath("./following-sibling::*").each { |n| parse(n, div) }
       end
 
       def note_parse1(node, div)
-        name = node.at(ns("./name")) and div.p do |p|
-          p.span class: "note_label" do |s|
-            name.remove.children.each { |n| parse(n, s) }
-            s << note_delim
+        name = node.at(ns("./fmt-name")) and
+          div.p **attr_code(class: note_p_class) do |p|
+            p.span class: "note_label" do |s|
+              name.remove.children.each { |n| parse(n, s) }
+            end
+            #insert_tab(p, 1) # TODO to Presentation XML
           end
-          insert_tab(p, 1)
-        end
-        node.children.each { |n| parse(n, div) }
+        children_parse(node, div)
       end
 
       def keep_style(node)
@@ -101,7 +115,7 @@ module IsoDoc
       def note_parse(node, out)
         @note = true
         out.div **note_attrs(node) do |div|
-          if node&.at(ns("./*[local-name() != 'name'][1]"))&.name == "p"
+          if starts_with_para?(node)
             note_p_parse(node, div)
           else
             note_parse1(node, div)
@@ -112,7 +126,7 @@ module IsoDoc
 
       def admonition_name_parse(_node, div, name)
         div.p class: "AdmonitionTitle", style: "text-align:center;" do |p|
-          name.children.each { |n| parse(n, p) }
+          children_parse(name, p)
         end
       end
 
@@ -121,7 +135,7 @@ module IsoDoc
       end
 
       def admonition_name(node, _type)
-        node&.at(ns("./name"))
+        node&.at(ns("./fmt-name"))
       end
 
       def admonition_attrs(node)
@@ -130,12 +144,44 @@ module IsoDoc
       end
 
       def admonition_parse(node, out)
-        type = node["type"]
-        name = admonition_name(node, type)
-        out.div **admonition_attrs(node) do |t|
-          admonition_name_parse(node, t, name) if name
-          node.children.each { |n| parse(n, t) unless n.name == "name" }
+        out.div **admonition_attrs(node) do |div|
+          if starts_with_para?(node)
+            admonition_p_parse(node, div)
+          else
+            admonition_parse1(node, div)
+          end
+        end
+      end
+
+      # code to allow name and first paragraph to be rendered in same block
+      def admonition_p_parse(node, div)
+        admonition_parse1(node, div)
+      end
+
+      # code to allow name and first paragraph to be rendered in same block
+      def admonition_name_in_first_para(node, div)
+        name = node.at(ns("./fmt-name"))
+        para = node.at(ns("./p"))
+        div.p do |p|
+          if name = admonition_name(node, node["type"])&.remove
+            name.children.each { |n| parse(n, p) }
+            admonition_name_para_delim(p) # TODO to Presentation XML
+          end
+          para.children.each { |n| parse(n, p) }
+        end
+        para.xpath("./following-sibling::*").each { |n| parse(n, div) }
+      end
+
+      def admonition_name_para_delim(para)
+        insert_tab(para, 1)
+      end
+
+      def admonition_parse1(node, div)
+        name = admonition_name(node, node["type"])
+        if name
+          admonition_name_parse(node, div, name)
         end
+        node.children.each { |n| parse(n, div) unless n.name == "fmt-name" }
       end
     end
   end

data/lib/isodoc/function/cleanup.rb

@@ -25,6 +25,7 @@ module IsoDoc
         admonition_cleanup(docxml)
       end
 
+      # todo PRESENTATION XML
       def admonition_cleanup(docxml)
         docxml.xpath("//div[@class = 'Admonition'][title]").each do |d|
           title = d.at("./title")
@@ -42,45 +43,7 @@ module IsoDoc
         docxml
       end
 
-      def figure_get_or_make_dl(elem)
-        dl = elem.at(".//dl")
-        if dl.nil?
-          elem.add_child("<p><b>#{@i18n.key}</b></p><dl></dl>")
-          dl = elem.at(".//dl")
-        end
-        dl
-      end
-
-      FIGURE_WITH_FOOTNOTES =
-        "//div[@class = 'figure'][descendant::aside]" \
-        "[not(descendant::div[@class = 'figure'])]".freeze
-
-      def figure_aside_process(elem, aside, key)
-        # get rid of footnote link, it is in diagram
-        elem&.at("./a[@class='TableFootnoteRef']")&.remove
-        fnref = elem.at(".//span[@class='TableFootnoteRef']/..")
-        dt = key.add_child("<dt></dt>").first
-        dd = key.add_child("<dd></dd>").first
-        fnref.parent = dt
-        aside.xpath(".//p").each do |a|
-          a.delete("class")
-          a.parent = dd
-        end
-      end
-
-      # move footnotes into key, and get rid of footnote reference
-      # since it is in diagram
-      def figure_cleanup(docxml)
-        docxml.xpath(FIGURE_WITH_FOOTNOTES).each do |f|
-          next unless f.at(".//aside[not(ancestor::p[@class = 'FigureTitle'])]")
-
-          key = figure_get_or_make_dl(f)
-          f.xpath(".//aside").each do |aside|
-            figure_aside_process(f, aside, key)
-          end
-        end
-        docxml
-      end
+      def figure_cleanup(docxml); end
 
       def inline_header_cleanup(docxml)
         docxml.xpath('//span[@class="zzMoveToFollowing"]').each do |x|
@@ -89,12 +52,13 @@ module IsoDoc
           if n.nil?
             x.name = "p"
           else
-            n.children.first.previous = x.remove
+            n.add_first_child(x.remove)
           end
         end
         docxml
       end
 
+      # todo PRESENTATION XML
       def footnote_cleanup(docxml)
         docxml.xpath('//a[@class = "FootnoteRef"]/sup')
           .each_with_index do |x, i|
@@ -157,13 +121,14 @@ module IsoDoc
         tfoot.xpath(".//td").last
       end
 
+      TABLENOTE_CSS = "div[@class = 'Note' or @class = 'BlockSource' " \
+        "or @class = 'TableFootnote' or @class = 'figdl']".freeze
+
       def table_note_cleanup(docxml)
-        docxml.xpath("//table[dl or div[@class = 'Note' or @class = 'BlockSource' " \
-                     "or @class = 'TableFootnote']]").each do |t|
+        docxml.xpath("//table[dl or #{TABLENOTE_CSS}]").each do |t|
           tfoot = table_get_or_make_tfoot(t)
           insert_here = new_fullcolspan_row(t, tfoot)
-          t.xpath("dl | div[@class = 'Note' or @class = 'BlockSource' or " \
-                  "@class = 'TableFootnote']")
+          t.xpath("dl | p[@class = 'ListTitle'] | #{TABLENOTE_CSS}")
             .each do |d|
             d.parent = insert_here
           end

data/lib/isodoc/function/inline.rb

@@ -8,7 +8,8 @@ module IsoDoc
         node["update-type"] == "true" and url = suffix_url(url)
         out.a **attr_code(href: url, title: node["alt"]) do |l|
           if node.elements.empty? && node.text.strip.empty?
-            l << @c.encode(node["target"].sub(/^mailto:/, ""), :basic, :hexadecimal)
+            l << @c.encode(node["target"].sub(/^mailto:/, ""), :basic,
+                           :hexadecimal)
           else node.children.each { |n| parse(n, l) }
           end
         end
@@ -16,16 +17,24 @@ module IsoDoc
 
       def location_parse(node, out); end
 
+      # Presentation XML classes which we need not pass on to HTML or DOC
+      SPAN_UNWRAP_CLASSES =
+        %w[fmt-caption-label fmt-label-delim fmt-caption-delim fmt-autonum-delim
+           fmt-element-name fmt-conn fmt-comma fmt-enum-comma fmt-obligation
+           fmt-xref-container fmt-designation-field].freeze
+
       def span_parse(node, out)
-        if node["style"] || node["class"]
+        klass = node["style"] || node["class"]
+        if klass && !SPAN_UNWRAP_CLASSES.include?(klass)
           out.span **attr_code(style: node["style"],
                                class: node["class"]) do |s|
-            node.children.each { |n| parse(n, s) }
+            children_parse(node, s)
           end
-        else node.children.each { |n| parse(n, out) }
+        else children_parse(node, out)
         end
       end
 
+      # todo PRESENTATION XML
       def callout_parse(node, out)
         out << " &lt;#{node.text}&gt;"
       end
@@ -46,9 +55,8 @@ module IsoDoc
       end
 
       def suffix_url(url)
-        return url if url.nil? || %r{^https?://|^#}.match?(url)
-        return url unless File.extname(url).empty?
-
+        url.nil? || %r{^https?://|^#}.match?(url) and return url
+        File.extname(url).empty? or return url
         url.sub(/#{File.extname(url)}$/, ".html")
       end
 
@@ -64,6 +72,7 @@ module IsoDoc
         end
       end
 
+      # todo PRESENTATION XML
       def termrefelem_parse(node, out)
         if node.text.strip.empty?
           out << "Termbase #{node['base']}, term ID #{node['target']}"
@@ -73,11 +82,12 @@ module IsoDoc
       end
 
       def stem_parse(node, out)
+        ret = node.at(ns("./semx[@element = 'stem']")) || node
         ooml = case node["type"]
-               when "AsciiMath" then asciimath_parse(node)
-               when "MathML" then mathml_parse(node)
-               when "LaTeX" then latexmath_parse(node)
-               else HTMLEntities.new.encode(node.text)
+               when "AsciiMath" then asciimath_parse(ret)
+               when "MathML" then mathml_parse(ret)
+               when "LaTeX" then latexmath_parse(ret)
+               else HTMLEntities.new.encode(ret.text)
                end
         out.span class: "stem" do |span|
           span.parent.add_child ooml
@@ -133,8 +143,7 @@ module IsoDoc
       end
 
       def text_parse(node, out)
-        return if node.nil? || node.text.nil?
-
+        node.nil? || node.text.nil? and return
         text = node.to_s
         @sourcecode == "pre" and
           text = text.gsub("\n", "<br/>").gsub("<br/> ", "<br/>&#xa0;")
@@ -179,6 +188,51 @@ module IsoDoc
           node.children.each { |n| parse(n, e) }
         end
       end
+
+      def author_parse(node, out); end
+
+      def semx_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def children_parse(node, out)
+        node.children.each { |n| parse(n, out) }
+      end
+
+      def xref_label_parse(node, out); end
+
+      def name_parse(node, out); end
+      def semx_definition_parse(node, out); end
+      def semx_xref_parse(node, out); end
+      def semx_eref_parse(node, out); end
+      def semx_link_parse(node, out); end
+      def semx_origin_parse(node, out); end
+      def date_parse(node, out); end
+      def semx_stem_parse(node, out); end
+
+      def floating_title_parse(node, out); end
+      def identifier_parse(node, out); end
+      def concept_parse(node, out); end
+      def erefstack_parse(node, out); end
+      def svgmap_parse(node, out); end
+      def amend_parse(node, out); end
+      def semx_sourcecode_parse(node, out); end
+
+      def fmt_name_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def fmt_identifier_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def fmt_concept_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def fmt_date_parse(node, out)
+        children_parse(node, out)
+      end
     end
   end
 end

data/lib/isodoc/function/lists.rb

@@ -2,9 +2,9 @@ module IsoDoc
   module Function
     module Lists
       def list_title_parse(node, out)
-        name = node.at(ns("./name")) or return
+        name = node.at(ns("./fmt-name")) or return
         out.p class: "ListTitle" do |p|
-          name&.children&.each { |n| parse(n, p) }
+          name.children&.each { |n| parse(n, p) }
         end
       end
 
@@ -13,9 +13,11 @@ module IsoDoc
       end
 
       def ul_parse(node, out)
-        list_title_parse(node, out)
-        out.ul **attr_code(ul_attrs(node)) do |ul|
-          node.children.each { |n| n.name == "name" or parse(n, ul) }
+        out.div **attr_code(class: "ul_wrap") do |div|
+          list_title_parse(node, div)
+          div.ul **attr_code(ul_attrs(node)) do |ul|
+            node.children.each { |n| n.name == "fmt-name" or parse(n, ul) }
+          end
         end
       end
 
@@ -52,9 +54,11 @@ module IsoDoc
       end
 
       def ol_parse(node, out)
-        list_title_parse(node, out)
-        out.ol **attr_code(ol_attrs(node)) do |ol|
-          node.children.each { |n| n.name == "name" or parse(n, ol) }
+        out.div **attr_code(class: "ol_wrap") do |div|
+          list_title_parse(node, div)
+          div.ol **attr_code(ol_attrs(node)) do |ol|
+            node.children.each { |n| n.name == "fmt-name" or parse(n, ol) }
+          end
         end
       end
 
@@ -90,17 +94,19 @@ module IsoDoc
       end
 
       def dl_parse(node, out)
-        list_title_parse(node, out)
-        out.dl **dl_attrs(node) do |v|
-          node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
-            dl_parse1(v, dt, dd)
+        out.div **attr_code(class: "figdl") do |div|
+          list_title_parse(node, div)
+          div.dl **dl_attrs(node) do |v|
+            node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
+              dl_parse1(v, dt, dd)
+            end
           end
+          dl_parse_notes(node, div)
         end
-        dl_parse_notes(node, out)
       end
 
       def dl_parse_notes(node, out)
-        node.elements.reject { |n| dt_dd?(n) || n.name == "name" }
+        node.elements.reject { |n| dt_dd?(n) || n.name == "fmt-name" }
           .each { |n| parse(n, out) }
       end