isodoc 1.7.1 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b64ad76ffcf7c9f1ced2c15c41a263e49e62cfa4294d31066ba2e358e613fb35
-  data.tar.gz: f35ca08d240ae7cdb7ba9aa0c9e071ec284d051f0d61c82542d461e101d0da38
+  metadata.gz: 9ddab8465c1411d1596aa170ddda0affb869a0989e4fb0351d2b68c4a02e4a07
+  data.tar.gz: 0aaecaa60940f2177781ca3b51610c2be9f0ac0fef3e8f01227b9afba9330571
 SHA512:
-  metadata.gz: 3062ddc15478efad6f25fb39e37689fecab84750b34c2496f5693af1b52c864053f50acf3af141d876e8cb8d2d19f89ecdd19e630ab1b1da9e953e897f2ab68a
-  data.tar.gz: 14d688526a710b92cf2256e49df75e4abcf5a67ed7de40e6593cedf1a99e96561ba5024398ae7c767d78a4e0d74e18df344423cfbc83dd75e2afa28beeea0006
+  metadata.gz: ab482ce07d9ff45b532e3ffa83f98334171e75d5c91eded8c81070b2065690ee2cd1b246fe63ce55a61e04a3fe11fd259cdf1e800885a1151003add5fca1e41b
+  data.tar.gz: 77df20df67c7adb582dbbfb4a69ec8198d5d811ebe490d08bd023a4e3261083f64da759ca2d1fa231cb3dba3e7b254d7a1331a3e6b3a085ed9586fc1a81b0778

data/isodoc.gemspec

@@ -32,13 +32,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "html2doc", "~> 1.1.1"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "liquid", "~> 4"
-  spec.add_dependency "metanorma", ">= 1.2.0"
+  #spec.add_dependency "metanorma", ">= 1.2.0"
   spec.add_dependency "nokogiri", "~> 1.11.0"
   spec.add_dependency "relaton-cli"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
+  spec.add_dependency "mathml2asciimath"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/lib/isodoc/convert.rb

@@ -75,6 +75,7 @@ module IsoDoc
       @suppressheadingnumbers = options[:suppressheadingnumbers]
       @break_up_urls_in_tables = options[:break_up_urls_in_tables] == "true"
       @sectionsplit = options[:sectionsplit] == "true"
+      @suppressasciimathdup = options[:suppressasciimathdup] == "true"
       @bare = options[:bare]
       @termdomain = ""
       @termexample = false

data/lib/isodoc/css.rb

@@ -39,7 +39,7 @@ module IsoDoc
       {
         bodyfont: "Arial",
         headerfont: "Arial",
-        monospacefont: "Courier",
+        monospacefont: "Courier New",
       }
     end
 
@@ -53,7 +53,7 @@ module IsoDoc
       {
         "bodyfont" => options[:bodyfont] || "Arial",
         "headerfont" => options[:headerfont] || "Arial",
-        "monospacefont" => options[:monospacefont] || "Courier",
+        "monospacefont" => options[:monospacefont] || "Courier New",
         "normalfontsize" => options[:normalfontsize],
         "monospacefontsize" => options[:monospacefontsize],
         "smallerfontsize" => options[:smallerfontsize],
@@ -64,7 +64,7 @@ module IsoDoc
     def scss_fontheader(is_html_css)
       b = options[:bodyfont] || "Arial"
       h = options[:headerfont] || "Arial"
-      m = options[:monospacefont] || "Courier"
+      m = options[:monospacefont] || "Courier New"
       ns = options[:normalfontsize] || (is_html_css ? "1.0em" : "12.0pt")
       ms = options[:monospacefontsize] || (is_html_css ? "0.8em" : "11.0pt")
       ss = options[:smallerfontsize] || (is_html_css ? "0.9em" : "10.0pt")

data/lib/isodoc/function/blocks.rb

@@ -1,231 +1,243 @@
 require_relative "blocks_example_note"
 
-module IsoDoc::Function
-  module Blocks
-    @annotation = false
+module IsoDoc
+  module Function
+    module Blocks
+      @annotation = false
 
-    def middle_title(_isoxml, out)
-      out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
-    end
+      def middle_title(_isoxml, out)
+        out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
+      end
 
-    def middle_admonitions(isoxml, out)
-      isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
-        parse(x, out)
+      def middle_admonitions(isoxml, out)
+        isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
+          parse(x, out)
+        end
       end
-    end
 
-    def figure_name_parse(_node, div, name)
-      return if name.nil?
+      def figure_name_parse(_node, div, name)
+        return if name.nil?
 
-      div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
-        name.children.each { |n| parse(n, p) }
+        div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
+          name.children.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def figure_key(out)
-      out.p **{ style: "page-break-after:avoid;" } do |p|
-        p.b { |b| b << @i18n.key }
+      def figure_key(out)
+        out.p **{ style: "page-break-after:avoid;" } do |p|
+          p.b { |b| b << @i18n.key }
+        end
       end
-    end
 
-    def figure_attrs(node)
-      attr_code(id: node["id"], class: "figure", style: keep_style(node))
-    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"
+      def figure_parse(node, out)
+        return pseudocode_parse(node, out) if node["class"] == "pseudocode" ||
+          node["type"] == "pseudocode"
+
+        @in_figure = true
+        figure_parse1(node, out)
+        @in_figure = false
+      end
 
-      @in_figure = true
-      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"
+      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"
+          end
+          figure_name_parse(node, div, node.at(ns("./name")))
         end
-        figure_name_parse(node, div, node.at(ns("./name")))
       end
-      @in_figure = false
-    end
 
-    def pseudocode_attrs(node)
-      attr_code(id: node["id"], class: "pseudocode", style: keep_style(node))
-    end
+      def pseudocode_attrs(node)
+        attr_code(id: node["id"], class: "pseudocode", style: keep_style(node))
+      end
 
-    def pseudocode_parse(node, out)
-      @in_figure = true
-      name = node.at(ns("./name"))
-      out.div **pseudocode_attrs(node) do |div|
-        node.children.each { |n| parse(n, div) unless n.name == "name" }
-        sourcecode_name_parse(node, div, name)
+      def pseudocode_parse(node, out)
+        @in_figure = true
+        name = node.at(ns("./name"))
+        out.div **pseudocode_attrs(node) do |div|
+          node.children.each { |n| parse(n, div) unless n.name == "name" }
+          sourcecode_name_parse(node, div, name)
+        end
+        @in_figure = false
       end
-      @in_figure = false
-    end
 
-    def sourcecode_name_parse(_node, div, name)
-      return if name.nil?
+      def sourcecode_name_parse(_node, div, name)
+        return if name.nil?
 
-      div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
-        name.children.each { |n| parse(n, p) }
+        div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
+          name.children.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def admonition_name_parse(_node, div, name)
-      div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
-        name.children.each { |n| parse(n, p) }
+      def admonition_name_parse(_node, div, name)
+        div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
+          name.children.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def sourcecode_attrs(node)
-      attr_code(id: node["id"], class: "Sourcecode", style: keep_style(node))
-    end
+      def sourcecode_attrs(node)
+        attr_code(id: node["id"], class: "Sourcecode", style: keep_style(node))
+      end
 
-    def sourcecode_parse(node, out)
-      name = node.at(ns("./name"))
-      out.p **sourcecode_attrs(node) do |div|
-        @sourcecode = true
-        node.children.each { |n| parse(n, div) unless n.name == "name" }
-        @sourcecode = false
+      def sourcecode_parse(node, out)
+        name = node.at(ns("./name"))
+        out.p **sourcecode_attrs(node) do |div|
+          @sourcecode = true
+          node.children.each { |n| parse(n, div) unless n.name == "name" }
+          @sourcecode = false
+        end
+        sourcecode_name_parse(node, out, name)
       end
-      sourcecode_name_parse(node, out, name)
-    end
 
-    def pre_parse(node, out)
-      out.pre node.text, **attr_code(id: node["id"])
-    end
+      def pre_parse(node, out)
+        out.pre node.text, **attr_code(id: node["id"])
+      end
 
-    def annotation_parse(node, out)
-      @sourcecode = false
-      @annotation = true
-      node.at("./preceding-sibling::*[local-name() = 'annotation']") or
-        out << "<br/>"
-      callout = node.at(ns("//callout[@target='#{node['id']}']"))
-      out << "<br/>&lt;#{callout.text}&gt; "
-      out << node&.children&.text&.strip
-      @annotation = false
-    end
+      def annotation_parse(node, out)
+        @sourcecode = false
+        @annotation = true
+        node.at("./preceding-sibling::*[local-name() = 'annotation']") or
+          out << "<br/>"
+        callout = node.at(ns("//callout[@target='#{node['id']}']"))
+        out << "<br/>&lt;#{callout.text}&gt; "
+        out << node&.children&.text&.strip
+        @annotation = false
+      end
 
-    def admonition_class(_node)
-      "Admonition"
-    end
+      def admonition_class(_node)
+        "Admonition"
+      end
 
-    def admonition_name(node, type)
-      name = node&.at(ns("./name")) and return name
-      name = Nokogiri::XML::Node.new("name", node.document)
-      return unless type && @i18n.admonition[type]
+      def admonition_name(node, type)
+        name = node&.at(ns("./name")) and return name
+        name = Nokogiri::XML::Node.new("name", node.document)
+        return unless type && @i18n.admonition[type]
 
-      name << @i18n.admonition[type]&.upcase
-      name
-    end
+        name << @i18n.admonition[type]&.upcase
+        name
+      end
 
-    def admonition_attrs(node)
-      attr_code(id: node["id"], class: admonition_class(node),
-                style: keep_style(node))
-    end
+      def admonition_attrs(node)
+        attr_code(id: node["id"], class: admonition_class(node),
+                  style: keep_style(node))
+      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" }
+      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" }
+        end
       end
-    end
 
-    def formula_where(dl, out)
-      return unless dl
+      def formula_where(dlist, out)
+        return unless dlist
 
-      out.p **{ style: "page-break-after:avoid;" } do |p|
-        p << @i18n.where
+        out.p **{ style: "page-break-after:avoid;" } do |p|
+          p << @i18n.where
+        end
+        parse(dlist, out)
+        out.parent.at("./dl")["class"] = "formula_dl"
       end
-      parse(dl, out)
-      out.parent.at("./dl")["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)
-          if lbl = node&.at(ns("./name"))&.text
-            insert_tab(div, 1)
-            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)
+            if lbl = node&.at(ns("./name"))&.text
+              insert_tab(div, 1)
+              div << "(#{lbl})"
+            end
           end
         end
       end
-    end
 
-    def formula_attrs(node)
-      attr_code(id: node["id"], style: keep_style(node))
-    end
+      def formula_attrs(node)
+        attr_code(id: node["id"], style: keep_style(node))
+      end
 
-    def formula_parse(node, out)
-      out.div **formula_attrs(node) do |div|
-        formula_parse1(node, div)
-        formula_where(node.at(ns("./dl")), div)
-        node.children.each do |n|
-          next if %w(stem dl name).include? n.name
+      def formula_parse(node, out)
+        out.div **formula_attrs(node) do |div|
+          formula_parse1(node, div)
+          formula_where(node.at(ns("./dl")), div)
+          node.children.each do |n|
+            next if %w(stem dl name).include? n.name
 
-          parse(n, div)
+            parse(n, div)
+          end
         end
       end
-    end
 
-    def para_class(_node)
-      classtype = nil
-      classtype = "MsoCommentText" if in_comment
-      classtype = "Sourcecode" if @annotation
-      classtype
-    end
+      def para_class(_node)
+        classtype = nil
+        classtype = "MsoCommentText" if in_comment
+        classtype = "Sourcecode" if @annotation
+        classtype
+      end
 
-    def para_attrs(node)
-      attrs = { class: para_class(node), id: node["id"] }
-      s = node["align"].nil? ? "" : "text-align:#{node['align']};"
-      s = "#{s}#{keep_style(node)}"
-      attrs[:style] = s unless s.empty?
-      attrs
-    end
+      def para_attrs(node)
+        attrs = { class: para_class(node), id: node["id"] }
+        s = node["align"].nil? ? "" : "text-align:#{node['align']};"
+        s = "#{s}#{keep_style(node)}"
+        attrs[:style] = s unless s.empty?
+        attrs
+      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) }
         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?
+      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 << "&mdash; #{author.text}" if author
-        p << ", " if author && source
-        eref_parse(source, p) if source
+        out.p **{ class: "QuoteAttribution" } do |p|
+          p << "&mdash; #{author.text}" if author
+          p << ", " if author && source
+          eref_parse(source, p) if source
+        end
       end
-    end
 
-    def quote_parse(node, out)
-      attrs = para_attrs(node)
-      attrs[:class] = "Quote"
-      out.div **attr_code(attrs) do |p|
-        node.children.each do |n|
-          parse(n, p) unless ["author", "source"].include? n.name
+      def quote_parse(node, out)
+        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)
         end
-        quote_attribution(node, out)
       end
-    end
 
-    def passthrough_parse(node, out)
-      return if node["format"] &&
-        !(node["format"].split(",").include? @format.to_s)
+      def passthrough_parse(node, out)
+        return if node["format"] &&
+          !(node["format"].split(",").include? @format.to_s)
 
-      out.passthrough node.text
-    end
+        out.passthrough node.text
+      end
 
-    def svg_parse(node, out)
-      out.parent.add_child(node)
+      def svg_parse(node, out)
+        out.parent.add_child(node)
+      end
+
+      def toc_parse(node, out)
+        out.div **{ class: "toc" } do |div|
+          node.children.each { |n| parse(n, div) }
+        end
+      end
     end
   end
 end