isodoc 1.7.3.1 → 1.7.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4857e477eb5f0f04d2af2e0943ad584b0dba6677cbbd25ae8a0d7ab36bfc2058
-  data.tar.gz: 8b9d5bc48cf81a15edbef1230996d22f0731e2071a5d726bc0621d48da09009c
+  metadata.gz: 411fdbd359b728afea9bcab7225c1e79a2a2698dd37c6219c70a1434cfa09286
+  data.tar.gz: 05a4997c47971d8cc74985ea8a0cf7b4e2c0d0e15a144e68eae007ce24176c9a
 SHA512:
-  metadata.gz: e5d2ab8c7a03057d7e82b255fd1e2a5a4cf6ace0b074e4462cadeddfe1c509f45401808197f9d78edfed2912f4f283b40dfeaea8386cb32cb024d2994309d31d
-  data.tar.gz: e0fe9adb6ede2c2a78c4fb69e8dd70343c48227b088346178fce3af699d187746cbddcc9c250d5cddd5cf4a0a543ba270733b0e7f4872877b38f9111a51894b7
+  metadata.gz: 7db1599bdd9d90aada565fbb02d4744a1ac85de0798c2dfd33d2b76905e5f40894042df0e0131a282fa669509f590cf471285188f6dd8e3c091d3bf6c0809bb3
+  data.tar.gz: cd90f9f57aa3ccd37d59d7ebc14438dd37c8812e3d131d7d82618499bfd69c25f660716a508621f536e72a68b942571347fb7218a746c42e61296e4e7fef3da8

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