isodoc 1.7.3 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69357a32a0ea52a4575c37f79a94d8c0108a9a2f84654ce4dcbd58a472020b80
-  data.tar.gz: 02605ddddc513099f73d724c0afffe084cbd6de3ad13cf4267d23772697f839d
+  metadata.gz: bf6b7672b0923b4266fb04a8badd638b3838ede377e1b712f8d30e4c1aa6061f
+  data.tar.gz: 90c92ce493296887b9215384762a5a19bee7d5c2d275bab6f696b06593b60fa3
 SHA512:
-  metadata.gz: 4b35bc0f9b1fda5a62971decf1106655c8b7170dde78a8609b93cfeeafa800feceba3575fb4ed220eb117bf763d04de43786ea6843182bfda1b41b4fc271ae90
-  data.tar.gz: 9a904c7285684c64b387654397d29a64db4e24604e68bb7a07a5c86c853eb89607b515aa47a8f59f5d6c4e08b0ffcf5f9381ae95e8a219060edd0c021cbe822a
+  metadata.gz: 1f102fb8d85bce4966bd70cac156c3f27c9308e00619993f79b0d9a32f168c03a25cc2c9860782e370654c70a9288760ddaaff60e75dad280ad992bf0bfbea24
+  data.tar.gz: 4d8f3b39550d2ff82a63a58ff9a549a7dc349fe2c294c2736ae5c88251db187ce8a8223ea47a939f1c4aa9e39a9109bc6aacca0b66629a69d3eeabf0613e13c9

data/isodoc.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["open.source@ribose.com"]
 
   spec.summary       = "Convert documents in IsoDoc into Word and HTML "\
-    "in AsciiDoc."
+                       "in AsciiDoc."
   spec.description   = <<~DESCRIPTION
     isodoc converts documents in the IsoDoc document model into
     Microsoft Word and HTML.
@@ -32,8 +32,11 @@ 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 "nokogiri", "~> 1.11.0"
+  # spec.add_dependency "metanorma", ">= 1.2.0"
+  spec.add_dependency "emf2svg", "~> 1"
+  spec.add_dependency "mathml2asciimath"
+  spec.add_dependency "metanorma-utils"
+  spec.add_dependency "nokogiri", "~> 1.12.0"
   spec.add_dependency "relaton-cli"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "thread_safe"
@@ -44,12 +47,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
+  spec.add_development_dependency "metanorma-iso"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rexml"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "sassc", "~> 2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
-  spec.add_development_dependency "metanorma-iso"
   spec.add_development_dependency "timecop", "~> 0.9"
 end

data/lib/isodoc/class_utils.rb

@@ -23,8 +23,8 @@ module IsoDoc
       # unescape HTML escapes in doc
       doc = doc.split(%r<(\{%|%\})>).each_slice(4).map do |a|
         a[2] = a[2].gsub("&lt;", "<").gsub("&gt;", ">") if a.size > 2
-        a.join("")
-      end.join("")
+        a.join
+      end.join
       Liquid::Template.parse(doc)
     end
   end

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
@@ -100,6 +101,7 @@ module IsoDoc
       @htmlToClevels = 2 if @htmlToClevels.zero?
       @bookmarks_allocated = { "X" => true }
       @fn_bookmarks = {}
+      @baseassetpath = options[:baseassetpath]
     end
 
     def tmpimagedir_suffix

data/lib/isodoc/function/blocks_example_note.rb

@@ -1,107 +1,113 @@
-module IsoDoc::Function
-  module Blocks
-    def example_label(node, div, name)
-      return if name.nil?
-      div.p **{ class: "example-title" } do |p|
-        name.children.each { |n| parse(n, div) }
+module IsoDoc
+  module Function
+    module Blocks
+      def example_label(_node, div, name)
+        return if name.nil?
+
+        div.p **{ class: "example-title" } do |_p|
+          name.children.each { |n| parse(n, div) }
+        end
       end
-    end
 
-    EXAMPLE_TBL_ATTR =
-      { class: "example_label", style: "width:82.8pt;padding:0 0 0 0;\
+      EXAMPLE_TBL_ATTR =
+        { class: "example_label", style: "width:82.8pt;padding:0 0 0 0;\
         margin-left:0pt;vertical-align:top;" }.freeze
 
-    def example_div_attr(node)
-      attr_code(id: node["id"], class: "example", style: keep_style(node))
-    end
+      def example_div_attr(node)
+        attr_code(id: node["id"], class: "example", style: keep_style(node))
+      end
 
-    # 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")))
-        node.children.each do |n|
-          parse(n, div) unless n.name == "name"
+      # 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")))
+          node.children.each do |n|
+            parse(n, div) unless n.name == "name"
+          end
         end
       end
-    end
 
-    def example_table_attr(node)
-      attr_code(id: node["id"], class: "example",
-                style: "border-collapse:collapse;border-spacing:0;"\
-                "#{keep_style(node)}" )
-    end
+      def example_table_attr(node)
+        attr_code(id: node["id"], class: "example",
+                  style: "border-collapse:collapse;border-spacing:0;"\
+                         "#{keep_style(node)}")
+      end
 
-    EXAMPLE_TD_ATTR =
-      { style: "vertical-align:top;padding:0;", class: "example" }.freeze
+      EXAMPLE_TD_ATTR =
+        { style: "vertical-align:top;padding:0;", class: "example" }.freeze
 
-    def example_table_parse(node, out)
-      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")))
-          end
-          tr.td **EXAMPLE_TD_ATTR do |td|
-            node.children.each { |n| parse(n, td) unless n.name == "name" }
+      def example_table_parse(node, out)
+        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")))
+            end
+            tr.td **EXAMPLE_TD_ATTR do |td|
+              node.children.each { |n| parse(n, td) unless n.name == "name" }
+            end
           end
         end
       end
-    end
 
-    def example_parse(node, out)
-      example_div_parse(node, out)
-    end
+      def example_parse(node, out)
+        example_div_parse(node, out)
+      end
 
-    def note_delim
-      ""
-    end
+      def note_delim
+        ""
+      end
 
-    def note_p_parse(node, div)
-      name = node&.at(ns("./name"))&.remove
-      div.p do |p|
-        name and p.span **{ class: "note_label" } do |s|
-          name.children.each { |n| parse(n, s) }
-          s << note_delim
+      def note_p_parse(node, div)
+        name = node&.at(ns("./name"))&.remove
+        div.p 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) }
         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
-      name and div.p do |p|
-        p.span **{ class: "note_label" } do |s|
-          name.children.each { |n| parse(n, s) }
-          s << note_delim
+      def note_parse1(node, div)
+        name = node&.at(ns("./name"))&.remove
+        name and div.p do |p|
+          p.span **{ class: "note_label" } do |s|
+            name.children.each { |n| parse(n, s) }
+            s << note_delim
+          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 keep_style(node)
-      ret = ""
-      node["keep-with-next"] == "true" and
-        ret += "page-break-after: avoid;"
-      node["keep-lines-together"] == "true" and
-        ret += "page-break-inside: avoid;"
-      return nil if ret.empty?
-      ret
-    end
+      def keep_style(node)
+        ret = ""
+        node["keep-with-next"] == "true" and
+          ret += "page-break-after: avoid;"
+        node["keep-lines-together"] == "true" and
+          ret += "page-break-inside: avoid;"
+        return nil if ret.empty?
 
-    def note_attrs(node)
-      attr_code(id: node["id"], class: "Note", style: keep_style(node))
-    end
+        ret
+      end
+
+      def note_attrs(node)
+        attr_code(id: node["id"], class: "Note", style: keep_style(node))
+      end
 
-    def note_parse(node, out)
-      @note = true
-      out.div **note_attrs(node) do |div|
-        node&.at(ns("./*[local-name() != 'name'][1]"))&.name == "p" ?
-        # node.first_element_child.name == "p" ?
-          note_p_parse(node, div) : note_parse1(node, div)
+      def note_parse(node, out)
+        @note = true
+        out.div **note_attrs(node) do |div|
+          if node&.at(ns("./*[local-name() != 'name'][1]"))&.name == "p"
+            note_p_parse(node, div)
+          else
+            note_parse1(node, div)
+          end
+        end
+        @note = false
       end
-      @note = false
     end
   end
 end